/*
- * 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
* 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
- *
- * 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.
+ * Copyright (c) 1998-2012 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.
+ *
* 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
*/
#include "sysdep.h"
};
-
-
-
-/*****************************************************************************/
-/* SMTP SERVER (INBOUND) STUFF */
-/*****************************************************************************/
-
-
/*
* Here's where our SMTP session begins its happy day.
*/
*/
if ( (config.c_rbl_at_greeting) && (sSMTP->is_msa == 0) ) {
if (rbl_check(message_to_spammer)) {
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
cprintf("421 %s\r\n", message_to_spammer);
else
cprintf("550 %s\r\n", message_to_spammer);
/* Otherwise we're either clean or we check later. */
if (CC->nologin==1) {
- cprintf("500 Too many users are already online (maximum is %d)\r\n",
- config.c_maxsessions
- );
+ cprintf("451 Too many connections are already open; please try again later.\r\n");
CC->kill_me = KILLME_MAX_SESSIONS_EXCEEDED;
/* no need to free_recipients(valid), it's not allocated yet */
return;
* 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;
}
&& (!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 (CtdlThreadCheckStop())
+ if (server_shutting_down)
cprintf("421 %s\r\n", message_to_spammer);
else
cprintf("550 %s\r\n", message_to_spammer);
}
}
- valid = validate_recipients(recp,
- smtp_get_Recipients (),
- (sSMTP->is_lmtp)? POST_LMTP:
- (CC->logged_in)? POST_LOGGED_IN:
- POST_EXTERNAL);
+ valid = validate_recipients(
+ recp,
+ smtp_get_Recipients(),
+ (sSMTP->is_lmtp)? POST_LMTP: (CC->logged_in)? POST_LOGGED_IN: POST_EXTERNAL
+ );
if (valid->num_error != 0) {
cprintf("550 %s\r\n", valid->errormsg);
free_recipients(valid);
* 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 ( (CC->logged_in) && (config.c_rfc822_strict_from != CFG_SMTP_FROM_NOFILTER) ) {
+ int validemail = 0;
+
+ if (!IsEmptyStr(msg->cm_fields['F']) &&
+ ((config.c_rfc822_strict_from == CFG_SMTP_FROM_CORRECT) ||
+ (config.c_rfc822_strict_from == CFG_SMTP_FROM_REJECT) ) )
+ {
+ if (!IsEmptyStr(CC->cs_inet_email))
+ validemail = strcmp(CC->cs_inet_email, msg->cm_fields['F']) == 0;
+ if ((!validemail) &&
+ (!IsEmptyStr(CC->cs_inet_other_emails)))
+ {
+ int num_secondary_emails = 0;
+ int i;
+ num_secondary_emails = num_tokens(CC->cs_inet_other_emails, '|');
+ for (i=0; i < num_secondary_emails && !validemail; ++i) {
+ char buf[256];
+ extract_token(buf, CC->cs_inet_other_emails,i,'|',sizeof CC->cs_inet_other_emails);
+ validemail = strcmp(buf, msg->cm_fields['F']) == 0;
+ }
+ }
+ }
+
+ if (!validemail && (config.c_rfc822_strict_from == CFG_SMTP_FROM_REJECT)) {
+ syslog(LOG_ERR, "invalid sender '%s' - rejecting this message", msg->cm_fields['F']);
+ cprintf("550 Invalid sender '%s' - rejecting this message.\r\n", msg->cm_fields['F']);
+ return;
+ }
+
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 (!validemail) {
+ if (msg->cm_fields['F'] != NULL) free(msg->cm_fields['F']);
+ msg->cm_fields['F'] = strdup(CC->cs_inet_email);
+ }
}
/* Set the "envelope from" address */
msg->cm_fields['V'] = strdup(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(
+ sSMTP->recipients,
+ smtp_get_Recipients(),
+ (sSMTP->is_lmtp)? POST_LMTP: (CC->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
}
}
- /* 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
/*
- * implements the STARTTLS command (Citadel API version)
+ * implements the STARTTLS command
*/
void smtp_starttls(void)
{
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);
}
-
/*
- * Main command loop for SMTP sessions.
+ * Main command loop for SMTP server sessions.
*/
void smtp_command_loop(void) {
char cmdbuf[SIZ];
if (sSMTP == NULL) {
syslog(LOG_EMERG, "Session SMTP data is null. WTF? We will crash now.\n");
+ return cit_panic_backtrace (0);
}
time(&CC->lastcmd);
memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
- syslog(LOG_CRIT, "Client disconnected: ending session.\n");
+ syslog(LOG_CRIT, "SMTP: client disconnected: ending session.\n");
CC->kill_me = KILLME_CLIENT_DISCONNECTED;
return;
}
}
-
-
-
-
-
-
/*****************************************************************************/
/* MODULE INITIALIZATION STUFF */
/*****************************************************************************/
NULL,
CitadelServiceSMTP_LMTP_UNF);
- CtdlRegisterSessionHook(smtp_cleanup_function, EVT_STOP);
+ CtdlRegisterSessionHook(smtp_cleanup_function, EVT_STOP, PRIO_STOP + 250);
}
- /* return our Subversion id for the Log */
+ /* return our module name for the log */
return "smtp";
}
projects / citadel.git / blobdiff