X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/05c39afa86ea3d0dd619e7d75554c701f96d2da4..6ce765b2efe7c0b1c055c35a9bc4f2f2f89f2697:/src/src/dcc.c diff --git a/src/src/dcc.c b/src/src/dcc.c index 44c0c009a..fcdc5a897 100644 --- a/src/src/dcc.c +++ b/src/src/dcc.c @@ -2,10 +2,12 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Wolfgang Breyha 2005-2013 +/* Copyright (c) Wolfgang Breyha 2005 - 2015 * Vienna University Computer Center * wbreyha@gmx.net * See the file NOTICE for conditions of use and distribution. + * + * Copyright (c) The Exim Maintainers 2015 - 2016 */ /* This patch is based on code from Tom Kistners exiscan (ACL integration) and @@ -45,9 +47,11 @@ int flushbuffer (int socket, uschar *buffer) return retval; } -int dcc_process(uschar **listptr) { +int +dcc_process(uschar **listptr) +{ int sep = 0; - uschar *list = *listptr; + const uschar *list = *listptr; FILE *data_file; uschar *dcc_default_ip_option = US"127.0.0.1"; uschar *dcc_helo_option = US"localhost"; @@ -68,7 +72,6 @@ int dcc_process(uschar **listptr) { uschar sendbuf[4096]; uschar recvbuf[4096]; uschar dcc_return_text[1024]; - uschar mbox_path[1024]; uschar message_subdir[2]; struct header_line *dcchdr; uschar *dcc_acl_options; @@ -77,50 +80,42 @@ int dcc_process(uschar **listptr) { /* grep 1st option */ if ((dcc_acl_options = string_nextinlist(&list, &sep, - dcc_acl_options_buffer, - sizeof(dcc_acl_options_buffer))) != NULL) - { + dcc_acl_options_buffer, sizeof(dcc_acl_options_buffer)))) + { /* parse 1st option */ - if ( (strcmpic(dcc_acl_options,US"false") == 0) || - (Ustrcmp(dcc_acl_options,"0") == 0) ) { - /* explicitly no matching */ - return FAIL; - }; - - /* special cases (match anything except empty) */ - if ( (strcmpic(dcc_acl_options,US"true") == 0) || - (Ustrcmp(dcc_acl_options,"*") == 0) || - (Ustrcmp(dcc_acl_options,"1") == 0) ) { - dcc_acl_options = dcc_acl_options; - }; - } - else { - /* empty means "don't match anything" */ - return FAIL; - }; + if ( strcmpic(dcc_acl_options, US"false") == 0 + || Ustrcmp(dcc_acl_options, "0") == 0 + ) + return FAIL; /* explicitly no matching */ + } + else + return FAIL; /* empty means "don't match anything" */ sep = 0; /* if we scanned this message last time, just return */ - if ( dcc_ok ) - return dcc_rc; + if (dcc_ok) + return dcc_rc; /* open the spooled body */ message_subdir[1] = '\0'; - for (i = 0; i < 2; i++) { - message_subdir[0] = (split_spool_directory == (i == 0))? message_id[5] : 0; - sprintf(CS mbox_path, "%s/input/%s/%s-D", spool_directory, message_subdir, message_id); - data_file = Ufopen(mbox_path,"rb"); - if (data_file != NULL) + for (i = 0; i < 2; i++) + { + message_subdir[0] = split_spool_directory == (i == 0) ? message_id[5] : 0; + + if ((data_file = Ufopen( + spool_fname(US"input", message_subdir, message_id, US"-D"), + "rb"))) break; - }; + } - if (data_file == NULL) { + if (!data_file) + { /* error while spooling */ log_write(0, LOG_MAIN|LOG_PANIC, "dcc acl condition: error while opening spool file"); return DEFER; - }; + } /* Initialize the variables */ @@ -142,18 +137,18 @@ int dcc_process(uschar **listptr) { bzero(opts,sizeof(opts)); Ustrncpy(opts, dccifd_options, sizeof(opts)-1); /* if $acl_m_dcc_override_client_ip is set use it */ - if (((override_client_ip = expand_string(US"$acl_m_dcc_override_client_ip")) != NULL) && + if (((override_client_ip = expand_string(US"$acl_m_dcc_override_client_ip")) != NULL) && (override_client_ip[0] != '\0')) { Ustrncpy(client_ip, override_client_ip, sizeof(client_ip)-1); DEBUG(D_acl) debug_printf("DCC: Client IP (overridden): %s\n", client_ip); - } + } else if(sender_host_address) { /* else if $sender_host_address is available use that? */ Ustrncpy(client_ip, sender_host_address, sizeof(client_ip)-1); DEBUG(D_acl) debug_printf("DCC: Client IP (sender_host_address): %s\n", client_ip); - } + } else { /* sender_host_address is NULL which means it comes from localhost */ Ustrncpy(client_ip, dcc_default_ip_option, sizeof(client_ip)-1); @@ -214,9 +209,9 @@ int dcc_process(uschar **listptr) { } } else { /* connecting to the dccifd UNIX socket */ - bzero((char *)&serv_addr,sizeof(serv_addr)); + bzero(&serv_addr, sizeof(serv_addr)); serv_addr.sun_family = AF_UNIX; - Ustrcpy(serv_addr.sun_path, sockpath); + Ustrncpy(serv_addr.sun_path, sockpath, sizeof(serv_addr.sun_path)); if ((sockfd = socket(AF_UNIX, SOCK_STREAM,0)) < 0){ DEBUG(D_acl) debug_printf("DCC: Creating UNIX socket connection failed: %s\n", strerror(errno)); @@ -302,7 +297,7 @@ int dcc_process(uschar **listptr) { } } - /* a blank line seperates header from body */ + /* a blank line separates header from body */ Ustrncat(sendbuf, "\n", sizeof(sendbuf)-Ustrlen(sendbuf)-1); flushbuffer(sockfd, sendbuf); DEBUG(D_acl) @@ -432,11 +427,11 @@ int dcc_process(uschar **listptr) { } } else { - /* We're on the first line but not on the first character, - * there must be something wrong. */ - DEBUG(D_acl) - debug_printf("DCC: Line = %d but i = %d != 0 character is %c - This is wrong!\n", line, i, recvbuf[i]); - log_write(0,LOG_MAIN,"Wrong header from DCC, output is %s\n", recvbuf); + /* We're on the first line but not on the first character, + * there must be something wrong. */ + DEBUG(D_acl) debug_printf("DCC: Line = %d but i = %d != 0" + " character is %c - This is wrong!\n", line, i, recvbuf[i]); + log_write(0,LOG_MAIN,"Wrong header from DCC, output is %s\n", recvbuf); } } else if(line == 2) { @@ -449,13 +444,13 @@ int dcc_process(uschar **listptr) { /* The third and following lines are the X-DCC header, * so we store it in dcc_header_str. */ /* check if we don't get more than we can handle */ - if(k < sizeof(dcc_header_str)) { + if(k < sizeof(dcc_header_str)) { dcc_header_str[k] = recvbuf[i]; k++; } else { - DEBUG(D_acl) - debug_printf("DCC: We got more output than we can store in the X-DCC header. Truncating at 120 characters.\n"); + DEBUG(D_acl) debug_printf("DCC: We got more output than we can store" + " in the X-DCC header. Truncating at 120 characters.\n"); } } else {