X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtp.c;h=5fbc5003c5592f46db2801b09a96c3fb9ab67622;hp=9e1366bc910d0f09de3574459efb0df72ee4c571;hb=5ac2920028e92a453c686c799327d7a66b3e7b49;hpb=0428f9c321bffd2afbd5c41c1170b74d240a5c64 diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c index 9e1366bc9..5fbc5003c 100644 --- a/citadel/modules/smtp/serv_smtp.c +++ b/citadel/modules/smtp/serv_smtp.c @@ -1,5 +1,5 @@ /* - * This module is an SMTP and ESMTP implementation for the Citadel system. + * This module is an SMTP and ESMTP server for the Citadel system. * It is compliant with all of the following: * * RFC 821 - Simple Mail Transfer Protocol @@ -20,21 +20,15 @@ * The VRFY and EXPN commands have been removed from this implementation * because nobody uses these commands anymore, except for spammers. * - * Copyright (c) 1998-2009 by the citadel.org team + * Copyright (c) 1998-2018 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * This program is open source software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. */ #include "sysdep.h" @@ -75,6 +69,7 @@ #include "config.h" #include "control.h" #include "user_ops.h" +#include "room_ops.h" #include "database.h" #include "msgbase.h" #include "internet_addressing.h" @@ -83,17 +78,10 @@ #include "clientsocket.h" #include "locate_host.h" #include "citadel_dirs.h" - - - -#ifndef HAVE_SNPRINTF -#include "snprintf.h" -#endif - - #include "ctdl_module.h" #include "smtp_util.h" + enum { /* Command states for login authentication */ smtp_command, smtp_user, @@ -101,15 +89,51 @@ enum { /* Command states for login authentication */ smtp_plain }; +enum SMTP_FLAGS { + HELO, + EHLO, + LHLO +}; +typedef void (*smtp_handler)(long offest, long Flags); +typedef struct _smtp_handler_hook { + smtp_handler h; + int Flags; +} smtp_handler_hook; +int EnableSMTPLog = 0; -/*****************************************************************************/ -/* SMTP SERVER (INBOUND) STUFF */ -/*****************************************************************************/ +HashList *SMTPCmds = NULL; +#define MaxSMTPCmdLen 10 + +#define RegisterSmtpCMD(First, H, Flags) \ + registerSmtpCMD(HKEY(First), H, Flags) +void registerSmtpCMD(const char *First, long FLen, + smtp_handler H, + int Flags) +{ + smtp_handler_hook *h; + + if (FLen >= MaxSMTPCmdLen) + { + abort(); + } + + h = (smtp_handler_hook*) malloc(sizeof(smtp_handler_hook)); + memset(h, 0, sizeof(smtp_handler_hook)); + + h->Flags = Flags; + h->h = H; + Put(SMTPCmds, First, FLen, h, NULL); +} +void smtp_cleanup(void) +{ + DeleteHash(&SMTPCmds); +} + /* * Here's where our SMTP session begins its happy day. */ @@ -125,12 +149,19 @@ void smtp_greeting(int is_msa) memset(SMTP, 0, sizeof(citsmtp)); sSMTP = SMTP; sSMTP->is_msa = is_msa; + sSMTP->Cmd = NewStrBufPlain(NULL, SIZ); + sSMTP->helo_node = NewStrBuf(); + sSMTP->from = NewStrBufPlain(NULL, SIZ); + sSMTP->recipients = NewStrBufPlain(NULL, SIZ); + sSMTP->OneRcpt = NewStrBufPlain(NULL, SIZ); + sSMTP->preferred_sender_email = NULL; + sSMTP->preferred_sender_name = NULL; /* If this config option is set, reject connections from problem * addresses immediately instead of after they execute a RCPT */ - if ( (config.c_rbl_at_greeting) && (sSMTP->is_msa == 0) ) { - if (rbl_check(message_to_spammer)) { + if ( (CtdlGetConfigInt("c_rbl_at_greeting")) && (sSMTP->is_msa == 0) ) { + if (rbl_check(CC->cs_addr, message_to_spammer)) { if (server_shutting_down) cprintf("421 %s\r\n", message_to_spammer); else @@ -153,7 +184,7 @@ void smtp_greeting(int is_msa) /* Note: the FQDN *must* appear as the first thing after the 220 code. * Some clients (including citmail.c) depend on it being there. */ - cprintf("220 %s ESMTP Citadel server ready.\r\n", config.c_fqdn); + cprintf("220 %s ESMTP Citadel server ready.\r\n", CtdlGetConfigStr("c_fqdn")); } @@ -181,10 +212,8 @@ void smtp_msa_greeting(void) { * LMTP is like SMTP but with some extra bonus footage added. */ void lmtp_greeting(void) { - citsmtp *sSMTP; smtp_greeting(0); - sSMTP = SMTP; SMTP->is_lmtp = 1; } @@ -213,11 +242,12 @@ void lmtp_unfiltered_greeting(void) { /* * Login greeting common to all auth methods */ -void smtp_auth_greeting(void) { - cprintf("235 Hello, %s\r\n", CC->user.fullname); - syslog(LOG_NOTICE, "SMTP authenticated %s\n", CC->user.fullname); - CC->internal_pgm = 0; - CC->cs_flags &= ~CS_STEALTH; +void smtp_auth_greeting(long offset, long Flags) { + struct CitContext *CCC = CC; + cprintf("235 Hello, %s\r\n", CCC->user.fullname); + syslog(LOG_NOTICE, "SMTP authenticated %s", CCC->user.fullname); + CCC->internal_pgm = 0; + CCC->cs_flags &= ~CS_STEALTH; } @@ -226,41 +256,43 @@ void smtp_auth_greeting(void) { * * which_command: 0=HELO, 1=EHLO, 2=LHLO */ -void smtp_hello(char *argbuf, int which_command) { +void smtp_hello(long offset, long which_command) +{ + struct CitContext *CCC = CC; citsmtp *sSMTP = SMTP; - safestrncpy(sSMTP->helo_node, argbuf, sizeof sSMTP->helo_node); + StrBufAppendBuf (sSMTP->helo_node, sSMTP->Cmd, offset); - if ( (which_command != 2) && (sSMTP->is_lmtp) ) { + if ( (which_command != LHLO) && (sSMTP->is_lmtp) ) { cprintf("500 Only LHLO is allowed when running LMTP\r\n"); return; } - if ( (which_command == 2) && (sSMTP->is_lmtp == 0) ) { + if ( (which_command == LHLO) && (sSMTP->is_lmtp == 0) ) { cprintf("500 LHLO is only allowed when running LMTP\r\n"); return; } - if (which_command == 0) { + if (which_command == HELO) { cprintf("250 Hello %s (%s [%s])\r\n", - sSMTP->helo_node, - CC->cs_host, - CC->cs_addr + ChrPtr(sSMTP->helo_node), + CCC->cs_host, + CCC->cs_addr ); } else { - if (which_command == 1) { + if (which_command == EHLO) { cprintf("250-Hello %s (%s [%s])\r\n", - sSMTP->helo_node, - CC->cs_host, - CC->cs_addr + ChrPtr(sSMTP->helo_node), + CCC->cs_host, + CCC->cs_addr ); } else { cprintf("250-Greetings and joyous salutations.\r\n"); } cprintf("250-HELP\r\n"); - cprintf("250-SIZE %ld\r\n", config.c_maxmsglen); + cprintf("250-SIZE %ld\r\n", CtdlGetConfigLong("c_maxmsglen")); #ifdef HAVE_OPENSSL /* @@ -269,7 +301,7 @@ void smtp_hello(char *argbuf, int which_command) { * the SMTP-MSA port, not on the SMTP-MTA port, due to * questionable reliability of TLS in certain sending MTA's. */ - if ( (!CC->redirect_ssl) && (sSMTP->is_msa) ) { + if ( (!CCC->redirect_ssl) && (sSMTP->is_msa) ) { cprintf("250-STARTTLS\r\n"); } #endif /* HAVE_OPENSSL */ @@ -282,11 +314,85 @@ void smtp_hello(char *argbuf, int which_command) { } +/* + * Backend function for smtp_webcit_preferences_hack(). + * Look at a message and determine if it's the preferences file. + */ +void smtp_webcit_preferences_hack_backend(long msgnum, void *userdata) { + struct CtdlMessage *msg; + char **webcit_conf = (char **) userdata; + + if (*webcit_conf) { + return; // already got it + } + + msg = CtdlFetchMessage(msgnum, 1, 1); + if (msg == NULL) { + return; + } + + if ( !CM_IsEmpty(msg, eMsgSubject) && + (!strcasecmp(msg->cm_fields[eMsgSubject], "__ WebCit Preferences __"))) + { + /* This is it! Change ownership of the message text so it doesn't get freed. */ + *webcit_conf = (char *)msg->cm_fields[eMesageText]; + msg->cm_fields[eMesageText] = NULL; + } + CM_Free(msg); +} + + +/* + * The configuration item for the user's preferred display name for outgoing email is, unfortunately, + * stored in the account's WebCit configuration. We have to fetch it now. + */ +void smtp_webcit_preferences_hack(void) { + struct CitContext *CCC = CC; + char config_roomname[ROOMNAMELEN]; + char *webcit_conf = NULL; + citsmtp *sSMTP = SMTP; + + snprintf(config_roomname, sizeof config_roomname, "%010ld.%s", CCC->user.usernum, USERCONFIGROOM); + if (CtdlGetRoom(&CCC->room, config_roomname) != 0) { + return; + } + + /* + * Find the WebCit configuration message + */ + + CtdlForEachMessage(MSGS_ALL, 1, NULL, NULL, NULL, smtp_webcit_preferences_hack_backend, (void *)&webcit_conf); + + if (!webcit_conf) { + return; + } + + /* Parse the webcit configuration and attempt to do something useful with it */ + char *str = webcit_conf; + char *saveptr = str; + char *this_line = NULL; + while (this_line = strtok_r(str, "\n", &saveptr), this_line != NULL) { + str = NULL; + if (!strncasecmp(this_line, "defaultfrom|", 12)) { + sSMTP->preferred_sender_email = NewStrBufPlain(&this_line[12], -1); + } + if (!strncasecmp(this_line, "defaultname|", 12)) { + sSMTP->preferred_sender_name = NewStrBufPlain(&this_line[12], -1); + } + if ((!strncasecmp(this_line, "defaultname|", 12)) && (sSMTP->preferred_sender_name == NULL)) { + sSMTP->preferred_sender_name = NewStrBufPlain(&this_line[12], -1); + } + + } + free(webcit_conf); +} + + /* * Implement HELP command. */ -void smtp_help(void) { +void smtp_help(long offset, long Flags) { cprintf("214 RTFM http://www.ietf.org/rfc/rfc2821.txt\r\n"); } @@ -294,15 +400,19 @@ void smtp_help(void) { /* * */ -void smtp_get_user(char *argbuf) { +void smtp_get_user(long offset) +{ char buf[SIZ]; - char username[SIZ]; citsmtp *sSMTP = SMTP; - CtdlDecodeBase64(username, argbuf, SIZ); - /* syslog(LOG_DEBUG, "Trying <%s>\n", username); */ - if (CtdlLoginExistingUser(NULL, username) == login_ok) { - CtdlEncodeBase64(buf, "Password:", 9, 0); + StrBufDecodeBase64(sSMTP->Cmd); + + if (CtdlLoginExistingUser(ChrPtr(sSMTP->Cmd)) == login_ok) { + size_t len = CtdlEncodeBase64(buf, "Password:", 9, 0); + + if (buf[len - 1] == '\n') { + buf[len - 1] = '\0'; + } cprintf("334 %s\r\n", buf); sSMTP->command_state = smtp_password; } @@ -316,53 +426,82 @@ void smtp_get_user(char *argbuf) { /* * */ -void smtp_get_pass(char *argbuf) { +void smtp_get_pass(long offset, long Flags) +{ + citsmtp *sSMTP = SMTP; char password[SIZ]; - long len; - memset(password, 0, sizeof(password)); - len = CtdlDecodeBase64(password, argbuf, SIZ); - /* syslog(LOG_DEBUG, "Trying <%s>\n", password); */ - if (CtdlTryPassword(password, len) == pass_ok) { - smtp_auth_greeting(); + memset(password, 0, sizeof(password)); + StrBufDecodeBase64(sSMTP->Cmd); + syslog(LOG_DEBUG, "Trying <%s>", password); + if (CtdlTryPassword(SKEY(sSMTP->Cmd)) == pass_ok) { + smtp_auth_greeting(offset, Flags); } else { cprintf("535 Authentication failed.\r\n"); } - SMTP->command_state = smtp_command; + sSMTP->command_state = smtp_command; } /* * Back end for PLAIN auth method (either inline or multistate) */ -void smtp_try_plain(char *encoded_authstring) { - char decoded_authstring[1024]; - char ident[256]; - char user[256]; - char pass[256]; +void smtp_try_plain(long offset, long Flags) +{ + citsmtp *sSMTP = SMTP; + const char*decoded_authstring; + char ident[256] = ""; + char user[256] = ""; + char pass[256] = ""; int result; - long len; - CtdlDecodeBase64(decoded_authstring, encoded_authstring, strlen(encoded_authstring) ); - safestrncpy(ident, decoded_authstring, sizeof ident); - safestrncpy(user, &decoded_authstring[strlen(ident) + 1], sizeof user); - len = safestrncpy(pass, &decoded_authstring[strlen(ident) + strlen(user) + 2], sizeof pass); - if (len == -1) - len = sizeof(pass) - 1; + long decoded_len; + long len = 0; + long plen = 0; + + memset(pass, 0, sizeof(pass)); + decoded_len = StrBufDecodeBase64(sSMTP->Cmd); + + if (decoded_len > 0) + { + decoded_authstring = ChrPtr(sSMTP->Cmd); + + len = safestrncpy(ident, decoded_authstring, sizeof ident); + + decoded_len -= len - 1; + decoded_authstring += len + 1; + + if (decoded_len > 0) + { + len = safestrncpy(user, decoded_authstring, sizeof user); + + decoded_authstring += len + 1; + decoded_len -= len - 1; + } + + if (decoded_len > 0) + { + plen = safestrncpy(pass, decoded_authstring, sizeof pass); + + if (plen < 0) + plen = sizeof(pass) - 1; + } + } - SMTP->command_state = smtp_command; + sSMTP->command_state = smtp_command; if (!IsEmptyStr(ident)) { - result = CtdlLoginExistingUser(user, ident); + result = CtdlLoginExistingUser(ident); } else { - result = CtdlLoginExistingUser(NULL, user); + result = CtdlLoginExistingUser(user); } if (result == login_ok) { - if (CtdlTryPassword(pass, len) == pass_ok) { - smtp_auth_greeting(); + if (CtdlTryPassword(pass, plen) == pass_ok) { + smtp_webcit_preferences_hack(); + smtp_auth_greeting(offset, Flags); return; } } @@ -373,40 +512,50 @@ void smtp_try_plain(char *encoded_authstring) { /* * Attempt to perform authenticated SMTP */ -void smtp_auth(char *argbuf) { +void smtp_auth(long offset, long Flags) +{ + struct CitContext *CCC = CC; + citsmtp *sSMTP = SMTP; char username_prompt[64]; char method[64]; char encoded_authstring[1024]; - if (CC->logged_in) { + if (CCC->logged_in) { cprintf("504 Already logged in.\r\n"); return; } - extract_token(method, argbuf, 0, ' ', sizeof method); + extract_token(method, ChrPtr(sSMTP->Cmd) + offset, 0, ' ', sizeof method); if (!strncasecmp(method, "login", 5) ) { - if (strlen(argbuf) >= 7) { - smtp_get_user(&argbuf[6]); + if (StrLength(sSMTP->Cmd) - offset >= 7) { + smtp_get_user(6); } else { - CtdlEncodeBase64(username_prompt, "Username:", 9, 0); + size_t len = CtdlEncodeBase64(username_prompt, "Username:", 9, 0); + if (username_prompt[len - 1] == '\n') { + username_prompt[len - 1] = '\0'; + } cprintf("334 %s\r\n", username_prompt); - SMTP->command_state = smtp_user; + sSMTP->command_state = smtp_user; } return; } if (!strncasecmp(method, "plain", 5) ) { - if (num_tokens(argbuf, ' ') < 2) { + long len; + if (num_tokens(ChrPtr(sSMTP->Cmd) + offset, ' ') < 2) { cprintf("334 \r\n"); SMTP->command_state = smtp_plain; return; } - extract_token(encoded_authstring, argbuf, 1, ' ', sizeof encoded_authstring); - - smtp_try_plain(encoded_authstring); + len = extract_token(encoded_authstring, + ChrPtr(sSMTP->Cmd) + offset, + 1, ' ', + sizeof encoded_authstring); + StrBufPlain(sSMTP->Cmd, encoded_authstring, len); + smtp_try_plain(0, Flags); return; } @@ -426,9 +575,7 @@ void smtp_auth(char *argbuf) { * * Set do_response to nonzero to output the SMTP RSET response code. */ -void smtp_rset(int do_response) { - int is_lmtp; - int is_unfiltered; +void smtp_rset(long offset, long do_response) { citsmtp *sSMTP = SMTP; /* @@ -436,10 +583,21 @@ void smtp_rset(int do_response) { * but we need to preserve this one little piece of information, so * we save it for later. */ - is_lmtp = sSMTP->is_lmtp; - is_unfiltered = sSMTP->is_unfiltered; - memset(sSMTP, 0, sizeof(citsmtp)); + FlushStrBuf(sSMTP->Cmd); + FlushStrBuf(sSMTP->helo_node); + FlushStrBuf(sSMTP->from); + FlushStrBuf(sSMTP->recipients); + FlushStrBuf(sSMTP->OneRcpt); + + sSMTP->command_state = 0; + sSMTP->number_of_recipients = 0; + sSMTP->delivery_mode = 0; + sSMTP->message_originated_locally = 0; + sSMTP->is_msa = 0; + /* + * we must remember is_lmtp & is_unfiltered. + */ /* * It is somewhat ambiguous whether we want to log out when a RSET @@ -452,12 +610,6 @@ void smtp_rset(int do_response) { * } */ - /* - * Reinstate this little piece of information we saved (see above). - */ - sSMTP->is_lmtp = is_lmtp; - sSMTP->is_unfiltered = is_unfiltered; - if (do_response) { cprintf("250 Zap!\r\n"); } @@ -467,11 +619,13 @@ void smtp_rset(int do_response) { * Clear out the portions of the state buffer that need to be cleared out * after the DATA command finishes. */ -void smtp_data_clear(void) { +void smtp_data_clear(long offset, long flags) +{ citsmtp *sSMTP = SMTP; - strcpy(sSMTP->from, ""); - strcpy(sSMTP->recipients, ""); + FlushStrBuf(sSMTP->from); + FlushStrBuf(sSMTP->recipients); + FlushStrBuf(sSMTP->OneRcpt); sSMTP->number_of_recipients = 0; sSMTP->delivery_mode = 0; sSMTP->message_originated_locally = 0; @@ -480,26 +634,27 @@ void smtp_data_clear(void) { /* * Implements the "MAIL FROM:" command */ -void smtp_mail(char *argbuf) { +void smtp_mail(long offset, long flags) { char user[SIZ]; char node[SIZ]; char name[SIZ]; + struct CitContext *CCC = CC; citsmtp *sSMTP = SMTP; - if (!IsEmptyStr(sSMTP->from)) { + if (StrLength(sSMTP->from) > 0) { cprintf("503 Only one sender permitted\r\n"); return; } - if (strncasecmp(argbuf, "From:", 5)) { + if (strncasecmp(ChrPtr(sSMTP->Cmd) + offset, "From:", 5)) { cprintf("501 Syntax error\r\n"); return; } - strcpy(sSMTP->from, &argbuf[5]); - striplt(sSMTP->from); - if (haschar(sSMTP->from, '<') > 0) { - stripallbut(sSMTP->from, '<', '>'); + StrBufAppendBuf(sSMTP->from, sSMTP->Cmd, offset); + StrBufTrim(sSMTP->from); + if (strchr(ChrPtr(sSMTP->from), '<') != NULL) { + StrBufStripAllBut(sSMTP->from, '<', '>'); } /* We used to reject empty sender names, until it was brought to our @@ -508,16 +663,16 @@ void smtp_mail(char *argbuf) { * address so we don't have to contend with the empty string causing * other code to fail when it's expecting something there. */ - if (IsEmptyStr(sSMTP->from)) { - strcpy(sSMTP->from, "someone@example.com"); + if (StrLength(sSMTP->from) == 0) { + StrBufPlain(sSMTP->from, HKEY("someone@example.com")); } /* If this SMTP connection is from a logged-in user, force the 'from' * to be the user's Internet e-mail address as Citadel knows it. */ - if (CC->logged_in) { - safestrncpy(sSMTP->from, CC->cs_inet_email, sizeof sSMTP->from); - cprintf("250 Sender ok <%s>\r\n", sSMTP->from); + if (CCC->logged_in) { + StrBufPlain(sSMTP->from, CCC->cs_inet_email, -1); + cprintf("250 Sender ok <%s>\r\n", ChrPtr(sSMTP->from)); sSMTP->message_originated_locally = 1; return; } @@ -529,11 +684,15 @@ void smtp_mail(char *argbuf) { /* Otherwise, make sure outsiders aren't trying to forge mail from * this system (unless, of course, c_allow_spoofing is enabled) */ - else if (config.c_allow_spoofing == 0) { - process_rfc822_addr(sSMTP->from, user, node, name); + else if (CtdlGetConfigInt("c_allow_spoofing") == 0) { + process_rfc822_addr(ChrPtr(sSMTP->from), user, node, name); + syslog(LOG_DEBUG, "Claimed envelope sender is '%s' == '%s' @ '%s' ('%s')", + ChrPtr(sSMTP->from), user, node, name + ); if (CtdlHostAlias(node) != hostalias_nomatch) { cprintf("550 You must log in to send mail from %s\r\n", node); - strcpy(sSMTP->from, ""); + FlushStrBuf(sSMTP->from); + syslog(LOG_DEBUG, "Rejecting unauthenticated mail from %s", node); return; } } @@ -546,42 +705,43 @@ void smtp_mail(char *argbuf) { /* * Implements the "RCPT To:" command */ -void smtp_rcpt(char *argbuf) { - char recp[1024]; +void smtp_rcpt(long offset, long flags) +{ + struct CitContext *CCC = CC; char message_to_spammer[SIZ]; - struct recptypes *valid = NULL; + recptypes *valid = NULL; citsmtp *sSMTP = SMTP; - if (IsEmptyStr(sSMTP->from)) { + if (StrLength(sSMTP->from) == 0) { cprintf("503 Need MAIL before RCPT\r\n"); return; } - - if (strncasecmp(argbuf, "To:", 3)) { + + if (strncasecmp(ChrPtr(sSMTP->Cmd) + offset, "To:", 3)) { cprintf("501 Syntax error\r\n"); return; } - if ( (sSMTP->is_msa) && (!CC->logged_in) ) { + if ( (sSMTP->is_msa) && (!CCC->logged_in) ) { cprintf("550 You must log in to send mail on this port.\r\n"); - strcpy(sSMTP->from, ""); + FlushStrBuf(sSMTP->from); return; } + FlushStrBuf(sSMTP->OneRcpt); + StrBufAppendBuf(sSMTP->OneRcpt, sSMTP->Cmd, offset + 3); + StrBufTrim(sSMTP->OneRcpt); + StrBufStripAllBut(sSMTP->OneRcpt, '<', '>'); - safestrncpy(recp, &argbuf[3], sizeof recp); - striplt(recp); - stripallbut(recp, '<', '>'); - - if ( (strlen(recp) + strlen(sSMTP->recipients) + 1 ) >= SIZ) { + if ( (StrLength(sSMTP->OneRcpt) + StrLength(sSMTP->recipients)) >= SIZ) { cprintf("452 Too many recipients\r\n"); return; } /* RBL check */ - if ( (!CC->logged_in) /* Don't RBL authenticated users */ + if ( (!CCC->logged_in) /* Don't RBL authenticated users */ && (!sSMTP->is_lmtp) ) { /* Don't RBL LMTP clients */ - if (config.c_rbl_at_greeting == 0) { /* Don't RBL again if we already did it */ - if (rbl_check(message_to_spammer)) { + if (CtdlGetConfigInt("c_rbl_at_greeting") == 0) { /* Don't RBL again if we already did it */ + if (rbl_check(CC->cs_addr, message_to_spammer)) { if (server_shutting_down) cprintf("421 %s\r\n", message_to_spammer); else @@ -592,11 +752,11 @@ void smtp_rcpt(char *argbuf) { } } - valid = validate_recipients(recp, - smtp_get_Recipients (), - (sSMTP->is_lmtp)? POST_LMTP: - (CC->logged_in)? POST_LOGGED_IN: - POST_EXTERNAL); + valid = validate_recipients( + ChrPtr(sSMTP->OneRcpt), + smtp_get_Recipients(), + (sSMTP->is_lmtp)? POST_LMTP: (CCC->logged_in)? POST_LOGGED_IN: POST_EXTERNAL + ); if (valid->num_error != 0) { cprintf("550 %s\r\n", valid->errormsg); free_recipients(valid); @@ -604,9 +764,10 @@ void smtp_rcpt(char *argbuf) { } if (valid->num_internet > 0) { - if (CC->logged_in) { - if (CtdlCheckInternetMailPermission(&CC->user)==0) { - cprintf("551 <%s> - you do not have permission to send Internet mail\r\n", recp); + if (CCC->logged_in) { + if (CtdlCheckInternetMailPermission(&CCC->user)==0) { + cprintf("551 <%s> - you do not have permission to send Internet mail\r\n", + ChrPtr(sSMTP->OneRcpt)); free_recipients(valid); return; } @@ -616,18 +777,18 @@ void smtp_rcpt(char *argbuf) { if (valid->num_internet > 0) { if ( (sSMTP->message_originated_locally == 0) && (sSMTP->is_lmtp == 0) ) { - cprintf("551 <%s> - relaying denied\r\n", recp); + cprintf("551 <%s> - relaying denied\r\n", ChrPtr(sSMTP->OneRcpt)); free_recipients(valid); return; } } - cprintf("250 RCPT ok <%s>\r\n", recp); - if (!IsEmptyStr(sSMTP->recipients)) { - strcat(sSMTP->recipients, ","); + cprintf("250 RCPT ok <%s>\r\n", ChrPtr(sSMTP->OneRcpt)); + if (StrLength(sSMTP->recipients) > 0) { + StrBufAppendBufPlain(sSMTP->recipients, HKEY(","), 0); } - strcat(sSMTP->recipients, recp); - sSMTP->number_of_recipients += 1; + StrBufAppendBuf(sSMTP->recipients, sSMTP->OneRcpt, 0); + sSMTP->number_of_recipients ++; if (valid != NULL) { free_recipients(valid); } @@ -639,19 +800,20 @@ void smtp_rcpt(char *argbuf) { /* * Implements the DATA command */ -void smtp_data(void) { +void smtp_data(long offset, long flags) +{ + struct CitContext *CCC = CC; StrBuf *body; - char *defbody; //TODO: remove me + StrBuf *defbody; struct CtdlMessage *msg = NULL; long msgnum = (-1L); char nowstamp[SIZ]; - struct recptypes *valid; + recptypes *valid; int scan_errors; int i; - char result[SIZ]; citsmtp *sSMTP = SMTP; - if (IsEmptyStr(sSMTP->from)) { + if (StrLength(sSMTP->from) == 0) { cprintf("503 Need MAIL command first.\r\n"); return; } @@ -664,36 +826,39 @@ void smtp_data(void) { cprintf("354 Transmit message now - terminate with '.' by itself\r\n"); datestring(nowstamp, sizeof nowstamp, time(NULL), DATESTRING_RFC822); - defbody = malloc(4096); + defbody = NewStrBufPlain(NULL, SIZ); if (defbody != NULL) { - if (sSMTP->is_lmtp && (CC->cs_UDSclientUID != -1)) { - snprintf(defbody, 4096, - "Received: from %s (Citadel from userid %ld)\n" - " by %s; %s\n", - sSMTP->helo_node, - (long int) CC->cs_UDSclientUID, - config.c_fqdn, - nowstamp); + if (sSMTP->is_lmtp && (CCC->cs_UDSclientUID != -1)) { + StrBufPrintf( + defbody, + "Received: from %s (Citadel from userid %ld)\n" + " by %s; %s\n", + ChrPtr(sSMTP->helo_node), + (long int) CCC->cs_UDSclientUID, + CtdlGetConfigStr("c_fqdn"), + nowstamp); } else { - snprintf(defbody, 4096, - "Received: from %s (%s [%s])\n" - " by %s; %s\n", - sSMTP->helo_node, - CC->cs_host, - CC->cs_addr, - config.c_fqdn, - nowstamp); + StrBufPrintf( + defbody, + "Received: from %s (%s [%s])\n" + " by %s; %s\n", + ChrPtr(sSMTP->helo_node), + CCC->cs_host, + CCC->cs_addr, + CtdlGetConfigStr("c_fqdn"), + nowstamp); } } - body = CtdlReadMessageBodyBuf(HKEY("."), config.c_maxmsglen, defbody, 1, NULL); + body = CtdlReadMessageBodyBuf(HKEY("."), CtdlGetConfigLong("c_maxmsglen"), defbody, 1); + FreeStrBuf(&defbody); if (body == NULL) { cprintf("550 Unable to save message: internal error.\r\n"); return; } - syslog(LOG_DEBUG, "Converting message...\n"); + syslog(LOG_DEBUG, "Converting message..."); msg = convert_internet_message_buf(&body); /* If the user is locally authenticated, FORCE the From: header to @@ -706,37 +871,61 @@ void smtp_data(void) { * to something ugly like "0000058008.Sent Items>" when the message * is read with a Citadel client. */ - if ( (CC->logged_in) && (config.c_rfc822_strict_from == 0) ) { - if (msg->cm_fields['A'] != NULL) free(msg->cm_fields['A']); - if (msg->cm_fields['N'] != NULL) free(msg->cm_fields['N']); - if (msg->cm_fields['H'] != NULL) free(msg->cm_fields['H']); - if (msg->cm_fields['F'] != NULL) free(msg->cm_fields['F']); - if (msg->cm_fields['O'] != NULL) free(msg->cm_fields['O']); - msg->cm_fields['A'] = strdup(CC->user.fullname); - msg->cm_fields['N'] = strdup(config.c_nodename); - msg->cm_fields['H'] = strdup(config.c_humannode); - msg->cm_fields['F'] = strdup(CC->cs_inet_email); - msg->cm_fields['O'] = strdup(MAILROOM); + if ( (CCC->logged_in) && (CtdlGetConfigInt("c_rfc822_strict_from") != CFG_SMTP_FROM_NOFILTER) ) { + int validemail = 0; + + if (!CM_IsEmpty(msg, erFc822Addr) && + ((CtdlGetConfigInt("c_rfc822_strict_from") == CFG_SMTP_FROM_CORRECT) || + (CtdlGetConfigInt("c_rfc822_strict_from") == CFG_SMTP_FROM_REJECT) ) ) + { + if (!IsEmptyStr(CCC->cs_inet_email)) + validemail = strcmp(CCC->cs_inet_email, msg->cm_fields[erFc822Addr]) == 0; + if ((!validemail) && + (!IsEmptyStr(CCC->cs_inet_other_emails))) + { + int num_secondary_emails = 0; + int i; + num_secondary_emails = num_tokens(CCC->cs_inet_other_emails, '|'); + for (i=0; i < num_secondary_emails && !validemail; ++i) { + char buf[256]; + extract_token(buf, CCC->cs_inet_other_emails,i,'|',sizeof CCC->cs_inet_other_emails); + validemail = strcmp(buf, msg->cm_fields[erFc822Addr]) == 0; + } + } + } + + if (!validemail && (CtdlGetConfigInt("c_rfc822_strict_from") == CFG_SMTP_FROM_REJECT)) { + syslog(LOG_ERR, "invalid sender '%s' - rejecting this message", msg->cm_fields[erFc822Addr]); + cprintf("550 Invalid sender '%s' - rejecting this message.\r\n", msg->cm_fields[erFc822Addr]); + return; + } + + CM_SetField(msg, eOriginalRoom, HKEY(MAILROOM)); + if (sSMTP->preferred_sender_name != NULL) + CM_SetField(msg, eAuthor, SKEY(sSMTP->preferred_sender_name)); + else + CM_SetField(msg, eAuthor, CCC->user.fullname, strlen(CCC->user.fullname)); + + if (!validemail) { + if (sSMTP->preferred_sender_email != NULL) + CM_SetField(msg, erFc822Addr, SKEY(sSMTP->preferred_sender_email)); + else + CM_SetField(msg, erFc822Addr, CCC->cs_inet_email, strlen(CCC->cs_inet_email)); + } } /* Set the "envelope from" address */ - if (msg->cm_fields['P'] != NULL) { - free(msg->cm_fields['P']); - } - msg->cm_fields['P'] = strdup(sSMTP->from); + CM_SetField(msg, eMessagePath, SKEY(sSMTP->from)); /* Set the "envelope to" address */ - if (msg->cm_fields['V'] != NULL) { - free(msg->cm_fields['V']); - } - msg->cm_fields['V'] = strdup(sSMTP->recipients); + CM_SetField(msg, eenVelopeTo, SKEY(sSMTP->recipients)); /* Submit the message into the Citadel system. */ - valid = validate_recipients(sSMTP->recipients, - smtp_get_Recipients (), - (sSMTP->is_lmtp)? POST_LMTP: - (CC->logged_in)? POST_LOGGED_IN: - POST_EXTERNAL); + valid = validate_recipients( + ChrPtr(sSMTP->recipients), + smtp_get_Recipients(), + (sSMTP->is_lmtp)? POST_LMTP: (CCC->logged_in)? POST_LOGGED_IN: POST_EXTERNAL + ); /* If there are modules that want to scan this message before final * submission (such as virus checkers or spam filters), call them now @@ -746,29 +935,29 @@ void smtp_data(void) { scan_errors = 0; } else { - scan_errors = PerformMessageHooks(msg, EVT_SMTPSCAN); + scan_errors = PerformMessageHooks(msg, valid, EVT_SMTPSCAN); } if (scan_errors > 0) { /* We don't want this message! */ - if (msg->cm_fields['0'] == NULL) { - msg->cm_fields['0'] = strdup("Message rejected by filter"); + if (CM_IsEmpty(msg, eErrorMsg)) { + CM_SetField(msg, eErrorMsg, HKEY("Message rejected by filter")); } - sprintf(result, "550 %s\r\n", msg->cm_fields['0']); + StrBufPrintf(sSMTP->OneRcpt, "550 %s\r\n", msg->cm_fields[eErrorMsg]); } else { /* Ok, we'll accept this message. */ msgnum = CtdlSubmitMsg(msg, valid, "", 0); if (msgnum > 0L) { - sprintf(result, "250 Message accepted.\r\n"); + StrBufPrintf(sSMTP->OneRcpt, "250 Message accepted.\r\n"); } else { - sprintf(result, "550 Internal delivery error\r\n"); + StrBufPrintf(sSMTP->OneRcpt, "550 Internal delivery error\r\n"); } } - /* For SMTP and ESTMP, just print the result message. For LMTP, we + /* For SMTP and ESMTP, just print the result message. For LMTP, we * have to print one result message for each recipient. Since there * is nothing in Citadel which would cause different recipients to * have different results, we can get away with just spitting out the @@ -776,150 +965,136 @@ void smtp_data(void) { */ if (sSMTP->is_lmtp) { for (i=0; inumber_of_recipients; ++i) { - cprintf("%s", result); + cputbuf(sSMTP->OneRcpt); } } else { - cprintf("%s", result); + cputbuf(sSMTP->OneRcpt); } /* Write something to the syslog(which may or may not be where the * rest of the Citadel logs are going; some sysadmins want LOG_MAIL). */ syslog((LOG_MAIL | LOG_INFO), - "%ld: from=<%s>, nrcpts=%d, relay=%s [%s], stat=%s", - msgnum, - sSMTP->from, - sSMTP->number_of_recipients, - CC->cs_host, - CC->cs_addr, - result + "%ld: from=<%s>, nrcpts=%d, relay=%s [%s], stat=%s", + msgnum, + ChrPtr(sSMTP->from), + sSMTP->number_of_recipients, + CCC->cs_host, + CCC->cs_addr, + ChrPtr(sSMTP->OneRcpt) ); /* Clean up */ - CtdlFreeMessage(msg); + CM_Free(msg); free_recipients(valid); - smtp_data_clear(); /* clear out the buffers now */ + smtp_data_clear(0, 0); /* clear out the buffers now */ } /* - * implements the STARTTLS command (Citadel API version) + * implements the STARTTLS command */ -void smtp_starttls(void) +void smtp_starttls(long offset, long flags) { char ok_response[SIZ]; char nosup_response[SIZ]; char error_response[SIZ]; - sprintf(ok_response, - "220 Begin TLS negotiation now\r\n"); - sprintf(nosup_response, - "554 TLS not supported here\r\n"); - sprintf(error_response, - "554 Internal error\r\n"); + sprintf(ok_response, "220 Begin TLS negotiation now\r\n"); + sprintf(nosup_response, "554 TLS not supported here\r\n"); + sprintf(error_response, "554 Internal error\r\n"); CtdlModuleStartCryptoMsgs(ok_response, nosup_response, error_response); - smtp_rset(0); + smtp_rset(0, 0); } - /* - * Main command loop for SMTP sessions. + * Main command loop for SMTP server sessions. */ -void smtp_command_loop(void) { - char cmdbuf[SIZ]; +void smtp_command_loop(void) +{ + static const ConstStr AuthPlainStr = {HKEY("AUTH PLAIN")}; + struct CitContext *CCC = CC; citsmtp *sSMTP = SMTP; + const char *pch, *pchs; + long i; + char CMD[MaxSMTPCmdLen + 1]; if (sSMTP == NULL) { - syslog(LOG_EMERG, "Session SMTP data is null. WTF? We will crash now.\n"); + syslog(LOG_EMERG, "Session SMTP data is null. WTF? We will crash now."); + abort(); } - time(&CC->lastcmd); - memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ - if (client_getln(cmdbuf, sizeof cmdbuf) < 1) { - syslog(LOG_CRIT, "SMTP: client disconnected: ending session.\n"); + time(&CCC->lastcmd); + if (CtdlClientGetLine(sSMTP->Cmd) < 1) { + syslog(LOG_CRIT, "SMTP: client disconnected: ending session."); CC->kill_me = KILLME_CLIENT_DISCONNECTED; return; } - syslog(LOG_INFO, "SMTP server: %s\n", cmdbuf); - while (strlen(cmdbuf) < 5) strcat(cmdbuf, " "); + syslog(LOG_DEBUG, "SMTP server: %s", ChrPtr(sSMTP->Cmd)); if (sSMTP->command_state == smtp_user) { - smtp_get_user(cmdbuf); + if (!strncmp(ChrPtr(sSMTP->Cmd), AuthPlainStr.Key, AuthPlainStr.len)) + smtp_try_plain(0, 0); + else + smtp_get_user(0); + return; } else if (sSMTP->command_state == smtp_password) { - smtp_get_pass(cmdbuf); + smtp_get_pass(0, 0); + return; } else if (sSMTP->command_state == smtp_plain) { - smtp_try_plain(cmdbuf); - } - - else if (!strncasecmp(cmdbuf, "AUTH", 4)) { - smtp_auth(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf, "DATA", 4)) { - smtp_data(); + smtp_try_plain(0, 0); + return; } - else if (!strncasecmp(cmdbuf, "HELO", 4)) { - smtp_hello(&cmdbuf[5], 0); + pchs = pch = ChrPtr(sSMTP->Cmd); + i = 0; + while ((*pch != '\0') && + (!isblank(*pch)) && + (pch - pchs <= MaxSMTPCmdLen)) + { + CMD[i] = toupper(*pch); + pch ++; + i++; } + CMD[i] = '\0'; - else if (!strncasecmp(cmdbuf, "EHLO", 4)) { - smtp_hello(&cmdbuf[5], 1); - } + if ((*pch == '\0') || + (isblank(*pch))) + { + void *v; - else if (!strncasecmp(cmdbuf, "LHLO", 4)) { - smtp_hello(&cmdbuf[5], 2); - } + if (GetHash(SMTPCmds, CMD, i, &v) && + (v != NULL)) + { + smtp_handler_hook *h = (smtp_handler_hook*) v; - else if (!strncasecmp(cmdbuf, "HELP", 4)) { - smtp_help(); - } + if (isblank(pchs[i])) + i++; - else if (!strncasecmp(cmdbuf, "MAIL", 4)) { - smtp_mail(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf, "NOOP", 4)) { - cprintf("250 NOOP\r\n"); - } + h->h(i, h->Flags); - else if (!strncasecmp(cmdbuf, "QUIT", 4)) { - cprintf("221 Goodbye...\r\n"); - CC->kill_me = KILLME_CLIENT_LOGGED_OUT; - return; - } - - else if (!strncasecmp(cmdbuf, "RCPT", 4)) { - smtp_rcpt(&cmdbuf[5]); - } - - else if (!strncasecmp(cmdbuf, "RSET", 4)) { - smtp_rset(1); - } -#ifdef HAVE_OPENSSL - else if (!strcasecmp(cmdbuf, "STARTTLS")) { - smtp_starttls(); - } -#endif - else { - cprintf("502 I'm afraid I can't do that.\r\n"); + return; + } } - - + cprintf("502 I'm afraid I can't do that.\r\n"); } +void smtp_noop(long offest, long Flags) +{ + cprintf("250 NOOP\r\n"); +} - - - - - +void smtp_quit(long offest, long Flags) +{ + cprintf("221 Goodbye...\r\n"); + CC->kill_me = KILLME_CLIENT_LOGGED_OUT; +} /*****************************************************************************/ /* MODULE INITIALIZATION STUFF */ @@ -928,16 +1103,26 @@ void smtp_command_loop(void) { * This cleanup function blows away the temporary memory used by * the SMTP server. */ -void smtp_cleanup_function(void) { +void smtp_cleanup_function(void) +{ + citsmtp *sSMTP = SMTP; + struct CitContext *CCC = CC; /* Don't do this stuff if this is not an SMTP session! */ - if (CC->h_command_function != smtp_command_loop) return; + if (CCC->h_command_function != smtp_command_loop) return; - syslog(LOG_DEBUG, "Performing SMTP cleanup hook\n"); - free(SMTP); -} + syslog(LOG_DEBUG, "Performing SMTP cleanup hook"); + FreeStrBuf(&sSMTP->Cmd); + FreeStrBuf(&sSMTP->helo_node); + FreeStrBuf(&sSMTP->from); + FreeStrBuf(&sSMTP->recipients); + FreeStrBuf(&sSMTP->OneRcpt); + FreeStrBuf(&sSMTP->preferred_sender_email); + FreeStrBuf(&sSMTP->preferred_sender_name); + free(sSMTP); +} const char *CitadelServiceSMTP_MTA="SMTP-MTA"; const char *CitadelServiceSMTPS_MTA="SMTPs-MTA"; @@ -945,11 +1130,30 @@ const char *CitadelServiceSMTP_MSA="SMTP-MSA"; const char *CitadelServiceSMTP_LMTP="LMTP"; const char *CitadelServiceSMTP_LMTP_UNF="LMTP-UnF"; + CTDL_MODULE_INIT(smtp) { if (!threading) { - CtdlRegisterServiceHook(config.c_smtp_port, /* SMTP MTA */ + SMTPCmds = NewHash(1, NULL); + + RegisterSmtpCMD("AUTH", smtp_auth, 0); + RegisterSmtpCMD("DATA", smtp_data, 0); + RegisterSmtpCMD("HELO", smtp_hello, HELO); + RegisterSmtpCMD("EHLO", smtp_hello, EHLO); + RegisterSmtpCMD("LHLO", smtp_hello, LHLO); + RegisterSmtpCMD("HELP", smtp_help, 0); + RegisterSmtpCMD("MAIL", smtp_mail, 0); + RegisterSmtpCMD("NOOP", smtp_noop, 0); + RegisterSmtpCMD("QUIT", smtp_quit, 0); + RegisterSmtpCMD("RCPT", smtp_rcpt, 0); + RegisterSmtpCMD("RSET", smtp_rset, 1); +#ifdef HAVE_OPENSSL + RegisterSmtpCMD("STARTTLS", smtp_starttls, 0); +#endif + + + CtdlRegisterServiceHook(CtdlGetConfigInt("c_smtp_port"), /* SMTP MTA */ NULL, smtp_mta_greeting, smtp_command_loop, @@ -957,7 +1161,7 @@ CTDL_MODULE_INIT(smtp) CitadelServiceSMTP_MTA); #ifdef HAVE_OPENSSL - CtdlRegisterServiceHook(config.c_smtps_port, + CtdlRegisterServiceHook(CtdlGetConfigInt("c_smtps_port"), /* SMTPS MTA */ NULL, smtps_greeting, smtp_command_loop, @@ -965,7 +1169,7 @@ CTDL_MODULE_INIT(smtp) CitadelServiceSMTPS_MTA); #endif - CtdlRegisterServiceHook(config.c_msa_port, /* SMTP MSA */ + CtdlRegisterServiceHook(CtdlGetConfigInt("c_msa_port"), /* SMTP MSA */ NULL, smtp_msa_greeting, smtp_command_loop, @@ -986,7 +1190,8 @@ CTDL_MODULE_INIT(smtp) NULL, CitadelServiceSMTP_LMTP_UNF); - CtdlRegisterSessionHook(smtp_cleanup_function, EVT_STOP); + CtdlRegisterCleanupHook(smtp_cleanup); + CtdlRegisterSessionHook(smtp_cleanup_function, EVT_STOP, PRIO_STOP + 250); } /* return our module name for the log */