X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/14aa5a05b6399f98744f9542765288313d0bfb9d..6c588e74e33bb6b75a946f0373b23d989fb20a0d:/src/src/auths/dovecot.c diff --git a/src/src/auths/dovecot.c b/src/src/auths/dovecot.c index 6168ac9a2..ff0f8469c 100644 --- a/src/src/auths/dovecot.c +++ b/src/src/auths/dovecot.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/auths/dovecot.c,v 1.1 2006/10/02 13:38:18 ph10 Exp $ */ +/* $Cambridge: exim/src/src/auths/dovecot.c,v 1.10 2008/05/16 12:22:08 nm4 Exp $ */ /* * Copyright (c) 2004 Andrey Panin @@ -9,6 +9,11 @@ * (at your option) any later version. */ +/* A number of modifications have been made to the original code. Originally I +commented them specially, but now they are getting quite extensive, so I have +ceased doing that. The biggest change is to use unbuffered I/O on the socket +because using C buffered I/O gives problems on some operating systems. PH */ + #include "../exim.h" #include "dovecot.h" @@ -18,22 +23,32 @@ /* Options specific to the authentication mechanism. */ optionlist auth_dovecot_options[] = { { - "server_socket", - opt_stringptr, - (void *)(offsetof(auth_dovecot_options_block, server_socket)) + "server_socket", + opt_stringptr, + (void *)(offsetof(auth_dovecot_options_block, server_socket)) }, }; /* Size of the options list. An extern variable has to be used so that its address can appear in the tables drtables.c. */ + int auth_dovecot_options_count = sizeof(auth_dovecot_options) / sizeof(optionlist); /* Default private options block for the authentication method. */ + auth_dovecot_options_block auth_dovecot_option_defaults = { NULL, /* server_socket */ }; + +/* Static variables for reading from the socket */ + +static uschar sbuffer[256]; +static int sbp; + + + /************************************************* * Initialization entry point * *************************************************/ @@ -41,6 +56,7 @@ auth_dovecot_options_block auth_dovecot_option_defaults = { /* Called for each instance, after its options have been read, to enable consistency checks to be done, or anything else that needs to be set up. */ + void auth_dovecot_init(auth_instance *ablock) { auth_dovecot_options_block *ob = @@ -53,9 +69,9 @@ void auth_dovecot_init(auth_instance *ablock) ablock->client = FALSE; } -static int strcut(char *str, char **ptrs, int nptrs) +static int strcut(uschar *str, uschar **ptrs, int nptrs) { - char *tmp = str; + uschar *tmp = str; int n; for (n = 0; n < nptrs; n++) @@ -81,11 +97,11 @@ static int strcut(char *str, char **ptrs, int nptrs) } #define CHECK_COMMAND(str, arg_min, arg_max) do { \ - if (strcasecmp((str), args[0]) != 0) \ + if (strcmpic(US(str), args[0]) != 0) \ goto out; \ if (nargs - 1 < (arg_min)) \ goto out; \ - if (nargs - 1 > (arg_max)) \ + if ( (arg_max != -1) && (nargs - 1 > (arg_max)) ) \ goto out; \ } while (0) @@ -94,20 +110,64 @@ static int strcut(char *str, char **ptrs, int nptrs) goto out; \ } while(0) + + /************************************************* - * Server entry point * - *************************************************/ +* "fgets" to read directly from socket * +*************************************************/ + +/* Added by PH after a suggestion by Steve Usher because the previous use of +C-style buffered I/O gave trouble. */ + +static uschar * +dc_gets(uschar *s, int n, int fd) +{ +int p = 0; +int count = 0; + +for (;;) + { + if (sbp == 0) + { + sbp = read(fd, sbuffer, sizeof(sbuffer)); + if (sbp == 0) { if (count == 0) return NULL; else break; } + } + + while (p < sbp) + { + if (count >= n - 1) break; + s[count++] = sbuffer[p]; + if (sbuffer[p++] == '\n') break; + } + + memmove(sbuffer, sbuffer + p, sbp - p); + sbp -= p; + + if (s[count-1] == '\n' || count >= n - 1) break; + } + +s[count] = 0; +return s; +} + + + + +/************************************************* +* Server entry point * +*************************************************/ int auth_dovecot_server(auth_instance *ablock, uschar *data) { auth_dovecot_options_block *ob = (auth_dovecot_options_block *)(ablock->options_block); struct sockaddr_un sa; - char buffer[4096]; - char *args[8]; + uschar buffer[4096]; + uschar *args[8]; + uschar *auth_command; + uschar *auth_extra_data = US""; int nargs, tmp; int cuid = 0, cont = 1, found = 0, fd, ret = DEFER; - FILE *f; HDEBUG(D_auth) debug_printf("dovecot authentication\n"); @@ -137,24 +197,21 @@ int auth_dovecot_server(auth_instance *ablock, uschar *data) if (connect(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) goto out; - f = fdopen(fd, "a+"); - if (f == NULL) - goto out; - auth_defer_msg = US"authentication socket protocol error"; + sbp = 0; /* Socket buffer pointer */ while (cont) { - if (fgets(buffer, sizeof(buffer), f) == NULL) + if (dc_gets(buffer, sizeof(buffer), fd) == NULL) OUT("authentication socket read error or premature eof"); - buffer[strlen(buffer) - 1] = 0; + buffer[Ustrlen(buffer) - 1] = 0; HDEBUG(D_auth) debug_printf("received: %s\n", buffer); nargs = strcut(buffer, args, sizeof(args) / sizeof(args[0])); switch (toupper(*args[0])) { case 'C': CHECK_COMMAND("CUID", 1, 1); - cuid = atoi(args[1]); + cuid = Uatoi(args[1]); break; case 'D': @@ -174,7 +231,7 @@ int auth_dovecot_server(auth_instance *ablock, uschar *data) case 'V': CHECK_COMMAND("VERSION", 2, 2); - if (atoi(args[1]) != VERSION_MAJOR) + if (Uatoi(args[1]) != VERSION_MAJOR) OUT("authentication socket protocol version mismatch"); break; @@ -186,43 +243,72 @@ int auth_dovecot_server(auth_instance *ablock, uschar *data) if (!found) goto out; - fprintf(f, "VERSION\t%d\t%d\nCPID\t%d\n" - "AUTH\t%d\t%s\tservice=smtp\trip=%s\tlip=%s\tresp=%s\n", - VERSION_MAJOR, VERSION_MINOR, getpid(), cuid, - ablock->public_name, sender_host_address, interface_address, - data ? (char *) data : ""); + /* Added by PH: data must not contain tab (as it is + b64 it shouldn't, but check for safety). */ + + if (Ustrchr(data, '\t') != NULL) { + ret = FAIL; + goto out; + } + + /* Added by PH: extra fields when TLS is in use or if the TCP/IP + connection is local. */ + + if (tls_cipher != NULL) + auth_extra_data = string_sprintf("secured\t%s%s", + tls_certificate_verified? "valid-client-cert" : "", + tls_certificate_verified? "\t" : ""); + else if (interface_address != NULL && + Ustrcmp(sender_host_address, interface_address) == 0) + auth_extra_data = US"secured\t"; + /**************************************************************************** The code below was the original code here. It didn't work. A reading of the file auth-protocol.txt.gz that came with Dovecot 1.0_beta8 indicated that - this was not right. Maybe something changed. I changed it to the above, and - it seems to be better. PH + this was not right. Maybe something changed. I changed it to move the + service indication into the AUTH command, and it seems to be better. PH fprintf(f, "VERSION\t%d\t%d\r\nSERVICE\tSMTP\r\nCPID\t%d\r\n" "AUTH\t%d\t%s\trip=%s\tlip=%s\tresp=%s\r\n", VERSION_MAJOR, VERSION_MINOR, getpid(), cuid, ablock->public_name, sender_host_address, interface_address, data ? (char *) data : ""); + + Subsequently, the command was modified to add "secured" and "valid-client- + cert" when relevant. + + The auth protocol is documented here: + http://wiki.dovecot.org/Authentication_Protocol ****************************************************************************/ - HDEBUG(D_auth) debug_printf("sent: VERSION\t%d\t%d\nsent: CPID\t%d\n" - "sent: AUTH\t%d\t%s\tservice=smtp\trip=%s\tlip=%s\tresp=%s\n", + auth_command = string_sprintf("VERSION\t%d\t%d\nCPID\t%d\n" + "AUTH\t%d\t%s\tservice=smtp\t%srip=%s\tlip=%s\tnologin\tresp=%s\n", VERSION_MAJOR, VERSION_MINOR, getpid(), cuid, - ablock->public_name, sender_host_address, interface_address, - data ? (char *) data : ""); + ablock->public_name, auth_extra_data, sender_host_address, + interface_address, data ? (char *) data : ""); + if (write(fd, auth_command, Ustrlen(auth_command)) < 0) + HDEBUG(D_auth) debug_printf("error sending auth_command: %s\n", + strerror(errno)); + + HDEBUG(D_auth) debug_printf("sent: %s", auth_command); while (1) { - if (fgets(buffer, sizeof(buffer), f) == NULL) { + uschar *temp; + uschar *auth_id_pre = NULL; + int i; + + if (dc_gets(buffer, sizeof(buffer), fd) == NULL) { auth_defer_msg = US"authentication socket read error or premature eof"; goto out; } - buffer[strlen(buffer) - 1] = 0; + buffer[Ustrlen(buffer) - 1] = 0; HDEBUG(D_auth) debug_printf("received: %s\n", buffer); nargs = strcut(buffer, args, sizeof(args) / sizeof(args[0])); - if (atoi(args[1]) != cuid) + if (Uatoi(args[1]) != cuid) OUT("authentication socket connection id mismatch"); switch (toupper(*args[0])) { @@ -235,21 +321,30 @@ int auth_dovecot_server(auth_instance *ablock, uschar *data) goto out; } - if (fprintf(f, "CONT\t%d\t%s\r\n", cuid, data) < 0) - OUT("authentication socket write error"); + /* Added by PH: data must not contain tab (as it is + b64 it shouldn't, but check for safety). */ + if (Ustrchr(data, '\t') != NULL) { + ret = FAIL; + goto out; + } + + temp = string_sprintf("CONT\t%d\t%s\n", cuid, data); + if (write(fd, temp, Ustrlen(temp)) < 0) + OUT("authentication socket write error"); break; case 'F': - CHECK_COMMAND("FAIL", 1, 2); - - /* FIXME: add proper response handling */ - if (args[2]) { - uschar *p = US strchr(args[2], '='); - if (p) { - ++p; - expand_nstring[1] = auth_vars[0] = p; - expand_nlength[1] = Ustrlen(p); + CHECK_COMMAND("FAIL", 1, -1); + + for (i=2; (i