X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/74f1a42304ce056cf979d22fb970faae161e3ab2..569a8b23aa46c3d5cabdcd1540cd4c590d592f80:/src/src/receive.c diff --git a/src/src/receive.c b/src/src/receive.c index 974756f06..6d54ad33c 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -109,7 +109,7 @@ BOOL receive_check_set_sender(uschar *newsender) { uschar *qnewsender; -if (trusted_caller) return TRUE; +if (f.trusted_caller) return TRUE; if (!newsender || !untrusted_set_sender) return FALSE; qnewsender = Ustrchr(newsender, '@') ? newsender : string_sprintf("%s@%s", newsender, qualify_domain_sender); @@ -144,7 +144,7 @@ Returns: available on-root space, in kilobytes All values are -1 if the STATFS functions are not available. */ -int +int_eximarith_t receive_statvfs(BOOL isspool, int *inodeptr) { #ifdef HAVE_STATFS @@ -223,7 +223,7 @@ if (STATVFS(CS path, &statbuf) != 0) /* Disks are getting huge. Take care with computing the size in kilobytes. */ -return (int)(((double)statbuf.F_BAVAIL * (double)statbuf.F_FRSIZE)/1024.0); +return (int_eximarith_t)(((double)statbuf.F_BAVAIL * (double)statbuf.F_FRSIZE)/1024.0); #else /* Unable to find partition sizes in this environment. */ @@ -258,22 +258,23 @@ Returns: FALSE if there isn't enough space, or if the information cannot BOOL receive_check_fs(int msg_size) { -int space, inodes; +int_eximarith_t space; +int inodes; if (check_spool_space > 0 || msg_size > 0 || check_spool_inodes > 0) { space = receive_statvfs(TRUE, &inodes); DEBUG(D_receive) - debug_printf("spool directory space = %dK inodes = %d " - "check_space = %dK inodes = %d msg_size = %d\n", + debug_printf("spool directory space = " PR_EXIM_ARITH "K inodes = %d " + "check_space = " PR_EXIM_ARITH "K inodes = %d msg_size = %d\n", space, inodes, check_spool_space, check_spool_inodes, msg_size); if ((space >= 0 && space < check_spool_space) || (inodes >= 0 && inodes < check_spool_inodes)) { - log_write(0, LOG_MAIN, "spool directory space check failed: space=%d " - "inodes=%d", space, inodes); + log_write(0, LOG_MAIN, "spool directory space check failed: space=" + PR_EXIM_ARITH " inodes=%d", space, inodes); return FALSE; } } @@ -283,15 +284,15 @@ if (check_log_space > 0 || check_log_inodes > 0) space = receive_statvfs(FALSE, &inodes); DEBUG(D_receive) - debug_printf("log directory space = %dK inodes = %d " - "check_space = %dK inodes = %d\n", + debug_printf("log directory space = " PR_EXIM_ARITH "K inodes = %d " + "check_space = " PR_EXIM_ARITH "K inodes = %d\n", space, inodes, check_log_space, check_log_inodes); - if ((space >= 0 && space < check_log_space) || - (inodes >= 0 && inodes < check_log_inodes)) + if ( space >= 0 && space < check_log_space + || inodes >= 0 && inodes < check_log_inodes) { - log_write(0, LOG_MAIN, "log directory space check failed: space=%d " - "inodes=%d", space, inodes); + log_write(0, LOG_MAIN, "log directory space check failed: space=" PR_EXIM_ARITH + " inodes=%d", space, inodes); return FALSE; } } @@ -487,7 +488,7 @@ if (recipients_count >= recipients_list_max) { recipient_item *oldlist = recipients_list; int oldmax = recipients_list_max; - recipients_list_max = recipients_list_max? 2*recipients_list_max : 50; + recipients_list_max = recipients_list_max ? 2*recipients_list_max : 50; recipients_list = store_get(recipients_list_max * sizeof(recipient_item)); if (oldlist != NULL) memcpy(recipients_list, oldlist, oldmax * sizeof(recipient_item)); @@ -619,7 +620,7 @@ register int linelength = 0; /* Handle the case when only EOF terminates the message */ -if (!dot_ends) +if (!f.dot_ends) { register int last_ch = '\n'; @@ -1023,7 +1024,7 @@ int ch; DEBUG(D_receive) debug_printf("CHUNKING: %s\n", fout ? "writing spoolfile in wire format" : "flushing input"); -spool_file_wireformat = TRUE; +f.spool_file_wireformat = TRUE; for (;;) { @@ -1305,21 +1306,30 @@ if (sender_fullhost) if (LOGGING(dnssec) && sender_host_dnssec) /*XXX sender_helo_dnssec? */ g = string_catn(g, US" DS", 3); g = string_append(g, 2, US" H=", sender_fullhost); - if (LOGGING(incoming_interface) && interface_address != NULL) - { - g = string_cat(g, - string_sprintf(" I=[%s]:%d", interface_address, interface_port)); - } + if (LOGGING(incoming_interface) && interface_address) + g = string_fmt_append(g, " I=[%s]:%d", interface_address, interface_port); } -if (tcp_in_fastopen && !tcp_in_fastopen_logged) +if (f.tcp_in_fastopen && !f.tcp_in_fastopen_logged) { - g = string_catn(g, US" TFO", 4); - tcp_in_fastopen_logged = TRUE; + g = string_catn(g, US" TFO*", f.tcp_in_fastopen_data ? 5 : 4); + f.tcp_in_fastopen_logged = TRUE; } if (sender_ident) g = string_append(g, 2, US" U=", sender_ident); if (received_protocol) g = string_append(g, 2, US" P=", received_protocol); +if (LOGGING(pipelining) && f.smtp_in_pipelining_advertised) + { + g = string_catn(g, US" L", 2); +#ifdef EXPERIMENTAL_PIPE_CONNECT + if (f.smtp_in_early_pipe_used) + g = string_catn(g, US"*", 1); + else if (f.smtp_in_early_pipe_advertised) + g = string_catn(g, US".", 1); +#endif + if (!f.smtp_in_pipelining_used) + g = string_catn(g, US"-", 1); + } return g; } @@ -1621,7 +1631,7 @@ int error_rc = error_handling == ERRORS_SENDER ? errors_sender_rc : EXIT_FAILURE; int header_size = 256; int start, end, domain; -int id_resolution; +int id_resolution = 0; int had_zero = 0; int prevlines_length = 0; @@ -1728,7 +1738,7 @@ message_linecount = body_linecount = body_zerocount = #ifndef DISABLE_DKIM /* Call into DKIM to set up the context. In CHUNKING mode we clear the dot-stuffing flag */ -if (smtp_input && !smtp_batched_input && !dkim_disable_verify) +if (smtp_input && !smtp_batched_input && !f.dkim_disable_verify) dkim_exim_verify_init(chunking_state <= CHUNKING_OFFERED); #endif @@ -1762,7 +1772,7 @@ single timeout for the whole message. */ else if (receive_timeout > 0) { os_non_restarting_signal(SIGALRM, data_timeout_handler); - alarm(receive_timeout); + ALARM(receive_timeout); } /* SIGTERM and SIGINT are caught always. */ @@ -1860,7 +1870,7 @@ for (;;) prevent further reading), and break out of the loop, having freed the empty header, and set next = NULL to indicate no data line. */ - if (ptr == 0 && ch == '.' && dot_ends) + if (ptr == 0 && ch == '.' && f.dot_ends) { ch = (receive_getc)(GETC_BUFFER_UNLIMITED); if (ch == '\r') @@ -1933,7 +1943,7 @@ for (;;) log_write(0, LOG_MAIN, "ridiculously long message header received from " "%s (more than %d characters): message abandoned", - sender_host_unknown? sender_ident : sender_fullhost, header_maxsize); + f.sender_host_unknown ? sender_ident : sender_fullhost, header_maxsize); if (smtp_input) { @@ -2057,7 +2067,7 @@ for (;;) && regex_match_and_setup(regex_From, next->text, 0, -1) ) { - if (!sender_address_forced) + if (!f.sender_address_forced) { uschar *uucp_sender = expand_string(uucp_from_sender); if (!uucp_sender) @@ -2079,11 +2089,11 @@ for (;;) { sender_address = newsender; - if (trusted_caller || filter_test != FTEST_NONE) + if (f.trusted_caller || filter_test != FTEST_NONE) { authenticated_sender = NULL; originator_name = US""; - sender_local = FALSE; + f.sender_local = FALSE; } if (filter_test != FTEST_NONE) @@ -2154,7 +2164,7 @@ for (;;) { log_write(0, LOG_MAIN, "overlong message header line received from " "%s (more than %d characters): message abandoned", - sender_host_unknown? sender_ident : sender_fullhost, + f.sender_host_unknown ? sender_ident : sender_fullhost, header_line_maxsize); if (smtp_input) @@ -2381,9 +2391,9 @@ for (h = header_list->next; h; h = h->next) set.) */ case htype_sender: - h->type = !active_local_sender_retain - && ( sender_local && !trusted_caller && !suppress_local_fixups - || submission_mode + h->type = !f.active_local_sender_retain + && ( f.sender_local && !f.trusted_caller && !f.suppress_local_fixups + || f.submission_mode ) && (!resents_exist || is_resent) ? htype_old : htype_sender; @@ -2469,7 +2479,7 @@ if (extract_recip) uschar *s = Ustrchr(h->text, ':') + 1; while (isspace(*s)) s++; - parse_allow_group = TRUE; /* Allow address group syntax */ + f.parse_allow_group = TRUE; /* Allow address group syntax */ while (*s != 0) { @@ -2549,8 +2559,8 @@ if (extract_recip) while (isspace(*s)) s++; } /* Next address */ - parse_allow_group = FALSE; /* Reset group syntax flags */ - parse_found_group = FALSE; + f.parse_allow_group = FALSE; /* Reset group syntax flags */ + f.parse_found_group = FALSE; /* If this was the bcc: header, mark it "old", which means it will be kept on the spool, but not transmitted as part of the @@ -2623,7 +2633,7 @@ the message, if necessary (we hope it won't be). */ if (host_number_string) { - id_resolution = (BASE_62 == 62)? 5000 : 10000; + id_resolution = BASE_62 == 62 ? 5000 : 10000; sprintf(CS(message_id + MESSAGE_ID_LENGTH - 3), "-%2s", string_base62((long int)( host_number * (1000000/id_resolution) + @@ -2635,7 +2645,7 @@ appropriate resolution. */ else { - id_resolution = (BASE_62 == 62)? 500 : 1000; + id_resolution = BASE_62 == 62 ? 500 : 1000; sprintf(CS(message_id + MESSAGE_ID_LENGTH - 3), "-%2s", string_base62((long int)(message_id_tv.tv_usec/id_resolution)) + 4); } @@ -2658,7 +2668,7 @@ messages. This can be user-configured if required, but we had better flatten any illegal characters therein. */ if ( !msgid_header - && ((!sender_host_address && !suppress_local_fixups) || submission_mode)) + && ((!sender_host_address && !f.suppress_local_fixups) || f.submission_mode)) { uschar *p; uschar *id_text = US""; @@ -2671,7 +2681,7 @@ if ( !msgid_header uschar *new_id_domain = expand_string(message_id_domain); if (!new_id_domain) { - if (!expand_string_forcedfail) + if (!f.expand_string_forcedfail) log_write(0, LOG_MAIN|LOG_PANIC, "expansion of \"%s\" (message_id_header_domain) " "failed: %s", message_id_domain, expand_string_message); @@ -2692,7 +2702,7 @@ if ( !msgid_header uschar *new_id_text = expand_string(message_id_text); if (!new_id_text) { - if (!expand_string_forcedfail) + if (!f.expand_string_forcedfail) log_write(0, LOG_MAIN|LOG_PANIC, "expansion of \"%s\" (message_id_header_text) " "failed: %s", message_id_text, expand_string_message); @@ -2744,7 +2754,7 @@ untrusted user to set anything in the envelope (which might then get info From:) but we still want to ensure a valid Sender: if it is required. */ if ( !from_header - && ((!sender_host_address && !suppress_local_fixups) || submission_mode)) + && ((!sender_host_address && !f.suppress_local_fixups) || f.submission_mode)) { uschar *oname = US""; @@ -2755,8 +2765,8 @@ if ( !from_header if (!sender_host_address) { - if (!trusted_caller || sender_name_forced || - (!smtp_input && !sender_address_forced)) + if (!f.trusted_caller || f.sender_name_forced || + (!smtp_input && !f.sender_address_forced)) oname = originator_name; } @@ -2775,12 +2785,12 @@ if ( !from_header resent_prefix, oname, *oname ? " <" : ""); fromend = *oname ? US">" : US""; - if (sender_local || local_error_message) + if (f.sender_local || f.local_error_message) header_add(htype_from, "%s%s@%s%s\n", fromstart, local_part_quote(originator_login), qualify_domain_sender, fromend); - else if (submission_mode && authenticated_id) + else if (f.submission_mode && authenticated_id) { if (!submission_domain) header_add(htype_from, "%s%s@%s%s\n", fromstart, @@ -2827,9 +2837,9 @@ here. If the From: header contains more than one address, then the call to parse_extract_address fails, and a Sender: header is inserted, as required. */ if ( from_header - && ( active_local_from_check - && ( sender_local && !trusted_caller && !suppress_local_fixups - || submission_mode && authenticated_id + && ( f.active_local_from_check + && ( f.sender_local && !f.trusted_caller && !f.suppress_local_fixups + || f.submission_mode && authenticated_id ) ) ) { BOOL make_sender = TRUE; @@ -2840,7 +2850,7 @@ if ( from_header &start, &end, &domain, FALSE); uschar *generated_sender_address; - generated_sender_address = submission_mode + generated_sender_address = f.submission_mode ? !submission_domain ? string_sprintf("%s@%s", local_part_quote(authenticated_id), qualify_domain_sender) @@ -2878,19 +2888,19 @@ if ( from_header appropriate rewriting rules. */ if (make_sender) - if (submission_mode && !submission_name) + if (f.submission_mode && !submission_name) header_add(htype_sender, "%sSender: %s\n", resent_prefix, generated_sender_address); else header_add(htype_sender, "%sSender: %s <%s>\n", resent_prefix, - submission_mode? submission_name : originator_name, + f.submission_mode ? submission_name : originator_name, generated_sender_address); /* Ensure that a non-null envelope sender address corresponds to the submission mode sender address. */ - if (submission_mode && *sender_address) + if (f.submission_mode && *sender_address) { if (!sender_address_unrewritten) sender_address_unrewritten = sender_address; @@ -2955,7 +2965,7 @@ As per Message-Id, we prepend if resending, else append. */ if ( !date_header_exists - && ((!sender_host_address && !suppress_local_fixups) || submission_mode)) + && ((!sender_host_address && !f.suppress_local_fixups) || f.submission_mode)) header_add_at_position(!resents_exist, NULL, FALSE, htype_other, "%sDate: %s\n", resent_prefix, tod_stamp(tod_full)); @@ -3234,16 +3244,16 @@ if (extract_recip && (bad_addresses || recipients_count == 0)) if (recipients_count == 0) debug_printf("*** No recipients\n"); if (bad_addresses) { - error_block *eblock = bad_addresses; + error_block * eblock; debug_printf("*** Bad address(es)\n"); - while (eblock != NULL) - { + for (eblock = bad_addresses; eblock; eblock = eblock->next) debug_printf(" %s: %s\n", eblock->text1, eblock->text2); - eblock = eblock->next; - } } } + log_write(0, LOG_MAIN|LOG_PANIC, "%s %s found in headers", + message_id, bad_addresses ? "bad addresses" : "no recipients"); + fseek(spool_data_file, (long int)SPOOL_DATA_START_OFFSET, SEEK_SET); /* If configured to send errors to the sender, but this fails, force @@ -3255,11 +3265,12 @@ if (extract_recip && (bad_addresses || recipients_count == 0)) if (error_handling == ERRORS_SENDER) { if (!moan_to_sender( - (bad_addresses == NULL)? - (extracted_ignored? ERRMESS_IGADDRESS : ERRMESS_NOADDRESS) : - (recipients_list == NULL)? ERRMESS_BADNOADDRESS : ERRMESS_BADADDRESS, - bad_addresses, header_list, spool_data_file, FALSE)) - error_rc = (bad_addresses == NULL)? EXIT_NORECIPIENTS : EXIT_FAILURE; + bad_addresses + ? recipients_list ? ERRMESS_BADADDRESS : ERRMESS_BADNOADDRESS + : extracted_ignored ? ERRMESS_IGADDRESS : ERRMESS_NOADDRESS, + bad_addresses, header_list, spool_data_file, FALSE + ) ) + error_rc = bad_addresses ? EXIT_FAILURE : EXIT_NORECIPIENTS; } else { @@ -3331,10 +3342,10 @@ $message_body_end can be extracted if needed. Allow $recipients in expansions. deliver_datafile = data_fd; user_msg = NULL; -enable_dollar_recipients = TRUE; +f.enable_dollar_recipients = TRUE; if (recipients_count == 0) - blackholed_by = recipients_discarded ? US"MAIL ACL" : US"RCPT ACL"; + blackholed_by = f.recipients_discarded ? US"MAIL ACL" : US"RCPT ACL"; else { @@ -3344,7 +3355,7 @@ else { #ifndef DISABLE_DKIM - if (!dkim_disable_verify) + if (!f.dkim_disable_verify) { /* Finish verification */ dkim_exim_verify_finish(); @@ -3573,7 +3584,7 @@ else if (acl_not_smtp) { uschar *user_msg, *log_msg; - authentication_local = TRUE; + f.authentication_local = TRUE; rc = acl_check(ACL_WHERE_NOTSMTP, NULL, acl_not_smtp, &user_msg, &log_msg); if (rc == DISCARD) { @@ -3617,8 +3628,8 @@ else /* The applicable ACLs have been run */ - if (deliver_freeze) frozen_by = US"ACL"; /* for later logging */ - if (queue_only_policy) queued_by = US"ACL"; + if (f.deliver_freeze) frozen_by = US"ACL"; /* for later logging */ + if (f.queue_only_policy) queued_by = US"ACL"; } #ifdef WITH_CONTENT_SCAN @@ -3655,12 +3666,12 @@ if (sigsetjmp(local_scan_env, 1) == 0) had_local_scan_timeout = 0; os_non_restarting_signal(SIGALRM, local_scan_timeout_handler); - if (local_scan_timeout > 0) alarm(local_scan_timeout); + if (local_scan_timeout > 0) ALARM(local_scan_timeout); rc = local_scan(data_fd, &local_scan_data); - alarm(0); + ALARM_CLR(0); os_non_restarting_signal(SIGALRM, sigalrm_handler); - enable_dollar_recipients = FALSE; + f.enable_dollar_recipients = FALSE; store_pool = POOL_MAIN; /* In case changed */ DEBUG(D_receive) debug_printf("local_scan() returned %d %s\n", rc, @@ -3702,9 +3713,9 @@ if (local_scan_data) if (rc == LOCAL_SCAN_ACCEPT_FREEZE) { - if (!deliver_freeze) /* ACL might have already frozen */ + if (!f.deliver_freeze) /* ACL might have already frozen */ { - deliver_freeze = TRUE; + f.deliver_freeze = TRUE; deliver_frozen_at = time(NULL); frozen_by = US"local_scan()"; } @@ -3712,9 +3723,9 @@ if (rc == LOCAL_SCAN_ACCEPT_FREEZE) } else if (rc == LOCAL_SCAN_ACCEPT_QUEUE) { - if (!queue_only_policy) /* ACL might have already queued */ + if (!f.queue_only_policy) /* ACL might have already queued */ { - queue_only_policy = TRUE; + f.queue_only_policy = TRUE; queued_by = US"local_scan()"; } rc = LOCAL_SCAN_ACCEPT; @@ -3821,7 +3832,7 @@ signal(SIGINT, SIG_IGN); /* Ensure the first time flag is set in the newly-received message. */ -deliver_firsttime = TRUE; +f.deliver_firsttime = TRUE; #ifdef EXPERIMENTAL_BRIGHTMAIL if (bmi_run == 1) @@ -3845,8 +3856,8 @@ memcpy(received_header->text + received_header->slen - tslen - 1, if (mua_wrapper) { - deliver_freeze = FALSE; - queue_only_policy = FALSE; + f.deliver_freeze = FALSE; + f.queue_only_policy = FALSE; } /* Keep the data file open until we have written the header file, in order to @@ -3891,16 +3902,6 @@ else receive_messagecount++; -/* In SMTP sessions we may receive several in one connection. After each one, -we wait for the clock to tick at the level of message-id granularity. This is -so that the combination of time+pid is unique, even on systems where the pid -can be re-used within our time interval. We can't shorten the interval without -re-designing the message-id. See comments above where the message id is -created. This is Something For The Future. */ - -message_id_tv.tv_usec = (message_id_tv.tv_usec/id_resolution) * id_resolution; -exim_wait_tick(&message_id_tv, id_resolution); - /* Add data size to written header size. We do not count the initial file name that is in the file, but we do add one extra for the notional blank line that precedes the data. This total differs from message_size in that it include the @@ -4091,9 +4092,9 @@ if (message_logs && !blackholed_by) { uschar *now = tod_stamp(tod_log); fprintf(message_log, "%s Received from %s\n", now, g->s+3); - if (deliver_freeze) fprintf(message_log, "%s frozen by %s\n", now, + if (f.deliver_freeze) fprintf(message_log, "%s frozen by %s\n", now, frozen_by); - if (queue_only_policy) fprintf(message_log, + if (f.queue_only_policy) fprintf(message_log, "%s no immediate delivery: queued%s%s by %s\n", now, *queue_name ? " in " : "", *queue_name ? CS queue_name : "", queued_by); @@ -4106,7 +4107,7 @@ if (message_logs && !blackholed_by) arrival, and outputting an SMTP response. While writing to the log, set a flag to cause a call to receive_bomb_out() if the log cannot be opened. */ -receive_call_bombout = TRUE; +f.receive_call_bombout = TRUE; /* Before sending an SMTP response in a TCP/IP session, we check to see if the connection has gone away. This can only be done if there is no unconsumed input @@ -4126,7 +4127,7 @@ Of course, since TCP/IP is asynchronous, there is always a chance that the connection will vanish between the time of this test and the sending of the response, but the chance of this happening should be small. */ -if (smtp_input && sender_host_address && !sender_host_notsocket && +if (smtp_input && sender_host_address && !f.sender_host_notsocket && !receive_smtp_buffered()) { struct timeval tv; @@ -4220,19 +4221,19 @@ if(!smtp_reply) /* Log any control actions taken by an ACL or local_scan(). */ - if (deliver_freeze) log_write(0, LOG_MAIN, "frozen by %s", frozen_by); - if (queue_only_policy) log_write(L_delay_delivery, LOG_MAIN, + if (f.deliver_freeze) log_write(0, LOG_MAIN, "frozen by %s", frozen_by); + if (f.queue_only_policy) log_write(L_delay_delivery, LOG_MAIN, "no immediate delivery: queued%s%s by %s", *queue_name ? " in " : "", *queue_name ? CS queue_name : "", queued_by); } -receive_call_bombout = FALSE; +f.receive_call_bombout = FALSE; store_reset(g); /* The store for the main log message can be reused */ /* If the message is frozen, and freeze_tell is set, do the telling. */ -if (deliver_freeze && freeze_tell && freeze_tell[0]) +if (f.deliver_freeze && freeze_tell && freeze_tell[0]) moan_tell_someone(freeze_tell, NULL, US"Message frozen on arrival", "Message %s was frozen on arrival by %s.\nThe sender is <%s>.\n", message_id, frozen_by, sender_address); @@ -4259,6 +4260,23 @@ then we can think about properly declaring the message not-received. */ TIDYUP: +/* In SMTP sessions we may receive several messages in one connection. After +each one, we wait for the clock to tick at the level of message-id granularity. +This is so that the combination of time+pid is unique, even on systems where the +pid can be re-used within our time interval. We can't shorten the interval +without re-designing the message-id. See comments above where the message id is +created. This is Something For The Future. +Do this wait any time we have created a message-id, even if we rejected the +message. This gives unique IDs for logging done by ACLs. */ + +if (id_resolution != 0) + { + message_id_tv.tv_usec = (message_id_tv.tv_usec/id_resolution) * id_resolution; + exim_wait_tick(&message_id_tv, id_resolution); + id_resolution = 0; + } + + process_info[process_info_len] = 0; /* Remove message id */ if (spool_data_file && cutthrough_done == NOT_TRIED) {