* 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-2021 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.
#include <errno.h>
#include <sys/types.h>
#include <syslog.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
+#include <time.h>
#include <sys/wait.h>
#include <ctype.h>
#include <string.h>
#include "ctdl_module.h"
#include "smtp_util.h"
+
enum { /* Command states for login authentication */
smtp_command,
smtp_user,
int Flags;
} smtp_handler_hook;
+int EnableSMTPLog = 0;
+
HashList *SMTPCmds = NULL;
#define MaxSMTPCmdLen 10
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));
Put(SMTPCmds, First, FLen, h, NULL);
}
-void smtp_cleanup(void)
-{
- DeleteHash(&SMTPCmds);
-}
/*
* Here's where our SMTP session begins its happy day.
* 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
*/
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);
+ syslog(LOG_INFO, "serv_smtp: SMTP authenticated %s", CC->user.fullname);
CC->internal_pgm = 0;
CC->cs_flags &= ~CS_STEALTH;
}
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') {
memset(password, 0, sizeof(password));
StrBufDecodeBase64(sSMTP->Cmd);
- /* syslog(LOG_DEBUG, "Trying <%s>\n", password); */
+ syslog(LOG_DEBUG, "serv_smtp: trying <%s>", password);
if (CtdlTryPassword(SKEY(sSMTP->Cmd)) == pass_ok) {
smtp_auth_greeting(offset, 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) {
*/
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')",
+ syslog(LOG_DEBUG, "serv_smtp: 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);
FlushStrBuf(sSMTP->from);
- syslog(LOG_DEBUG, "Rejecting unauthenticated mail from %s", node);
+ syslog(LOG_DEBUG, "serv_smtp: rejecting unauthenticated mail from %s", node);
return;
}
}
*/
void smtp_rcpt(long offset, long flags)
{
- struct CitContext *CCC = CC;
char message_to_spammer[SIZ];
- recptypes *valid = NULL;
+ struct recptypes *valid = NULL;
citsmtp *sSMTP = SMTP;
if (StrLength(sSMTP->from) == 0) {
return;
}
- if ( (sSMTP->is_msa) && (!CCC->logged_in) ) {
+ if ( (sSMTP->is_msa) && (!CC->logged_in) ) {
cprintf("550 You must log in to send mail on this port.\r\n");
FlushStrBuf(sSMTP->from);
return;
}
/* RBL check */
- if ( (!CCC->logged_in) /* Don't RBL authenticated users */
+ if ( (!CC->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
valid = validate_recipients(
ChrPtr(sSMTP->OneRcpt),
smtp_get_Recipients(),
- (sSMTP->is_lmtp)? POST_LMTP: (CCC->logged_in)? POST_LOGGED_IN: POST_EXTERNAL
+ (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);
}
if (valid->num_internet > 0) {
- if (CCC->logged_in) {
- if (CtdlCheckInternetMailPermission(&CCC->user)==0) {
+ if (CC->logged_in) {
+ if (CtdlCheckInternetMailPermission(&CC->user)==0) {
cprintf("551 <%s> - you do not have permission to send Internet mail\r\n",
ChrPtr(sSMTP->OneRcpt));
free_recipients(valid);
*/
void smtp_data(long offset, long flags)
{
- struct CitContext *CCC = CC;
StrBuf *body;
StrBuf *defbody;
struct CtdlMessage *msg = NULL;
long msgnum = (-1L);
char nowstamp[SIZ];
- recptypes *valid;
+ struct recptypes *valid;
int scan_errors;
int i;
citsmtp *sSMTP = SMTP;
defbody = NewStrBufPlain(NULL, SIZ);
if (defbody != NULL) {
- if (sSMTP->is_lmtp && (CCC->cs_UDSclientUID != -1)) {
+ if (sSMTP->is_lmtp && (CC->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,
+ (long int) CC->cs_UDSclientUID,
CtdlGetConfigStr("c_fqdn"),
nowstamp);
}
"Received: from %s (%s [%s])\n"
" by %s; %s\n",
ChrPtr(sSMTP->helo_node),
- CCC->cs_host,
- CCC->cs_addr,
+ CC->cs_host,
+ CC->cs_addr,
CtdlGetConfigStr("c_fqdn"),
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, "serv_smtp: converting message...");
msg = convert_internet_message_buf(&body);
/* If the user is locally authenticated, FORCE the From: header to
* to something ugly like "0000058008.Sent Items>" when the message
* is read with a Citadel client.
*/
- if ( (CCC->logged_in) && (CtdlGetConfigInt("c_rfc822_strict_from") != CFG_SMTP_FROM_NOFILTER) ) {
+ if ( (CC->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 (!IsEmptyStr(CC->cs_inet_email))
+ validemail = strcmp(CC->cs_inet_email, msg->cm_fields[erFc822Addr]) == 0;
if ((!validemail) &&
- (!IsEmptyStr(CCC->cs_inet_other_emails)))
+ (!IsEmptyStr(CC->cs_inet_other_emails)))
{
int num_secondary_emails = 0;
int i;
- num_secondary_emails = num_tokens(CCC->cs_inet_other_emails, '|');
+ 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, CCC->cs_inet_other_emails,i,'|',sizeof CCC->cs_inet_other_emails);
+ extract_token(buf, CC->cs_inet_other_emails,i,'|',sizeof CC->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]);
+ syslog(LOG_ERR, "serv_smtp: 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, 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));
else
- CM_SetField(msg, eAuthor, CCC->user.fullname, strlen(CCC->user.fullname));
+ CM_SetField(msg, eAuthor, CC->user.fullname, strlen(CC->user.fullname));
if (!validemail) {
- if (sSMTP->preferred_sender_email != NULL)
+ 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));
+ }
+ else {
+ CM_SetField(msg, erFc822Addr, CC->cs_inet_email, strlen(CC->cs_inet_email));
+ }
}
}
valid = validate_recipients(
ChrPtr(sSMTP->recipients),
smtp_get_Recipients(),
- (sSMTP->is_lmtp)? POST_LMTP: (CCC->logged_in)? POST_LOGGED_IN: POST_EXTERNAL
+ (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
}
else { /* Ok, we'll accept this message. */
- msgnum = CtdlSubmitMsg(msg, valid, "", 0);
+ msgnum = CtdlSubmitMsg(msg, valid, "");
if (msgnum > 0L) {
StrBufPrintf(sSMTP->OneRcpt, "250 Message accepted.\r\n");
}
* 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,
+ CC->cs_host,
+ CC->cs_addr,
+ ChrPtr(sSMTP->OneRcpt)
);
/* Clean up */
/*
* Main command loop for SMTP server sessions.
*/
-void smtp_command_loop(void)
-{
+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");
- return cit_panic_backtrace (0);
+ syslog(LOG_ERR, "serv_smtp: Session SMTP data is null. WTF? We will crash now.");
+ abort();
}
- time(&CCC->lastcmd);
+ time(&CC->lastcmd);
if (CtdlClientGetLine(sSMTP->Cmd) < 1) {
- syslog(LOG_CRIT, "SMTP: client disconnected: ending session.\n");
+ syslog(LOG_INFO, "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, "serv_smtp: %s", ChrPtr(sSMTP->Cmd));
if (sSMTP->command_state == smtp_user) {
- if (!strncmp(ChrPtr(sSMTP->Cmd), AuthPlainStr.Key, AuthPlainStr.len))
+ if (!strncmp(ChrPtr(sSMTP->Cmd), AuthPlainStr.Key, AuthPlainStr.len)) {
smtp_try_plain(0, 0);
- else
+ }
+ else {
smtp_get_user(0);
+ }
return;
}
/* Don't do this stuff if this is not an SMTP session! */
if (CC->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);
const char *CitadelServiceSMTP_LMTP="LMTP";
const char *CitadelServiceSMTP_LMTP_UNF="LMTP-UnF";
+
CTDL_MODULE_INIT(smtp)
{
- if (!threading)
- {
+ if (!threading) {
SMTPCmds = NewHash(1, NULL);
RegisterSmtpCMD("AUTH", smtp_auth, 0);
NULL,
CitadelServiceSMTP_LMTP_UNF);
- CtdlRegisterCleanupHook(smtp_cleanup);
CtdlRegisterSessionHook(smtp_cleanup_function, EVT_STOP, PRIO_STOP + 250);
}