* The VRFY and EXPN commands have been removed from this implementation
* because nobody uses these commands anymore, except for spammers.
*
- * Copyright (c) 1998-2013 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.
#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);
/* 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
/* 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"));
}
* 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;
}
*/
void smtp_hello(long offset, long which_command)
{
+ struct CitContext *CCC = CC;
citsmtp *sSMTP = SMTP;
StrBufAppendBuf (sSMTP->helo_node, sSMTP->Cmd, offset);
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 {
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
/*
* 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 */
* 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;
}
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, "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) {
*/
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;
}
char user[SIZ];
char node[SIZ];
char name[SIZ];
+ struct CitContext *CCC = CC;
citsmtp *sSMTP = SMTP;
if (StrLength(sSMTP->from) > 0) {
/* 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;
/* 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) {
+ 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
/* RBL check */
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
" by %s; %s\n",
ChrPtr(sSMTP->helo_node),
(long int) CCC->cs_UDSclientUID,
- config.c_fqdn,
+ CtdlGetConfigStr("c_fqdn"),
nowstamp);
}
else {
ChrPtr(sSMTP->helo_node),
CCC->cs_host,
CCC->cs_addr,
- config.c_fqdn,
+ 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
* to something ugly like "0000058008.Sent Items>" when the message
* is read with a Citadel client.
*/
- if ( (CCC->logged_in) && (config.c_rfc822_strict_from != CFG_SMTP_FROM_NOFILTER) ) {
+ if ( (CCC->logged_in) && (CtdlGetConfigInt("c_rfc822_strict_from") != CFG_SMTP_FROM_NOFILTER) ) {
int validemail = 0;
if (!CM_IsEmpty(msg, erFc822Addr) &&
- ((config.c_rfc822_strict_from == CFG_SMTP_FROM_CORRECT) ||
- (config.c_rfc822_strict_from == CFG_SMTP_FROM_REJECT) ) )
+ ((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 && (config.c_rfc822_strict_from == CFG_SMTP_FROM_REJECT)) {
+ 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, eNodeName, CFG_KEY(c_nodename));
- CM_SetField(msg, eHumanNode, CFG_KEY(c_humannode));
CM_SetField(msg, eOriginalRoom, HKEY(MAILROOM));
if (sSMTP->preferred_sender_name != NULL)
CM_SetField(msg, eAuthor, SKEY(sSMTP->preferred_sender_name));
* 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 */
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))
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);
const char *CitadelServiceSMTP_LMTP="LMTP";
const char *CitadelServiceSMTP_LMTP_UNF="LMTP-UnF";
+
CTDL_MODULE_INIT(smtp)
{
if (!threading)
#endif
- CtdlRegisterServiceHook(config.c_smtp_port, /* SMTP MTA */
+ CtdlRegisterServiceHook(CtdlGetConfigInt("c_smtp_port"), /* SMTP MTA */
NULL,
smtp_mta_greeting,
smtp_command_loop,
CitadelServiceSMTP_MTA);
#ifdef HAVE_OPENSSL
- CtdlRegisterServiceHook(config.c_smtps_port,
+ CtdlRegisterServiceHook(CtdlGetConfigInt("c_smtps_port"), /* SMTPS MTA */
NULL,
smtps_greeting,
smtp_command_loop,
CitadelServiceSMTPS_MTA);
#endif
- CtdlRegisterServiceHook(config.c_msa_port, /* SMTP MSA */
+ CtdlRegisterServiceHook(CtdlGetConfigInt("c_msa_port"), /* SMTP MSA */
NULL,
smtp_msa_greeting,
smtp_command_loop,
projects / citadel.git / blobdiff