X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/35af9f61534cba784c1718d804567043da64f2df..4c04137d73637107669e02b21f890387aaa2ef34:/src/src/transports/lmtp.c diff --git a/src/src/transports/lmtp.c b/src/src/transports/lmtp.c index 17b0b8253..c4606ef8b 100644 --- a/src/src/transports/lmtp.c +++ b/src/src/transports/lmtp.c @@ -1,10 +1,8 @@ -/* $Cambridge: exim/src/src/transports/lmtp.c,v 1.2 2004/10/14 14:52:45 ph10 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2004 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -28,6 +26,8 @@ optionlist lmtp_transport_options[] = { (void *)offsetof(transport_instance, batch_max) }, { "command", opt_stringptr, (void *)offsetof(lmtp_transport_options_block, cmd) }, + { "ignore_quota", opt_bool, + (void *)offsetof(lmtp_transport_options_block, ignore_quota) }, { "socket", opt_stringptr, (void *)offsetof(lmtp_transport_options_block, skt) }, { "timeout", opt_time, @@ -46,7 +46,8 @@ lmtp_transport_options_block lmtp_transport_option_defaults = { NULL, /* cmd */ NULL, /* skt */ 5*60, /* timeout */ - 0 /* options */ + 0, /* options */ + FALSE /* ignore_quota */ }; @@ -105,7 +106,7 @@ Arguments: more_errno from the top address for use with ERRNO_FILTER_FAIL buffer the LMTP response buffer yield where to put a one-digit LMTP response code - message where to put an errror message + message where to put an error message Returns: TRUE if a "QUIT" command should be sent, else FALSE */ @@ -141,8 +142,8 @@ end the DATA. */ if (*errno_value == ERRNO_FILTER_FAIL) { - *message = string_sprintf("transport filter process failed (%d)%s", - more_errno, + *message = string_sprintf("transport filter process failed (%d)%s", + more_errno, (more_errno == EX_EXECFAILED)? ": unable to execute command" : ""); return FALSE; } @@ -170,7 +171,7 @@ if (*errno_value == ERRNO_WRITEINCOMPLETE) if (buffer[0] != 0) { - uschar *s = string_printing(buffer); + const uschar *s = string_printing(buffer); *message = string_sprintf("LMTP error after %s: %s", big_buffer, s); *yield = buffer[0]; return TRUE; @@ -209,13 +210,14 @@ Returns: TRUE if successful, FALSE if not, with errno set */ static BOOL -lmtp_write_command(int fd, char *format, ...) +lmtp_write_command(int fd, const char *format, ...) { int count, rc; va_list ap; va_start(ap, format); if (!string_vformat(big_buffer, big_buffer_size, CS format, ap)) { + va_end(ap); errno = ERRNO_SMTPFORMAT; return FALSE; } @@ -457,8 +459,9 @@ int code, save_errno; BOOL send_data; BOOL yield = FALSE; address_item *addr; +uschar *igquotstr = US""; uschar *sockname = NULL; -uschar **argv; +const uschar **argv; uschar buffer[256]; DEBUG(D_transport) debug_printf("%s transport entered\n", tblock->name); @@ -467,13 +470,29 @@ DEBUG(D_transport) debug_printf("%s transport entered\n", tblock->name); not both. When a command is specified, call the common function for creating an argument list and expanding the items. */ -if (ob->cmd != NULL) +if (ob->cmd) { DEBUG(D_transport) debug_printf("using command %s\n", ob->cmd); sprintf(CS buffer, "%.50s transport", tblock->name); if (!transport_set_up_command(&argv, ob->cmd, TRUE, PANIC, addrlist, buffer, NULL)) return FALSE; + + /* If the -N option is set, can't do any more. Presume all has gone well. */ + if (dont_deliver) + goto MINUS_N; + +/* As this is a local transport, we are already running with the required +uid/gid and current directory. Request that the new process be a process group +leader, so we can kill it and all its children on an error. */ + + if ((pid = child_open(USS argv, NULL, 0, &fd_in, &fd_out, TRUE)) < 0) + { + addrlist->message = string_sprintf( + "Failed to create child process for %s transport: %s", tblock->name, + strerror(errno)); + return FALSE; + } } /* When a socket is specified, expand the string and create a socket. */ @@ -496,38 +515,11 @@ else ob->skt, tblock->name, strerror(errno)); return FALSE; } - } - -/* If the -N option is set, can't do any more. Presume all has gone well. */ - -if (dont_deliver) - { - DEBUG(D_transport) - debug_printf("*** delivery by %s transport bypassed by -N option", - tblock->name); - addrlist->transport_return = OK; - return FALSE; - } -/* As this is a local transport, we are already running with the required -uid/gid and current directory. Request that the new process be a process group -leader, so we can kill it and all its children on an error. */ + /* If the -N option is set, can't do any more. Presume all has gone well. */ + if (dont_deliver) + goto MINUS_N; -if (ob->cmd != NULL) - { - if ((pid = child_open(argv, NULL, 0, &fd_in, &fd_out, TRUE)) < 0) - { - addrlist->message = string_sprintf( - "Failed to create child process for %s transport: %s", tblock->name, - strerror(errno)); - return FALSE; - } - } - -/* For a socket, try to make the connection */ - -else - { sockun.sun_family = AF_UNIX; sprintf(sockun.sun_path, "%.*s", (int)(sizeof(sockun.sun_path)-1), sockname); if(connect(fd_out, (struct sockaddr *)(&sockun), sizeof(sockun)) == -1) @@ -539,6 +531,7 @@ else } } + /* Make the output we are going to read into a file. */ out = fdopen(fd_out, "rb"); @@ -561,13 +554,27 @@ if (!lmtp_write_command(fd_in, "%s %s\r\n", "LHLO", if (!lmtp_read_response(out, buffer, sizeof(buffer), '2', timeout)) goto RESPONSE_FAILED; +/* If the ignore_quota option is set, note whether the server supports the +IGNOREQUOTA option, and if so, set an appropriate addition for RCPT. */ + +if (ob->ignore_quota) + igquotstr = (pcre_exec(regex_IGNOREQUOTA, NULL, CS buffer, + Ustrlen(CS buffer), 0, PCRE_EOPT, NULL, 0) >= 0)? US" IGNOREQUOTA" : US""; + /* Now the envelope sender */ if (!lmtp_write_command(fd_in, "MAIL FROM:<%s>\r\n", return_path)) goto WRITE_FAILED; if (!lmtp_read_response(out, buffer, sizeof(buffer), '2', timeout)) + { + if (errno == 0 && buffer[0] == '4') + { + errno = ERRNO_MAIL4XX; + addrlist->more_errno |= ((buffer[1] - '0')*10 + buffer[2] - '0') << 8; + } goto RESPONSE_FAILED; + } /* Next, we hand over all the recipients. Some may be permanently or temporarily rejected; others may be accepted, for now. */ @@ -575,8 +582,8 @@ temporarily rejected; others may be accepted, for now. */ send_data = FALSE; for (addr = addrlist; addr != NULL; addr = addr->next) { - if (!lmtp_write_command(fd_in, "RCPT TO:<%s>\r\n", - transport_rcpt_address(addr, tblock->rcpt_include_affixes))) + if (!lmtp_write_command(fd_in, "RCPT TO:<%s>%s\r\n", + transport_rcpt_address(addr, tblock->rcpt_include_affixes), igquotstr)) goto WRITE_FAILED; if (lmtp_read_response(out, buffer, sizeof(buffer), '2', timeout)) { @@ -588,11 +595,11 @@ for (addr = addrlist; addr != NULL; addr = addr->next) if (errno != 0 || buffer[0] == 0) goto RESPONSE_FAILED; addr->message = string_sprintf("LMTP error after %s: %s", big_buffer, string_printing(buffer)); + setflag(addr, af_pass_message); /* Allow message to go to user */ if (buffer[0] == '5') addr->transport_return = FAIL; else { - int bincode = (buffer[1] - '0')*10 + buffer[2] - '0'; addr->basic_errno = ERRNO_RCPT4XX; - addr->more_errno |= bincode << 8; + addr->more_errno |= ((buffer[1] - '0')*10 + buffer[2] - '0') << 8; } } } @@ -602,10 +609,23 @@ for (addr = addrlist; addr != NULL; addr = addr->next) if (send_data) { BOOL ok; + transport_ctx tctx = { + tblock, + addrlist, + US".", US"..", + ob->options + }; if (!lmtp_write_command(fd_in, "DATA\r\n")) goto WRITE_FAILED; if (!lmtp_read_response(out, buffer, sizeof(buffer), '3', timeout)) + { + if (errno == 0 && buffer[0] == '4') + { + errno = ERRNO_DATA4XX; + addrlist->more_errno |= ((buffer[1] - '0')*10 + buffer[2] - '0') << 8; + } goto RESPONSE_FAILED; + } sigalrm_seen = FALSE; transport_write_timeout = timeout; @@ -614,9 +634,7 @@ if (send_data) debug_printf(" LMTP>> writing message and terminating \".\"\n"); transport_count = 0; - ok = transport_write_message(addrlist, fd_in, ob->options, 0, - tblock->add_headers, tblock->remove_headers, US".", US"..", - tblock->rewrite_rules, tblock->rewrite_existflags); + ok = transport_write_message(fd_in, &tctx, 0); /* Failure can either be some kind of I/O disaster (including timeout), or the failure of a transport filter or the expansion of added headers. */ @@ -639,8 +657,15 @@ if (send_data) if (addr->transport_return != PENDING_OK) continue; if (lmtp_read_response(out, buffer, sizeof(buffer), '2', timeout)) + { addr->transport_return = OK; - + if (LOGGING(smtp_confirmation)) + { + const uschar *s = string_printing(buffer); + /* de-const safe here as string_printing known to have alloc'n'copied */ + addr->message = (s == buffer)? (uschar *)string_copy(s) : US s; + } + } /* If the response has failed badly, use it for all the remaining pending addresses and give up. */ @@ -665,9 +690,15 @@ if (send_data) else { + if (buffer[0] == '4') + { + addr->basic_errno = ERRNO_DATA4XX; + addr->more_errno |= ((buffer[1] - '0')*10 + buffer[2] - '0') << 8; + } addr->message = string_sprintf("LMTP error after %s: %s", big_buffer, string_printing(buffer)); addr->transport_return = (buffer[0] == '5')? FAIL : DEFER; + setflag(addr, af_pass_message); /* Allow message to go to user */ } } } @@ -685,13 +716,15 @@ goto RETURN; /* Come here if any call to read_response, other than a response after the data phase, failed. Put the error in the top address - this will be replicated -because the yield is still FALSE. Analyse the error, and if if isn't too bad, -send a QUIT command. Wait for the response with a short timeout, so we don't -wind up this process before the far end has had time to read the QUIT. */ +because the yield is still FALSE. (But omit ETIMEDOUT, as there will already be +a suitable message.) Analyse the error, and if if isn't too bad, send a QUIT +command. Wait for the response with a short timeout, so we don't wind up this +process before the far end has had time to read the QUIT. */ RESPONSE_FAILED: save_errno = errno; +if (errno != ETIMEDOUT && errno != 0) addrlist->basic_errno = errno; addrlist->message = NULL; if (check_response(&save_errno, addrlist->more_errno, @@ -740,13 +773,21 @@ RETURN: (void)child_close(pid, timeout); -if (fd_in >= 0) (void) close(fd_in); -if (fd_out >= 0) (void) fclose(out); +if (fd_in >= 0) (void)close(fd_in); +if (fd_out >= 0) (void)fclose(out); DEBUG(D_transport) debug_printf("%s transport yields %d\n", tblock->name, yield); return yield; + + +MINUS_N: + DEBUG(D_transport) + debug_printf("*** delivery by %s transport bypassed by -N option", + tblock->name); + addrlist->transport_return = OK; + return FALSE; } /* End of transport/lmtp.c */