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

annotate src/lib-master/master-login-auth.c @ 12488:4113324354f5

lib-master: Added extra debug info for a "user not found" error message.

author	Timo Sirainen <tss@iki.fi>
date	Thu, 02 Dec 2010 17:38:08 +0000
parents	aec1f1614028
children	16dbbb57a4b2

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;
12405 e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	34
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	35 unsigned int aborted:1;
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	36 };
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	37
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	38 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	39 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	40 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	41 int refcount;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	42
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	43 int fd;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	44 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	45 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	46 struct ostream *output;
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	47 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	48
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	49 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	50 struct hash_table *requests;
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	51 /* 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	52 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	53
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	54 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	55
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	56 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	57 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	58 };
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	59
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	60 static void master_login_auth_set_timeout(struct master_login_auth *auth);
12405 e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	61 static void master_login_auth_check_spids(struct master_login_auth *auth);
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	62
10101 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 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	64 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	65 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	66 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	67
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	68 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	69 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	70 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	71 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	72 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	73 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	74 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	75 return auth;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	76 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	77
10473 a0d99b374aa4 imap, pop3: Close auth/config connections when we stop accepting more connections. Timo Sirainen <tss@iki.fi> parents: 10199 diff changeset	78 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	79 {
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	80 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	81
12436 aec1f1614028 lib-master: If auth master login fails, make sure error message is logged. Timo Sirainen <tss@iki.fi> parents: 12405 diff changeset	82 if (auth->request_head != NULL)
aec1f1614028 lib-master: If auth master login fails, make sure error message is logged. Timo Sirainen <tss@iki.fi> parents: 12405 diff changeset	83 i_error("Disconnected from auth server, aborting requests");
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	84 while (auth->request_head != NULL) {
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	85 request = auth->request_head;
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	86 DLLIST2_REMOVE(&auth->request_head,
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	87 &auth->request_tail, request);
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	88
11018 2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	89 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	90 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	91 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	92 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	93 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	94
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	95 if (auth->to != NULL)
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	96 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	97 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	98 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	99 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	100 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	101 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	102
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	103 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	104 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	105 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	106 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	107 }
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 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	110 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	111 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	112
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	113 *_auth = NULL;
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 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	116 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	117 return;
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 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	120 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	121 }
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 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	124 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	125 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	126
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	127 *_auth = NULL;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	128
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	129 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	130 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	131 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	132
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	133 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	134 {
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	135 time_t expires;
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	136
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	137 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	138 MASTER_AUTH_LOOKUP_TIMEOUT_SECS;
11097 0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	139 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	140 }
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 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	143 {
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	144 struct master_login_auth_request *request;
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	145
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	146 while (auth->request_head != NULL &&
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	147 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	148 request = auth->request_head;
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	149 DLLIST2_REMOVE(&auth->request_head,
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	150 &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	151 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	152
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	153 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	154 (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	155 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	156 request->context);
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	157 i_free(request);
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 timeout_remove(&auth->to);
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	160 master_login_auth_set_timeout(auth);
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	161 }
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 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	164 {
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	165 i_assert(auth->to == NULL);
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 if (auth->request_head != NULL) {
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	168 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	169 master_login_auth_timeout, auth);
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	170 }
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	171 }
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	172
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	173 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	174 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	175 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	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 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	178
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 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	180
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 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	182 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	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 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	185 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	186 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	187 }
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	188 }
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	189
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	190 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	191 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	192 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	193 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	194 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	195
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	196 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	197 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	198 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	199 return NULL;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	200 }
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	201 master_login_auth_request_remove(auth, request);
12405 e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	202 if (request->aborted) {
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	203 request->callback(NULL, MASTER_AUTH_ERRMSG_INTERNAL_FAILURE,
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	204 request->context);
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	205 i_free(request);
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	206 return NULL;
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	207 }
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	208 return request;
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
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	211 static bool
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	212 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	213 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	214 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	215 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	216 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	217
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	218 /* <id> <userid> [..] */
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	219
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	220 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	221 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	222 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	223 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	224 return FALSE;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	225 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	226
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	227 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	228 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	229 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	230 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	231 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	232 return TRUE;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	233 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	234
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	235 static bool
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	236 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	237 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	238 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	239 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	240 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	241
11086 260e190306b0 Started using str_to_() functions instead of libc's ones. Timo Sirainen <tss@iki.fi>* parents: 11018 diff changeset	242 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	243 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	244 return FALSE;
260e190306b0 Started using str_to_() functions instead of libc's ones. Timo Sirainen <tss@iki.fi>* parents: 11018 diff changeset	245 }
260e190306b0 Started using str_to_() functions instead of libc's ones. Timo Sirainen <tss@iki.fi>* parents: 11018 diff changeset	246
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	247 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	248 if (request != NULL) {
12488 4113324354f5 lib-master: Added extra debug info for a "user not found" error message. Timo Sirainen <tss@iki.fi> parents: 12436 diff changeset	249 i_error("Authenticated user not found from userdb (id=%u)", id);
11018 2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	250 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	251 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	252 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	253 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	254 return TRUE;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	255 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	256
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	257 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	258 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	259 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	260 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	261 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	262 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	263 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	264
11018 2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	265 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	266 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	267 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	268 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	269 }
2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	270 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	271 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	272 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	273 }
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	274
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	275 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	276 if (request != NULL) {
12436 aec1f1614028 lib-master: If auth master login fails, make sure error message is logged. Timo Sirainen <tss@iki.fi> parents: 12405 diff changeset	277 if (error == 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	278 i_error("Internal auth failure");
12436 aec1f1614028 lib-master: If auth master login fails, make sure error message is logged. Timo Sirainen <tss@iki.fi> parents: 12405 diff changeset	279 else
aec1f1614028 lib-master: If auth master login fails, make sure error message is logged. Timo Sirainen <tss@iki.fi> parents: 12405 diff changeset	280 i_error("Internal auth failure: %s", error);
11018 2e08ce368bc0 Added support for userdb lookup to fail with a reason (many API changes). Timo Sirainen <tss@iki.fi> parents: 10589 diff changeset	281 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	282 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	283 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	284 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	285 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	286 return TRUE;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	287 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	288
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	289 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	290 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	291 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	292 bool ret;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	293
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	294 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	295 case 0:
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 case -1:
12367 9f179255b796 lib-master: Stop accepting new connections after auth-master gets disconnected. Timo Sirainen <tss@iki.fi> parents: 12329 diff changeset	298 /* 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	299 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	300 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	301 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	302 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	303 return;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	304 case -2:
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	305 /* buffer full */
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	306 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	307 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	308 return;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	309 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	310
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	311 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	312 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	313 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	314 return;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	315
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	316 /* 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	317 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	318 !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	319 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	320 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	321 "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	322 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	323 return;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	324 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	325 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	326 }
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	327 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	328 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	329 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	330 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	331
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	332 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	333 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	334 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	335 "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	336 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	337 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	338 }
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	339 auth->spid_received = TRUE;
12405 e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	340 master_login_auth_check_spids(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	341 }
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	342
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	343 auth->refcount++;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	344 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	345 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	346 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	347 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	348 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	349 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	350 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	351 else
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	352 ret = TRUE;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	353
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	354 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	355 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	356 break;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	357 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	358 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	359 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	360 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	361
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	362 static int
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	363 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	364 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	365 int fd;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	366
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	367 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	368
10159 e027503ddb6b Use net_connect_unix_with_retries() instead of duplicating the code everywhere. Timo Sirainen <tss@iki.fi> parents: 10101 diff changeset	369 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	370 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	371 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	372 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	373 return -1;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	374 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	375 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	376 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	377 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	378 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	379 return 0;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	380 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	381
12405 e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	382 static bool
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	383 auth_request_check_spid(struct master_login_auth *auth,
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	384 struct master_login_auth_request *req)
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	385 {
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	386 if (auth->auth_server_pid != req->auth_pid && auth->spid_received) {
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	387 /* auth server was restarted. don't even attempt a login. */
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	388 i_warning("Auth server restarted (pid %u -> %u), aborting auth",
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	389 (unsigned int)req->auth_pid,
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	390 (unsigned int)auth->auth_server_pid);
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	391 return FALSE;
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	392 }
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	393 return TRUE;
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	394 }
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	395
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	396 static void master_login_auth_check_spids(struct master_login_auth *auth)
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	397 {
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	398 struct master_login_auth_request req, next;
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	399
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	400 for (req = auth->request_head; req != NULL; req = next) {
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	401 next = req->next;
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	402 if (!auth_request_check_spid(auth, req))
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	403 req->aborted = TRUE;
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	404 }
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	405 }
e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	406
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	407 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	408 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	409 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	410 {
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	411 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	412
12405 e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	413 if (!auth_request_check_spid(auth, req)) {
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	414 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	415 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	416 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	417 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	418 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	419 }
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	420
16330c0c8ef4 lib-master: When finishing auth, don't send REQUEST if auth process has restarted. Timo Sirainen <tss@iki.fi> parents: 11256 diff changeset	421 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	422 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	423 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	424 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	425 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	426 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	427 }
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
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	429 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	430 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	431 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	432 void *context)
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	433 {
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	434 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	435 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	436
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	437 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	438 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	439 /* 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	440 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	441 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	442 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	443 context);
10101 4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	444 return;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	445 }
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	446 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	447 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	448 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	449 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	450 }
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	451
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	452 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	453 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	454 id++;
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	455
4fe8c4382712 Redesigned how login process passes connections to mail processes and changed related APIs. Timo Sirainen <tss@iki.fi> parents: diff changeset	456 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	457 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	458 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	459 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	460 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	461 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	462 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	463 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	464 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	465 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	466 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	467
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	468 if (auth->to == NULL)
0979e9e1e124 lib-master: Added timeout for auth master lookups. Timo Sirainen <tss@iki.fi> parents: 11086 diff changeset	469 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	470
12405 e72ab743b8df lib-master: Don't wait for handshake before sending auth-master request. Timo Sirainen <tss@iki.fi> parents: 12367 diff changeset	471 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	472 }
10199 9d13e9f78d52 lib-master: Fixes to handling master-login services. Timo Sirainen <tss@iki.fi> parents: 10159 diff changeset	473
9d13e9f78d52 lib-master: Fixes to handling master-login services. Timo Sirainen <tss@iki.fi> parents: 10159 diff changeset	474 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	475 {
9d13e9f78d52 lib-master: Fixes to handling master-login services. Timo Sirainen <tss@iki.fi> parents: 10159 diff changeset	476 return hash_table_count(auth->requests);
9d13e9f78d52 lib-master: Fixes to handling master-login services. Timo Sirainen <tss@iki.fi> parents: 10159 diff changeset	477 }

Mercurial > dovecot > core-2.2

annotate src/lib-master/master-login-auth.c @ 12488:4113324354f5