X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtp.c;h=5fbc5003c5592f46db2801b09a96c3fb9ab67622;hp=63422fbdcfd92127f52e57d2e2ce62ea79e8ad57;hb=5ac2920028e92a453c686c799327d7a66b3e7b49;hpb=15054b0f11409cfc68102560fe4ab5a4e2bf4ea0 diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c index 63422fbdc..5fbc5003c 100644 --- a/citadel/modules/smtp/serv_smtp.c +++ b/citadel/modules/smtp/serv_smtp.c @@ -20,7 +20,7 @@ * The VRFY and EXPN commands have been removed from this implementation * because nobody uses these commands anymore, except for spammers. * - * Copyright (c) 1998-2015 by the citadel.org team + * Copyright (c) 1998-2018 by the citadel.org team * * 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. @@ -81,6 +81,7 @@ #include "ctdl_module.h" #include "smtp_util.h" + enum { /* Command states for login authentication */ smtp_command, smtp_user, @@ -101,6 +102,8 @@ typedef struct _smtp_handler_hook { int Flags; } smtp_handler_hook; +int EnableSMTPLog = 0; + HashList *SMTPCmds = NULL; #define MaxSMTPCmdLen 10 @@ -113,7 +116,9 @@ void registerSmtpCMD(const char *First, long FLen, smtp_handler_hook *h; if (FLen >= MaxSMTPCmdLen) - cit_panic_backtrace (0); + { + abort(); + } h = (smtp_handler_hook*) malloc(sizeof(smtp_handler_hook)); memset(h, 0, sizeof(smtp_handler_hook)); @@ -123,6 +128,7 @@ void registerSmtpCMD(const char *First, long FLen, Put(SMTPCmds, First, FLen, h, NULL); } + void smtp_cleanup(void) { DeleteHash(&SMTPCmds); @@ -155,7 +161,7 @@ void smtp_greeting(int is_msa) * addresses immediately instead of after they execute a RCPT */ if ( (CtdlGetConfigInt("c_rbl_at_greeting")) && (sSMTP->is_msa == 0) ) { - if (rbl_check(message_to_spammer)) { + if (rbl_check(CC->cs_addr, message_to_spammer)) { if (server_shutting_down) cprintf("421 %s\r\n", message_to_spammer); else @@ -237,10 +243,11 @@ void lmtp_unfiltered_greeting(void) { * Login greeting common to all auth methods */ void smtp_auth_greeting(long offset, long Flags) { - 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; + 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; } @@ -251,6 +258,7 @@ void smtp_auth_greeting(long offset, long Flags) { */ void smtp_hello(long offset, long which_command) { + struct CitContext *CCC = CC; citsmtp *sSMTP = SMTP; StrBufAppendBuf (sSMTP->helo_node, sSMTP->Cmd, offset); @@ -268,16 +276,16 @@ void smtp_hello(long offset, long which_command) if (which_command == HELO) { cprintf("250 Hello %s (%s [%s])\r\n", ChrPtr(sSMTP->helo_node), - CC->cs_host, - CC->cs_addr + CCC->cs_host, + CCC->cs_addr ); } else { if (which_command == EHLO) { cprintf("250-Hello %s (%s [%s])\r\n", ChrPtr(sSMTP->helo_node), - CC->cs_host, - CC->cs_addr + CCC->cs_host, + CCC->cs_addr ); } else { @@ -293,7 +301,7 @@ void smtp_hello(long offset, long 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 */ @@ -318,7 +326,7 @@ void smtp_webcit_preferences_hack_backend(long msgnum, void *userdata) { return; // already got it } - msg = CtdlFetchMessage(msgnum, 1); + msg = CtdlFetchMessage(msgnum, 1, 1); if (msg == NULL) { return; } @@ -339,12 +347,13 @@ void smtp_webcit_preferences_hack_backend(long msgnum, void *userdata) { * 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", CC->user.usernum, USERCONFIGROOM); - if (CtdlGetRoom(&CC->room, config_roomname) != 0) { + snprintf(config_roomname, sizeof config_roomname, "%010ld.%s", CCC->user.usernum, USERCONFIGROOM); + if (CtdlGetRoom(&CCC->room, config_roomname) != 0) { return; } @@ -398,8 +407,7 @@ void smtp_get_user(long offset) StrBufDecodeBase64(sSMTP->Cmd); - /* syslog(LOG_DEBUG, "Trying <%s>\n", username); */ - if (CtdlLoginExistingUser(NULL, ChrPtr(sSMTP->Cmd)) == login_ok) { + if (CtdlLoginExistingUser(ChrPtr(sSMTP->Cmd)) == login_ok) { size_t len = CtdlEncodeBase64(buf, "Password:", 9, 0); if (buf[len - 1] == '\n') { @@ -425,7 +433,7 @@ void smtp_get_pass(long offset, long Flags) memset(password, 0, sizeof(password)); StrBufDecodeBase64(sSMTP->Cmd); - /* syslog(LOG_DEBUG, "Trying <%s>\n", password); */ + syslog(LOG_DEBUG, "Trying <%s>", password); if (CtdlTryPassword(SKEY(sSMTP->Cmd)) == pass_ok) { smtp_auth_greeting(offset, Flags); } @@ -484,10 +492,10 @@ void smtp_try_plain(long offset, long Flags) 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) { @@ -506,12 +514,13 @@ void smtp_try_plain(long offset, long Flags) */ 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; } @@ -629,6 +638,7 @@ void smtp_mail(long offset, long flags) { char user[SIZ]; char node[SIZ]; char name[SIZ]; + struct CitContext *CCC = CC; citsmtp *sSMTP = SMTP; if (StrLength(sSMTP->from) > 0) { @@ -660,8 +670,8 @@ void smtp_mail(long offset, long flags) { /* 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) { - StrBufPlain(sSMTP->from, CC->cs_inet_email, -1); + 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; @@ -731,7 +741,7 @@ void smtp_rcpt(long offset, long flags) if ( (!CCC->logged_in) /* Don't RBL authenticated users */ && (!sSMTP->is_lmtp) ) { /* Don't RBL LMTP clients */ if (CtdlGetConfigInt("c_rbl_at_greeting") == 0) { /* Don't RBL again if we already did it */ - if (rbl_check(message_to_spammer)) { + if (rbl_check(CC->cs_addr, message_to_spammer)) { if (server_shutting_down) cprintf("421 %s\r\n", message_to_spammer); else @@ -841,14 +851,14 @@ void smtp_data(long offset, long flags) nowstamp); } } - body = CtdlReadMessageBodyBuf(HKEY("."), CtdlGetConfigLong("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 @@ -890,8 +900,6 @@ void smtp_data(long offset, long flags) return; } - CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename"))); - CM_SetField(msg, eHumanNode, CtdlGetConfigStr("c_humannode"), strlen(CtdlGetConfigStr("c_humannode"))); CM_SetField(msg, eOriginalRoom, HKEY(MAILROOM)); if (sSMTP->preferred_sender_name != NULL) CM_SetField(msg, eAuthor, SKEY(sSMTP->preferred_sender_name)); @@ -968,13 +976,13 @@ void smtp_data(long offset, long flags) * 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, - ChrPtr(sSMTP->from), - sSMTP->number_of_recipients, - CCC->cs_host, - CCC->cs_addr, - ChrPtr(sSMTP->OneRcpt) + "%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 */ @@ -1014,17 +1022,17 @@ void smtp_command_loop(void) char CMD[MaxSMTPCmdLen + 1]; if (sSMTP == NULL) { - syslog(LOG_EMERG, "Session SMTP data is null. WTF? We will crash now.\n"); - return cit_panic_backtrace (0); + syslog(LOG_EMERG, "Session SMTP data is null. WTF? We will crash now."); + abort(); } time(&CCC->lastcmd); if (CtdlClientGetLine(sSMTP->Cmd) < 1) { - syslog(LOG_CRIT, "SMTP: client disconnected: ending session.\n"); + syslog(LOG_CRIT, "SMTP: client disconnected: ending session."); CC->kill_me = KILLME_CLIENT_DISCONNECTED; return; } - syslog(LOG_DEBUG, "SMTP server: %s\n", ChrPtr(sSMTP->Cmd)); + syslog(LOG_DEBUG, "SMTP server: %s", ChrPtr(sSMTP->Cmd)); if (sSMTP->command_state == smtp_user) { if (!strncmp(ChrPtr(sSMTP->Cmd), AuthPlainStr.Key, AuthPlainStr.len)) @@ -1098,11 +1106,12 @@ void smtp_quit(long offest, long Flags) 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"); + syslog(LOG_DEBUG, "Performing SMTP cleanup hook"); FreeStrBuf(&sSMTP->Cmd); FreeStrBuf(&sSMTP->helo_node); @@ -1121,6 +1130,7 @@ const char *CitadelServiceSMTP_MSA="SMTP-MSA"; const char *CitadelServiceSMTP_LMTP="LMTP"; const char *CitadelServiceSMTP_LMTP_UNF="LMTP-UnF"; + CTDL_MODULE_INIT(smtp) { if (!threading)