dovecot/core-2.2: src/lib-master/master-login-auth.c annotate

annotate src/lib-master/master-login-auth.c @ 12367:9f179255b796

lib-master: Stop accepting new connections after auth-master gets disconnected.

author	Timo Sirainen <tss@iki.fi>
date	Tue, 02 Nov 2010 18:21:05 +0000
parents	f38e4e1465c8
children	e72ab743b8df

rev	line source
10582 615eef3139c2 Updated copyright notices to include year 2010. Timo Sirainen <tss@iki.fi> parents: 10473 diff changeset	1 /* Copyright (c) 2009-2010 Dovecot authors, see the included COPYING file */
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	2
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	3 #include "lib.h"
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	4 #include "network.h"
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	5 #include "ioloop.h"
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	6 #include "istream.h"
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	7 #include "ostream.h"
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	8 #include "llist.h"
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	9 #include "hex-binary.h"
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	10 #include "hash.h"
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	11 #include "str.h"
11256 e08dd68309a9 auth/login related timeouts are now in one place and they make more sense. Timo Sirainen <tss@iki.fi> parents: 11248 diff changeset	12 #include "master-interface.h"
12367 9f179255b796 lib-master: Stop accepting new connections after auth-master gets disconnected. Timo Sirainen <tss@iki.fi> parents: 12329 diff changeset	13 #include "master-service.h"
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	14 #include "master-auth.h"
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	15 #include "master-login-auth.h"
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	16
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	17 #include <stdlib.h>
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	18
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	19 #define AUTH_MAX_INBUF_SIZE 8192
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	20
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	21 struct master_login_auth_request {
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	22 struct master_login_auth_request prev, next;
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	23
11248 1fd45deee948 lib-master: Don't crash after timeouting an auth-master request. Timo Sirainen <tss@iki.fi> parents: 11097 diff changeset	24 unsigned int id;
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	25 time_t create_stamp;
11248 1fd45deee948 lib-master: Don't crash after timeouting an auth-master request. Timo Sirainen <tss@iki.fi> parents: 11097 diff changeset	26
12137 16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	27 pid_t auth_pid;
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	28 unsigned int auth_id;
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	29 unsigned int client_pid;
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	30 uint8_t cookie[MASTER_AUTH_COOKIE_SIZE];
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	31
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	32 master_login_auth_request_callback_t *callback;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	33 void *context;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	34 };
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	35
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	36 struct master_login_auth {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	37 pool_t pool;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	38 const char *auth_socket_path;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	39 int refcount;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	40
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	41 int fd;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	42 struct io *io;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	43 struct istream *input;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	44 struct ostream *output;
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	45 struct timeout *to;
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	46
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	47 unsigned int id_counter;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	48 struct hash_table *requests;
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	49 /* linked list of requests, ordered by create_stamp */
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	50 struct master_login_auth_request request_head, request_tail;
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	51
12137 16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	52 pid_t auth_server_pid;
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	53
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	54 unsigned int version_received:1;
12137 16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	55 unsigned int spid_received:1;
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	56 };
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	57
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	58 static void master_login_auth_set_timeout(struct master_login_auth *auth);
12137 16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	59 static void master_login_auth_send_all_requests(struct master_login_auth *auth);
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	60
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	61 struct master_login_auth master_login_auth_init(const char auth_socket_path)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	62 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	63 struct master_login_auth *auth;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	64 pool_t pool;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	65
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	66 pool = pool_alloconly_create("master login auth", 1024);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	67 auth = p_new(pool, struct master_login_auth, 1);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	68 auth->pool = pool;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	69 auth->auth_socket_path = p_strdup(pool, auth_socket_path);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	70 auth->refcount = 1;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	71 auth->fd = -1;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	72 auth->requests = hash_table_create(default_pool, pool, 0, NULL, NULL);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	73 return auth;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	74 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	75
10473 a0d99b374aa4 imap, pop3: Close auth/config connections when we stop accepting more connections. Timo Sirainen <tss@iki.fi> parents: 10199 diff changeset	76 void master_login_auth_disconnect(struct master_login_auth *auth)
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	77 {
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	78 struct master_login_auth_request *request;
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	79
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	80 while (auth->request_head != NULL) {
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	81 request = auth->request_head;
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	82 DLLIST2_REMOVE(&auth->request_head,
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	83 &auth->request_tail, request);
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	84
11018 2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	85 request->callback(NULL, MASTER_AUTH_ERRMSG_INTERNAL_FAILURE,
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	86 request->context);
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	87 i_free(request);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	88 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	89 hash_table_clear(auth->requests, FALSE);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	90
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	91 if (auth->to != NULL)
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	92 timeout_remove(&auth->to);
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	93 if (auth->io != NULL)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	94 io_remove(&auth->io);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	95 if (auth->fd != -1) {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	96 i_stream_destroy(&auth->input);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	97 o_stream_destroy(&auth->output);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	98
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	99 net_disconnect(auth->fd);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	100 auth->fd = -1;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	101 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	102 auth->version_received = FALSE;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	103 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	104
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	105 static void master_login_auth_unref(struct master_login_auth **_auth)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	106 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	107 struct master_login_auth auth = _auth;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	108
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	109 *_auth = NULL;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	110
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	111 i_assert(auth->refcount > 0);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	112 if (--auth->refcount > 0)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	113 return;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	114
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	115 hash_table_destroy(&auth->requests);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	116 pool_unref(&auth->pool);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	117 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	118
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	119 void master_login_auth_deinit(struct master_login_auth **_auth)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	120 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	121 struct master_login_auth auth = _auth;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	122
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	123 *_auth = NULL;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	124
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	125 master_login_auth_disconnect(auth);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	126 master_login_auth_unref(&auth);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	127 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	128
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	129 static unsigned int auth_get_next_timeout_secs(struct master_login_auth *auth)
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	130 {
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	131 time_t expires;
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	132
11256 e08dd68309a9 auth/login related timeouts are now in one place and they make more sense. Timo Sirainen <tss@iki.fi> parents: 11248 diff changeset	133 expires = auth->request_head->create_stamp +
e08dd68309a9 auth/login related timeouts are now in one place and they make more sense. Timo Sirainen <tss@iki.fi> parents: 11248 diff changeset	134 MASTER_AUTH_LOOKUP_TIMEOUT_SECS;
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	135 return expires <= ioloop_time ? 0 : expires - ioloop_time;
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	136 }
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	137
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	138 static void master_login_auth_timeout(struct master_login_auth *auth)
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	139 {
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	140 struct master_login_auth_request *request;
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	141
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	142 while (auth->request_head != NULL &&
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	143 auth_get_next_timeout_secs(auth) == 0) {
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	144 request = auth->request_head;
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	145 DLLIST2_REMOVE(&auth->request_head,
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	146 &auth->request_tail, request);
11248 1fd45deee948 lib-master: Don't crash after timeouting an auth-master request. Timo Sirainen <tss@iki.fi> parents: 11097 diff changeset	147 hash_table_remove(auth->requests, POINTER_CAST(request->id));
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	148
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	149 i_error("Auth server request timed out after %u secs",
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	150 (unsigned int)(ioloop_time - request->create_stamp));
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	151 request->callback(NULL, MASTER_AUTH_ERRMSG_INTERNAL_FAILURE,
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	152 request->context);
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	153 i_free(request);
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	154 }
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	155 timeout_remove(&auth->to);
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	156 master_login_auth_set_timeout(auth);
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	157 }
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	158
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	159 static void master_login_auth_set_timeout(struct master_login_auth *auth)
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	160 {
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	161 i_assert(auth->to == NULL);
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	162
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	163 if (auth->request_head != NULL) {
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	164 auth->to = timeout_add(auth_get_next_timeout_secs(auth) * 1000,
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	165 master_login_auth_timeout, auth);
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	166 }
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	167 }
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	168
12137 16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	169 static void
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	170 master_login_auth_request_remove(struct master_login_auth *auth,
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	171 struct master_login_auth_request *request)
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	172 {
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	173 bool update_timeout;
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	174
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	175 update_timeout = request->prev == NULL;
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	176
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	177 hash_table_remove(auth->requests, POINTER_CAST(request->id));
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	178 DLLIST2_REMOVE(&auth->request_head, &auth->request_tail, request);
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	179
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	180 if (update_timeout) {
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	181 timeout_remove(&auth->to);
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	182 master_login_auth_set_timeout(auth);
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	183 }
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	184 }
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	185
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	186 static struct master_login_auth_request *
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	187 master_login_auth_lookup_request(struct master_login_auth *auth,
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	188 unsigned int id)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	189 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	190 struct master_login_auth_request *request;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	191
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	192 request = hash_table_lookup(auth->requests, POINTER_CAST(id));
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	193 if (request == NULL) {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	194 i_error("Auth server sent reply with unknown ID %u", id);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	195 return NULL;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	196 }
12137 16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	197 master_login_auth_request_remove(auth, request);
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	198 return request;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	199 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	200
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	201 static bool
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	202 master_login_auth_input_user(struct master_login_auth auth, const char args)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	203 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	204 struct master_login_auth_request *request;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	205 const char const list;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	206 unsigned int id;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	207
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	208 /* <id> <userid> [..] */
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	209
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	210 list = t_strsplit(args, "\t");
11086 260e190306b0 Started using str_to_() functions instead of libc's ones. Timo Sirainen <tss@iki.fi>* parents: 11018 diff changeset	211 if (list[0] == NULL \|\| list[1] == NULL \|\|
260e190306b0 Started using str_to_() functions instead of libc's ones. Timo Sirainen <tss@iki.fi>* parents: 11018 diff changeset	212 str_to_uint(list[0], &id) < 0) {
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	213 i_error("Auth server sent corrupted USER line");
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	214 return FALSE;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	215 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	216
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	217 request = master_login_auth_lookup_request(auth, id);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	218 if (request != NULL) {
11018 2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	219 request->callback(list + 1, NULL, request->context);
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	220 i_free(request);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	221 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	222 return TRUE;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	223 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	224
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	225 static bool
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	226 master_login_auth_input_notfound(struct master_login_auth *auth,
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	227 const char *args)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	228 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	229 struct master_login_auth_request *request;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	230 unsigned int id;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	231
11086 260e190306b0 Started using str_to_() functions instead of libc's ones. Timo Sirainen <tss@iki.fi>* parents: 11018 diff changeset	232 if (str_to_uint(args, &id) < 0) {
260e190306b0 Started using str_to_() functions instead of libc's ones. Timo Sirainen <tss@iki.fi>* parents: 11018 diff changeset	233 i_error("Auth server sent corrupted NOTFOUND line");
260e190306b0 Started using str_to_() functions instead of libc's ones. Timo Sirainen <tss@iki.fi>* parents: 11018 diff changeset	234 return FALSE;
260e190306b0 Started using str_to_() functions instead of libc's ones. Timo Sirainen <tss@iki.fi>* parents: 11018 diff changeset	235 }
260e190306b0 Started using str_to_() functions instead of libc's ones. Timo Sirainen <tss@iki.fi>* parents: 11018 diff changeset	236
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	237 request = master_login_auth_lookup_request(auth, id);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	238 if (request != NULL) {
10589 cab5f2e7b806 auth master lookups: If request isn't found, return FAIL instead of NOTFOUND. Timo Sirainen <tss@iki.fi> parents: 10582 diff changeset	239 i_error("Authenticated user not found from userdb");
11018 2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	240 request->callback(NULL, MASTER_AUTH_ERRMSG_INTERNAL_FAILURE,
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	241 request->context);
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	242 i_free(request);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	243 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	244 return TRUE;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	245 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	246
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	247 static bool
11018 2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	248 master_login_auth_input_fail(struct master_login_auth *auth,
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	249 const char *args_line)
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	250 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	251 struct master_login_auth_request *request;
11018 2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	252 const char const args, *error = NULL;
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	253 unsigned int i, id;
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	254
11018 2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	255 args = t_strsplit(args_line, "\t");
11086 260e190306b0 Started using str_to_() functions instead of libc's ones. Timo Sirainen <tss@iki.fi>* parents: 11018 diff changeset	256 if (args[0] == NULL \|\| str_to_uint(args[0], &id) < 0) {
11018 2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	257 i_error("Auth server sent broken FAIL line");
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	258 return FALSE;
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	259 }
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	260 for (i = 1; args[i] != NULL; i++) {
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	261 if (strncmp(args[i], "reason=", 7) == 0)
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	262 error = args[i] + 7;
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	263 }
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	264
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	265 request = master_login_auth_lookup_request(auth, id);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	266 if (request != NULL) {
11018 2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	267 if (error != NULL)
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	268 i_error("Internal auth failure");
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	269 request->callback(NULL, error != NULL ? error :
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	270 MASTER_AUTH_ERRMSG_INTERNAL_FAILURE,
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	271 request->context);
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	272 i_free(request);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	273 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	274 return TRUE;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	275 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	276
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	277 static void master_login_auth_input(struct master_login_auth *auth)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	278 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	279 const char *line;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	280 bool ret;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	281
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	282 switch (i_stream_read(auth->input)) {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	283 case 0:
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	284 return;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	285 case -1:
12367 9f179255b796 lib-master: Stop accepting new connections after auth-master gets disconnected. Timo Sirainen <tss@iki.fi> parents: 12329 diff changeset	286 /* disconnected. stop accepting new connections, because in
9f179255b796 lib-master: Stop accepting new connections after auth-master gets disconnected. Timo Sirainen <tss@iki.fi> parents: 12329 diff changeset	287 default configuration we no longer have permissions to
9f179255b796 lib-master: Stop accepting new connections after auth-master gets disconnected. Timo Sirainen <tss@iki.fi> parents: 12329 diff changeset	288 connect back to auth-master */
9f179255b796 lib-master: Stop accepting new connections after auth-master gets disconnected. Timo Sirainen <tss@iki.fi> parents: 12329 diff changeset	289 master_service_stop_new_connections(master_service);
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	290 master_login_auth_disconnect(auth);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	291 return;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	292 case -2:
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	293 /* buffer full */
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	294 i_error("Auth server sent us too long line");
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	295 master_login_auth_disconnect(auth);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	296 return;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	297 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	298
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	299 if (!auth->version_received) {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	300 line = i_stream_next_line(auth->input);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	301 if (line == NULL)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	302 return;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	303
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	304 /* make sure the major version matches */
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	305 if (strncmp(line, "VERSION\t", 8) != 0 \|\|
11086 260e190306b0 Started using str_to_() functions instead of libc's ones. Timo Sirainen <tss@iki.fi>* parents: 11018 diff changeset	306 !str_uint_equals(t_strcut(line + 8, '\t'),
260e190306b0 Started using str_to_() functions instead of libc's ones. Timo Sirainen <tss@iki.fi>* parents: 11018 diff changeset	307 AUTH_MASTER_PROTOCOL_MAJOR_VERSION)) {
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	308 i_error("Authentication server not compatible with "
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	309 "master process (mixed old and new binaries?)");
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	310 master_login_auth_disconnect(auth);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	311 return;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	312 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	313 auth->version_received = TRUE;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	314 }
12137 16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	315 if (!auth->spid_received) {
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	316 line = i_stream_next_line(auth->input);
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	317 if (line == NULL)
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	318 return;
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	319
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	320 if (strncmp(line, "SPID\t", 5) != 0 \|\|
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	321 str_to_pid(line + 5, &auth->auth_server_pid) < 0) {
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	322 i_error("Authentication server didn't "
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	323 "send valid SPID as expected: %s", line);
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	324 master_login_auth_disconnect(auth);
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	325 return;
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	326 }
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	327 auth->spid_received = TRUE;
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	328 master_login_auth_send_all_requests(auth);
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	329 }
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	330
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	331 auth->refcount++;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	332 while ((line = i_stream_next_line(auth->input)) != NULL) {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	333 if (strncmp(line, "USER\t", 5) == 0)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	334 ret = master_login_auth_input_user(auth, line + 5);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	335 else if (strncmp(line, "NOTFOUND\t", 9) == 0)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	336 ret = master_login_auth_input_notfound(auth, line + 9);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	337 else if (strncmp(line, "FAIL\t", 5) == 0)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	338 ret = master_login_auth_input_fail(auth, line + 5);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	339 else
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	340 ret = TRUE;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	341
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	342 if (!ret \|\| auth->input == NULL) {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	343 master_login_auth_disconnect(auth);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	344 break;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	345 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	346 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	347 master_login_auth_unref(&auth);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	348 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	349
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	350 static int
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	351 master_login_auth_connect(struct master_login_auth *auth)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	352 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	353 int fd;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	354
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	355 i_assert(auth->fd == -1);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	356
10159 e027503ddb6b Use net_connect_unix_with_retries() instead of duplicating the code everywhere. Timo Sirainen <tss@iki.fi> parents: 10101 diff changeset	357 fd = net_connect_unix_with_retries(auth->auth_socket_path, 1000);
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	358 if (fd == -1) {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	359 i_error("net_connect_unix(%s) failed: %m",
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	360 auth->auth_socket_path);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	361 return -1;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	362 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	363 auth->fd = fd;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	364 auth->input = i_stream_create_fd(fd, AUTH_MAX_INBUF_SIZE, FALSE);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	365 auth->output = o_stream_create_fd(fd, (size_t)-1, FALSE);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	366 auth->io = io_add(fd, IO_READ, master_login_auth_input, auth);
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	367 return 0;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	368 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	369
12137 16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	370 static void
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	371 master_login_auth_send_request(struct master_login_auth *auth,
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	372 struct master_login_auth_request *req)
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	373 {
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	374 string_t *str;
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	375
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	376 i_assert(auth->spid_received);
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	377
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	378 if (auth->auth_server_pid != req->auth_pid) {
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	379 /* auth server was restarted. don't even attempt a login. */
12165 acd30d4601f9 lib-master: If auth server is restarted, still log a warning about aborted auth request. Timo Sirainen <tss@iki.fi> parents: 12137 diff changeset	380 i_warning("Auth server restarted (pid %u -> %u), aborting auth",
12329 f38e4e1465c8 Compiler warning fix. Timo Sirainen <tss@iki.fi> parents: 12165 diff changeset	381 (unsigned int)req->auth_pid,
f38e4e1465c8 Compiler warning fix. Timo Sirainen <tss@iki.fi> parents: 12165 diff changeset	382 (unsigned int)auth->auth_server_pid);
12137 16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	383 master_login_auth_request_remove(auth, req);
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	384 req->callback(NULL, MASTER_AUTH_ERRMSG_INTERNAL_FAILURE,
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	385 req->context);
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	386 i_free(req);
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	387 return;
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	388 }
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	389
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	390 str = t_str_new(128);
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	391 str_printfa(str, "REQUEST\t%u\t%u\t%u\t", req->id,
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	392 req->client_pid, req->auth_id);
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	393 binary_to_hex_append(str, req->cookie, sizeof(req->cookie));
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	394 str_append_c(str, '\n');
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	395 o_stream_send(auth->output, str_data(str), str_len(str));
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	396 }
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	397
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	398 static void master_login_auth_send_all_requests(struct master_login_auth *auth)
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	399 {
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	400 struct master_login_auth_request req, next;
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	401
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	402 for (req = auth->request_head; req != NULL; req = next) {
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	403 next = req->next;
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	404 master_login_auth_send_request(auth, req);
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	405 }
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	406 }
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	407
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	408 void master_login_auth_request(struct master_login_auth *auth,
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	409 const struct master_auth_request *req,
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	410 master_login_auth_request_callback_t *callback,
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	411 void *context)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	412 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	413 struct master_login_auth_request *login_req;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	414 unsigned int id;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	415
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	416 if (auth->fd == -1) {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	417 if (master_login_auth_connect(auth) < 0) {
12367 9f179255b796 lib-master: Stop accepting new connections after auth-master gets disconnected. Timo Sirainen <tss@iki.fi> parents: 12329 diff changeset	418 /* we couldn't connect to auth now,
9f179255b796 lib-master: Stop accepting new connections after auth-master gets disconnected. Timo Sirainen <tss@iki.fi> parents: 12329 diff changeset	419 so we probably can't in future either. */
9f179255b796 lib-master: Stop accepting new connections after auth-master gets disconnected. Timo Sirainen <tss@iki.fi> parents: 12329 diff changeset	420 master_service_stop_new_connections(master_service);
11018 2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	421 callback(NULL, MASTER_AUTH_ERRMSG_INTERNAL_FAILURE,
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	422 context);
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	423 return;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	424 }
12137 16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	425 o_stream_send_str(auth->output,
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	426 t_strdup_printf("VERSION\t%u\t%u\n",
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	427 AUTH_MASTER_PROTOCOL_MAJOR_VERSION,
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	428 AUTH_MASTER_PROTOCOL_MINOR_VERSION));
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	429 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	430
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	431 id = ++auth->id_counter;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	432 if (id == 0)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	433 id++;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	434
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	435 login_req = i_new(struct master_login_auth_request, 1);
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	436 login_req->create_stamp = ioloop_time;
11248 1fd45deee948 lib-master: Don't crash after timeouting an auth-master request. Timo Sirainen <tss@iki.fi> parents: 11097 diff changeset	437 login_req->id = id;
12137 16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	438 login_req->auth_pid = req->auth_pid;
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	439 login_req->client_pid = req->client_pid;
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	440 login_req->auth_id = req->auth_id;
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	441 memcpy(login_req->cookie, req->cookie, sizeof(login_req->cookie));
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	442 login_req->callback = callback;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	443 login_req->context = context;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	444 hash_table_insert(auth->requests, POINTER_CAST(id), login_req);
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	445 DLLIST2_APPEND(&auth->request_head, &auth->request_tail, login_req);
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	446
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	447 if (auth->to == NULL)
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	448 master_login_auth_set_timeout(auth);
12137 16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	449
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	450 if (auth->spid_received)
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	451 master_login_auth_send_request(auth, login_req);
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	452 }
10199 9d13e9f78d52 lib-master: Fixes to handling master-login services. Timo Sirainen <tss@iki.fi> parents: 10159 diff changeset	453
9d13e9f78d52 lib-master: Fixes to handling master-login services. Timo Sirainen <tss@iki.fi> parents: 10159 diff changeset	454 unsigned int master_login_auth_request_count(struct master_login_auth *auth)
9d13e9f78d52 lib-master: Fixes to handling master-login services. Timo Sirainen <tss@iki.fi> parents: 10159 diff changeset	455 {
9d13e9f78d52 lib-master: Fixes to handling master-login services. Timo Sirainen <tss@iki.fi> parents: 10159 diff changeset	456 return hash_table_count(auth->requests);
9d13e9f78d52 lib-master: Fixes to handling master-login services. Timo Sirainen <tss@iki.fi> parents: 10159 diff changeset	457 }

Mercurial > dovecot > core-2.2

annotate src/lib-master/master-login-auth.c @ 12367:9f179255b796