X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fspool_in.c;h=a7095bbaad6c8bc96c2bdea315545c67679739d8;hb=694678d0a1c550b518b3b2298f8f605abd5a6754;hp=2006e1b02a429146080a51602a1c8ba06afff13c;hpb=9d1c15ef45fcc8809349378922de20ae9a774c75;p=exim.git diff --git a/src/src/spool_in.c b/src/src/spool_in.c index 2006e1b02..a7095bbaa 100644 --- a/src/src/spool_in.c +++ b/src/src/spool_in.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2012 */ +/* Copyright (c) University of Cambridge 1995 - 2015 */ /* See the file NOTICE for conditions of use and distribution. */ /* Functions for reading spool files. When compiling for a utility (eximon), @@ -284,17 +284,33 @@ dkim_collect_input = FALSE; #ifdef SUPPORT_TLS tls_in.certificate_verified = FALSE; +# ifdef EXPERIMENTAL_DANE +tls_in.dane_verified = FALSE; +# endif tls_in.cipher = NULL; -tls_in.ourcert = NULL; -tls_in.peercert = NULL; +# ifndef COMPILE_UTILITY /* tls support fns not built in */ +tls_free_cert(&tls_in.ourcert); +tls_free_cert(&tls_in.peercert); +# endif tls_in.peerdn = NULL; tls_in.sni = NULL; +tls_in.ocsp = OCSP_NOT_REQ; #endif #ifdef WITH_CONTENT_SCAN +spam_bar = NULL; +spam_score = NULL; spam_score_int = NULL; #endif +#if defined(EXPERIMENTAL_INTERNATIONAL) && !defined(COMPILE_UTILITY) +message_smtputf8 = FALSE; +message_utf8_downconvert = 0; +#endif + +dsn_ret = 0; +dsn_envid = NULL; + /* Generate the full name and open the file. If message_subdir is already set, just look in the given directory. Otherwise, look in both the split and unsplit directories, as for the data file above. */ @@ -351,6 +367,7 @@ originator_login = string_copy(big_buffer); originator_uid = (uid_t)uid; originator_gid = (gid_t)gid; +/* envelope from */ if (Ufgets(big_buffer, big_buffer_size, f) == NULL) goto SPOOL_READ_ERROR; n = Ustrlen(big_buffer); if (n < 3 || big_buffer[0] != '<' || big_buffer[n-2] != '>') @@ -360,6 +377,7 @@ sender_address = store_get(n-2); Ustrncpy(sender_address, big_buffer+1, n-3); sender_address[n-3] = 0; +/* time */ if (Ufgets(big_buffer, big_buffer_size, f) == NULL) goto SPOOL_READ_ERROR; if (sscanf(CS big_buffer, "%d %d", &received_time, &warning_count) != 2) goto SPOOL_FORMAT_ERROR; @@ -388,9 +406,22 @@ version that left new-style flags written on the spool. */ p = big_buffer + 2; for (;;) { + int len; if (Ufgets(big_buffer, big_buffer_size, f) == NULL) goto SPOOL_READ_ERROR; if (big_buffer[0] != '-') break; - big_buffer[Ustrlen(big_buffer) - 1] = 0; + while ( (len = Ustrlen(big_buffer)) == big_buffer_size-1 + && big_buffer[len-1] != '\n' + ) + { /* buffer not big enough for line; certs make this possible */ + uschar * buf; + if (big_buffer_size >= BIG_BUFFER_SIZE*4) goto SPOOL_READ_ERROR; + buf = store_get_perm(big_buffer_size *= 2); + memcpy(buf, big_buffer, --len); + big_buffer = buf; + if (Ufgets(big_buffer+len, big_buffer_size-len, f) == NULL) + goto SPOOL_READ_ERROR; + } + big_buffer[len-1] = 0; switch(big_buffer[1]) { @@ -460,22 +491,27 @@ for (;;) body_linecount = Uatoi(big_buffer + 15); else if (Ustrncmp(p, "ody_zerocount", 13) == 0) body_zerocount = Uatoi(big_buffer + 15); - #ifdef EXPERIMENTAL_BRIGHTMAIL +#ifdef EXPERIMENTAL_BRIGHTMAIL else if (Ustrncmp(p, "mi_verdicts ", 12) == 0) bmi_verdicts = string_copy(big_buffer + 14); - #endif +#endif break; case 'd': if (Ustrcmp(p, "eliver_firsttime") == 0) deliver_firsttime = TRUE; + /* Check if the dsn flags have been set in the header file */ + else if (Ustrncmp(p, "sn_ret", 6) == 0) + dsn_ret= atoi(CS big_buffer + 8); + else if (Ustrncmp(p, "sn_envid", 8) == 0) + dsn_envid = string_copy(big_buffer + 11); break; case 'f': if (Ustrncmp(p, "rozen", 5) == 0) { deliver_freeze = TRUE; - deliver_frozen_at = Uatoi(big_buffer + 7); + sscanf(CS big_buffer+7, TIME_T_FMT, &deliver_frozen_at); } break; @@ -538,30 +574,49 @@ for (;;) case 's': if (Ustrncmp(p, "ender_set_untrusted", 19) == 0) sender_set_untrusted = TRUE; - #ifdef WITH_CONTENT_SCAN +#ifdef WITH_CONTENT_SCAN + else if (Ustrncmp(p, "pam_bar ", 8) == 0) + spam_bar = string_copy(big_buffer + 10); + else if (Ustrncmp(p, "pam_score ", 10) == 0) + spam_score = string_copy(big_buffer + 12); else if (Ustrncmp(p, "pam_score_int ", 14) == 0) spam_score_int = string_copy(big_buffer + 16); - #endif +#endif +#if defined(EXPERIMENTAL_INTERNATIONAL) && !defined(COMPILE_UTILITY) + else if (Ustrncmp(p, "mtputf8", 7) == 0) + message_smtputf8 = TRUE; +#endif break; - #ifdef SUPPORT_TLS +#ifdef SUPPORT_TLS case 't': if (Ustrncmp(p, "ls_certificate_verified", 23) == 0) tls_in.certificate_verified = TRUE; else if (Ustrncmp(p, "ls_cipher", 9) == 0) tls_in.cipher = string_copy(big_buffer + 12); -#ifndef COMPILE_UTILITY +# ifndef COMPILE_UTILITY /* tls support fns not built in */ else if (Ustrncmp(p, "ls_ourcert", 10) == 0) (void) tls_import_cert(big_buffer + 13, &tls_in.ourcert); else if (Ustrncmp(p, "ls_peercert", 11) == 0) (void) tls_import_cert(big_buffer + 14, &tls_in.peercert); -#endif +# endif else if (Ustrncmp(p, "ls_peerdn", 9) == 0) tls_in.peerdn = string_unprinting(string_copy(big_buffer + 12)); else if (Ustrncmp(p, "ls_sni", 6) == 0) tls_in.sni = string_unprinting(string_copy(big_buffer + 9)); + else if (Ustrncmp(p, "ls_ocsp", 7) == 0) + tls_in.ocsp = big_buffer[10] - '0'; + break; +#endif + +#if defined(EXPERIMENTAL_INTERNATIONAL) && !defined(COMPILE_UTILITY) + case 'u': + if (Ustrncmp(p, "tf8_downcvt", 11) == 0) + message_utf8_downconvert = 1; + else if (Ustrncmp(p, "tf8_optdowncvt", 15) == 0) + message_utf8_downconvert = -1; break; - #endif +#endif default: /* Present because some compilers complain if all */ break; /* possibilities are not covered. */ @@ -612,6 +667,8 @@ for (recipients_count = 0; recipients_count < rcount; recipients_count++) { int nn; int pno = -1; + int dsn_flags = 0; + uschar *orcpt = NULL; uschar *errors_to = NULL; uschar *p; @@ -654,6 +711,9 @@ for (recipients_count = 0; recipients_count < rcount; recipients_count++) ends with , where pno is the parent number for one_time addresses, and len is the length of the errors_to address (zero meaning none). + + Bit 02 indicates that, again reading from right to left, the data continues + with orcpt len(orcpt),dsn_flags */ while (isdigit(*p)) p--; @@ -684,6 +744,11 @@ for (recipients_count = 0; recipients_count < rcount; recipients_count++) else if (*p == '#') { int flags; + +#if !defined (COMPILE_UTILITY) + DEBUG(D_deliver) debug_printf("**** SPOOL_IN - Exim 4 standard format spoolfile\n"); +#endif + (void)sscanf(CS p+1, "%d", &flags); if ((flags & 0x01) != 0) /* one_time data exists */ @@ -699,12 +764,43 @@ for (recipients_count = 0; recipients_count < rcount; recipients_count++) } } + *(--p) = 0; /* Terminate address */ + if ((flags & 0x02) != 0) /* one_time data exists */ + { + int len; + while (isdigit(*(--p)) || *p == ',' || *p == '-'); + (void)sscanf(CS p+1, "%d,%d", &len, &dsn_flags); + *p = 0; + if (len > 0) + { + p -= len; + orcpt = string_copy(p); + } + } + *(--p) = 0; /* Terminate address */ } +#if !defined(COMPILE_UTILITY) + else + { DEBUG(D_deliver) debug_printf("**** SPOOL_IN - No additional fields\n"); } + + if ((orcpt != NULL) || (dsn_flags != 0)) + { + DEBUG(D_deliver) debug_printf("**** SPOOL_IN - address: |%s| orcpt: |%s| dsn_flags: %d\n", + big_buffer, orcpt, dsn_flags); + } + if (errors_to != NULL) + { + DEBUG(D_deliver) debug_printf("**** SPOOL_IN - address: |%s| errorsto: |%s|\n", + big_buffer, errors_to); + } +#endif recipients_list[recipients_count].address = string_copy(big_buffer); recipients_list[recipients_count].pno = pno; recipients_list[recipients_count].errors_to = errors_to; + recipients_list[recipients_count].orcpt = orcpt; + recipients_list[recipients_count].dsn_flags = dsn_flags; } /* The remainder of the spool header file contains the headers for the message, @@ -787,9 +883,9 @@ if (errno != 0) { n = errno; - #ifndef COMPILE_UTILITY +#ifndef COMPILE_UTILITY DEBUG(D_any) debug_printf("Error while reading spool file %s\n", name); - #endif /* COMPILE_UTILITY */ +#endif /* COMPILE_UTILITY */ fclose(f); errno = n;