X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/05c39afa86ea3d0dd619e7d75554c701f96d2da4..86ede124f0ce622b4f73e05504abc11fece021e3:/src/src/dcc.c diff --git a/src/src/dcc.c b/src/src/dcc.c index 44c0c009a..4c86c092b 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 - 2018 */ /* 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"; @@ -56,7 +60,7 @@ int dcc_process(uschar **listptr) { uschar *override_client_ip = NULL; /* from local_scan */ - int i, j, k, c, retval, sockfd, resp, line; + int j, k, c, retval, sockfd, resp, line; unsigned int portnr; struct sockaddr_un serv_addr; struct sockaddr_in serv_addr_in; @@ -68,8 +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; uschar dcc_acl_options_buffer[10]; @@ -77,50 +79,41 @@ 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 (int i = 0; i < 2; i++) + { + uschar message_subdir[2]; + set_subdir_str(message_subdir, message_id, i); + 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 +135,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); @@ -161,11 +154,11 @@ int dcc_process(uschar **listptr) { debug_printf("DCC: Client IP (default): %s\n", client_ip); } /* strncat(opts, my_request, strlen(my_request)); */ - Ustrcat(opts, "\n"); + Ustrcat(opts, US"\n"); Ustrncat(opts, client_ip, sizeof(opts)-Ustrlen(opts)-1); - Ustrncat(opts, "\nHELO ", sizeof(opts)-Ustrlen(opts)-1); + Ustrncat(opts, US"\nHELO ", sizeof(opts)-Ustrlen(opts)-1); Ustrncat(opts, dcc_helo_option, sizeof(opts)-Ustrlen(opts)-2); - Ustrcat(opts, "\n"); + Ustrcat(opts, US"\n"); /* initialize the other variables */ dcchdr = header_list; @@ -181,8 +174,8 @@ int dcc_process(uschar **listptr) { if (Ustrlen(sender_address) > 0) Ustrncpy(from, sender_address, sizeof(from)); else - Ustrncpy(from, "<>", sizeof(from)); - Ustrncat(from, "\n", sizeof(from)-Ustrlen(from)-1); + Ustrncpy(from, US"<>", sizeof(from)); + Ustrncat(from, US"\n", sizeof(from)-Ustrlen(from)-1); /************************************** * Now creating the socket connection * @@ -190,10 +183,10 @@ int dcc_process(uschar **listptr) { /* If sockip contains an ip, we use a tcp socket, otherwise a UNIX socket */ if(Ustrcmp(sockip, "")){ - ipaddress = gethostbyname((char *)sockip); - bzero((char *) &serv_addr_in, sizeof(serv_addr_in)); + ipaddress = gethostbyname(CS sockip); + bzero(CS &serv_addr_in, sizeof(serv_addr_in)); serv_addr_in.sin_family = AF_INET; - bcopy((char *)ipaddress->h_addr, (char *)&serv_addr_in.sin_addr.s_addr, ipaddress->h_length); + bcopy(CS ipaddress->h_addr, CS &serv_addr_in.sin_addr.s_addr, ipaddress->h_length); serv_addr_in.sin_port = htons(portnr); if ((sockfd = socket(AF_INET, SOCK_STREAM,0)) < 0){ DEBUG(D_acl) @@ -214,9 +207,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(US 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)); @@ -249,7 +242,7 @@ int dcc_process(uschar **listptr) { } /* let's send each of the recipients to dccifd */ - for (i = 0; i < recipients_count; i++){ + for (int i = 0; i < recipients_count; i++){ DEBUG(D_acl) debug_printf("DCC: recipient = %s\n",recipients_list[i].address); if(Ustrlen(sendbuf) + Ustrlen(recipients_list[i].address) > sizeof(sendbuf)) @@ -260,10 +253,10 @@ int dcc_process(uschar **listptr) { bzero(sendbuf, sizeof(sendbuf)); } Ustrncat(sendbuf, recipients_list[i].address, sizeof(sendbuf)-Ustrlen(sendbuf)-1); - Ustrncat(sendbuf, "\r\n", sizeof(sendbuf)-Ustrlen(sendbuf)-1); + Ustrncat(sendbuf, US"\r\n", sizeof(sendbuf)-Ustrlen(sendbuf)-1); } /* send a blank line between options and message */ - Ustrncat(sendbuf, "\n", sizeof(sendbuf)-Ustrlen(sendbuf)-1); + Ustrncat(sendbuf, US"\n", sizeof(sendbuf)-Ustrlen(sendbuf)-1); /* Now we send the input buffer */ DEBUG(D_acl) debug_printf("DCC: %s\nDCC: ****************************\n", sendbuf); @@ -286,7 +279,7 @@ int dcc_process(uschar **listptr) { j = 0; while(j < dcchdr->slen) { - for(i = 0; i < sizeof(sendbuf)-2; i++) { + for(int i = 0; i < sizeof(sendbuf)-2; i++) { sendbuf[i] = dcchdr->text[j]; j++; } @@ -302,8 +295,8 @@ int dcc_process(uschar **listptr) { } } - /* a blank line seperates header from body */ - Ustrncat(sendbuf, "\n", sizeof(sendbuf)-Ustrlen(sendbuf)-1); + /* a blank line separates header from body */ + Ustrncat(sendbuf, US"\n", sizeof(sendbuf)-Ustrlen(sendbuf)-1); flushbuffer(sockfd, sendbuf); DEBUG(D_acl) debug_printf("\nDCC: ****************************\n%s", sendbuf); @@ -364,12 +357,11 @@ int dcc_process(uschar **listptr) { debug_printf("DCC: Length of the output buffer is: %d\nDCC: Output buffer is:\nDCC: ------------\nDCC: %s\nDCC: -----------\n", c, recvbuf); /* Now let's read each character and see what we've got */ - for(i = 0; i < c; i++) { + for(int i = 0; i < c; i++) { /* First check if we reached the end of the line and * then increment the line counter */ - if(recvbuf[i] == '\n') { + if(recvbuf[i] == '\n') line++; - } else { /* The first character of the first line is the * overall response. If there's another character @@ -381,7 +373,7 @@ int dcc_process(uschar **listptr) { if(recvbuf[i] == 'A') { DEBUG(D_acl) debug_printf("DCC: Overall result = A\treturning OK\n"); - Ustrcpy(dcc_return_text, "Mail accepted by DCC"); + Ustrcpy(dcc_return_text, US"Mail accepted by DCC"); dcc_result = US"A"; retval = OK; } @@ -401,7 +393,7 @@ int dcc_process(uschar **listptr) { else if(recvbuf[i] == 'S') { DEBUG(D_acl) debug_printf("DCC: Overall result = S\treturning OK\n"); - Ustrcpy(dcc_return_text, "Not all recipients accepted by DCC"); + Ustrcpy(dcc_return_text, US"Not all recipients accepted by DCC"); /* Since we're in an ACL we want a global result * so we accept for all */ dcc_result = US"A"; @@ -410,7 +402,7 @@ int dcc_process(uschar **listptr) { else if(recvbuf[i] == 'G') { DEBUG(D_acl) debug_printf("DCC: Overall result = G\treturning FAIL\n"); - Ustrcpy(dcc_return_text, "Greylisted by DCC"); + Ustrcpy(dcc_return_text, US"Greylisted by DCC"); dcc_result = US"G"; retval = FAIL; } @@ -419,7 +411,7 @@ int dcc_process(uschar **listptr) { debug_printf("DCC: Overall result = T\treturning DEFER\n"); retval = DEFER; log_write(0,LOG_MAIN,"Temporary error with DCC: %s\n", recvbuf); - Ustrcpy(dcc_return_text, "Temporary error with DCC"); + Ustrcpy(dcc_return_text, US"Temporary error with DCC"); dcc_result = US"T"; } else { @@ -427,16 +419,16 @@ int dcc_process(uschar **listptr) { debug_printf("DCC: Overall result = something else\treturning DEFER\n"); retval = DEFER; log_write(0,LOG_MAIN,"Unknown DCC response: %s\n", recvbuf); - Ustrcpy(dcc_return_text, "Unknown DCC response"); + Ustrcpy(dcc_return_text, US"Unknown DCC response"); dcc_result = US"T"; } } 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 +441,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 { @@ -497,7 +489,7 @@ int dcc_process(uschar **listptr) { if (((xtra_hdrs = expand_string(US"$acl_m_dcc_add_header")) != NULL) && (xtra_hdrs[0] != '\0')) { Ustrncpy(dcc_xtra_hdrs, xtra_hdrs, sizeof(dcc_xtra_hdrs) - 2); if (dcc_xtra_hdrs[Ustrlen(dcc_xtra_hdrs)-1] != '\n') - Ustrcat(dcc_xtra_hdrs, "\n"); + Ustrcat(dcc_xtra_hdrs, US"\n"); header_add(' ', "%s", dcc_xtra_hdrs); DEBUG(D_acl) debug_printf("DCC: adding additional headers in $acl_m_dcc_add_header: %s", dcc_xtra_hdrs);