enum { /* Command states for login authentication */
smtp_command,
smtp_user,
- smtp_password
-};
-
-enum { /* Delivery modes */
- smtp_deliver_local,
- smtp_deliver_remote
+ smtp_password,
+ smtp_plain
};
#define SMTP CC->SMTP
/*
* Here's where our SMTP session begins its happy day.
*/
-void smtp_greeting(void) {
+void smtp_greeting(int is_msa)
+{
+ char message_to_spammer[1024];
strcpy(CC->cs_clientname, "SMTP session");
CC->internal_pgm = 1;
memset(SMTP, 0, sizeof(struct citsmtp));
memset(SMTP_RECPS, 0, SIZ);
memset(SMTP_ROOMS, 0, SIZ);
+ SMTP->is_msa = is_msa;
+
+ /* 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) && (SMTP->is_msa == 0) ) {
+ if (rbl_check(message_to_spammer)) {
+ cprintf("550 %s\r\n", message_to_spammer);
+ CC->kill_me = 1;
+ /* no need to free_recipients(valid), it's not allocated yet */
+ return;
+ }
+ }
+
+ /* 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
+ );
+ CC->kill_me = 1;
+ /* no need to free_recipients(valid), it's not allocated yet */
+ return;
+ }
cprintf("220 %s ESMTP Citadel server ready.\r\n", config.c_fqdn);
}
#ifdef HAVE_OPENSSL
void smtps_greeting(void) {
CtdlStartTLS(NULL, NULL, NULL);
- smtp_greeting();
+ smtp_greeting(0);
}
#endif
* SMTP MSA port requires authentication.
*/
void smtp_msa_greeting(void) {
- smtp_greeting();
- SMTP->is_msa = 1;
+ smtp_greeting(1);
}
* LMTP is like SMTP but with some extra bonus footage added.
*/
void lmtp_greeting(void) {
- smtp_greeting();
+ smtp_greeting(0);
SMTP->is_lmtp = 1;
}
+/*
+ * Generic SMTP MTA greeting
+ */
+void smtp_mta_greeting(void) {
+ smtp_greeting(0);
+}
+
+
/*
* We also have an unfiltered LMTP socket that bypasses spam filters.
*/
void lmtp_unfiltered_greeting(void) {
- smtp_greeting();
+ smtp_greeting(0);
SMTP->is_lmtp = 1;
SMTP->is_unfiltered = 1;
}
/*
- *
+ * Back end for PLAIN auth method (either inline or multistate)
*/
-void smtp_auth(char *argbuf) {
- char username_prompt[64];
- char method[64];
- char encoded_authstring[1024];
+void smtp_try_plain(char *encoded_authstring) {
char decoded_authstring[1024];
char ident[256];
char user[256];
char pass[256];
+ CtdlDecodeBase64(decoded_authstring,
+ encoded_authstring,
+ strlen(encoded_authstring) );
+ safestrncpy(ident, decoded_authstring, sizeof ident);
+ safestrncpy(user, &decoded_authstring[strlen(ident) + 1], sizeof user);
+ safestrncpy(pass, &decoded_authstring[strlen(ident) + strlen(user) + 2], sizeof pass);
+
+ SMTP->command_state = smtp_command;
+ if (CtdlLoginExistingUser(user) == login_ok) {
+ if (CtdlTryPassword(pass) == pass_ok) {
+ smtp_auth_greeting();
+ return;
+ }
+ }
+ cprintf("504 5.7.4 Authentication failed.\r\n");
+}
+
+
+/*
+ * Attempt to perform authenticated SMTP
+ */
+void smtp_auth(char *argbuf) {
+ char username_prompt[64];
+ char method[64];
+ char encoded_authstring[1024];
+
if (CC->logged_in) {
cprintf("504 5.7.4 Already logged in.\r\n");
return;
}
if (!strncasecmp(method, "plain", 5) ) {
- extract_token(encoded_authstring, argbuf, 1, ' ', sizeof encoded_authstring);
- CtdlDecodeBase64(decoded_authstring,
- encoded_authstring,
- strlen(encoded_authstring) );
- safestrncpy(ident, decoded_authstring, sizeof ident);
- safestrncpy(user, &decoded_authstring[strlen(ident) + 1], sizeof user);
- safestrncpy(pass, &decoded_authstring[strlen(ident) + strlen(user) + 2], sizeof pass);
-
- if (CtdlLoginExistingUser(user) == login_ok) {
- if (CtdlTryPassword(pass) == pass_ok) {
- smtp_auth_greeting();
- return;
- }
+ if (num_tokens(argbuf, ' ') < 2) {
+ cprintf("334 \r\n");
+ SMTP->command_state = smtp_plain;
+ return;
}
- cprintf("504 5.7.4 Authentication failed.\r\n");
+
+ extract_token(encoded_authstring, argbuf, 1, ' ', sizeof encoded_authstring);
+
+ smtp_try_plain(encoded_authstring);
+ return;
}
if (strncasecmp(method, "login", 5) ) {
}
/* RBL check */
- if ( (!CC->logged_in)
- && (!SMTP->is_lmtp) ) {
- if (rbl_check(message_to_spammer)) {
- cprintf("550 %s\r\n", message_to_spammer);
- /* no need to free(valid), it's not allocated yet */
- return;
+ if ( (!CC->logged_in) /* Don't RBL authenticated users */
+ && (!SMTP->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)) {
+ cprintf("550 %s\r\n", message_to_spammer);
+ /* no need to free_recipients(valid), it's not allocated yet */
+ return;
+ }
}
}
valid = validate_recipients(recp);
if (valid->num_error != 0) {
cprintf("599 5.1.1 Error: %s\r\n", valid->errormsg);
- free(valid);
+ free_recipients(valid);
return;
}
if (CC->logged_in) {
if (CtdlCheckInternetMailPermission(&CC->user)==0) {
cprintf("551 5.7.1 <%s> - you do not have permission to send Internet mail\r\n", recp);
- free(valid);
+ free_recipients(valid);
return;
}
}
if ( (SMTP->message_originated_locally == 0)
&& (SMTP->is_lmtp == 0) ) {
cprintf("551 5.7.1 <%s> - relaying denied\r\n", recp);
- free(valid);
+ free_recipients(valid);
return;
}
}
}
strcat(SMTP->recipients, recp);
SMTP->number_of_recipients += 1;
+ if (valid != NULL)
+ free_recipients(valid);
}
*/
void smtp_data(void) {
char *body;
- struct CtdlMessage *msg;
+ struct CtdlMessage *msg = NULL;
long msgnum = (-1L);
char nowstamp[SIZ];
struct recptypes *valid;
msg->cm_fields['O'] = strdup(MAILROOM);
}
+ /* Set the "envelope from" address */
+ if (msg->cm_fields['P'] != NULL) {
+ free(msg->cm_fields['P']);
+ }
+ msg->cm_fields['P'] = strdup(SMTP->from);
+
+ /* Set the "envelope to" address */
+ if (msg->cm_fields['V'] != NULL) {
+ free(msg->cm_fields['V']);
+ }
+ msg->cm_fields['V'] = strdup(SMTP->recipients);
+
/* Submit the message into the Citadel system. */
valid = validate_recipients(SMTP->recipients);
/* Clean up */
CtdlFreeMessage(msg);
- free(valid);
+ free_recipients(valid);
smtp_data_clear(); /* clear out the buffers now */
}
smtp_get_pass(cmdbuf);
}
+ else if (SMTP->command_state == smtp_plain) {
+ smtp_try_plain(cmdbuf);
+ }
+
else if (!strncasecmp(cmdbuf, "AUTH", 4)) {
smtp_auth(&cmdbuf[5]);
}
sock = (-1);
for (mx=0; (mx<num_mxhosts && sock < 0); ++mx) {
+ char *endpart;
extract_token(buf, mxhosts, mx, '|', sizeof buf);
strcpy(mx_user, "");
strcpy(mx_pass, "");
if (num_tokens(buf, '@') > 1) {
- extract_token(mx_user, buf, 0, '@', sizeof mx_user);
- if (num_tokens(mx_user, ':') > 1) {
- extract_token(mx_pass, mx_user, 1, ':', sizeof mx_pass);
- remove_token(mx_user, 1, ':');
+ strcpy (mx_user, buf);
+ endpart = strrchr(mx_user, '@');
+ *endpart = '\0';
+ strcpy (mx_host, endpart + 1);
+ endpart = strrchr(mx_user, ':');
+ if (endpart != NULL) {
+ strcpy(mx_pass, endpart+1);
+ *endpart = '\0';
}
- remove_token(buf, 0, '@');
}
- extract_token(mx_host, buf, 0, ':', sizeof mx_host);
- extract_token(mx_port, buf, 1, ':', sizeof mx_port);
- if (!mx_port[0]) {
+ else
+ strcpy (mx_host, buf);
+ endpart = strrchr(mx_host, ':');
+ if (endpart != 0){
+ *endpart = '\0';
+ strcpy(mx_port, endpart + 1);
+ }
+ else {
strcpy(mx_port, "25");
}
- lprintf(CTDL_DEBUG, "FIXME user<%s> pass<%s> host<%s> port<%s>\n",
- mx_user, mx_pass, mx_host, mx_port);
lprintf(CTDL_DEBUG, "Trying %s : %s ...\n", mx_host, mx_port);
sock = sock_connect(mx_host, mx_port, "tcp");
snprintf(dsn, SIZ, "Could not connect: %s", strerror(errno));
if (sock >= 0) lprintf(CTDL_DEBUG, "Connected!\n");
- if (sock < 0) snprintf(dsn, SIZ, "%s", strerror(errno));
+ if (sock < 0) {
+ if (errno > 0) {
+ snprintf(dsn, SIZ, "%s", strerror(errno));
+ }
+ else {
+ snprintf(dsn, SIZ, "Unable to connect to %s : %s\n", mx_host, mx_port);
+ }
+ }
}
if (sock < 0) {
/* At this point we know we are talking to a real SMTP server */
- /* Do a HELO command */
- snprintf(buf, sizeof buf, "HELO %s\r\n", config.c_fqdn);
+ /* Do a EHLO command. If it fails, try the HELO command. */
+ snprintf(buf, sizeof buf, "EHLO %s\r\n", config.c_fqdn);
lprintf(CTDL_DEBUG, ">%s", buf);
sock_write(sock, buf, strlen(buf));
if (ml_sock_gets(sock, buf) < 0) {
goto bail;
}
lprintf(CTDL_DEBUG, "<%s\n", buf);
+ if (buf[0] != '2') {
+ snprintf(buf, sizeof buf, "HELO %s\r\n", config.c_fqdn);
+ lprintf(CTDL_DEBUG, ">%s", buf);
+ sock_write(sock, buf, strlen(buf));
+ if (ml_sock_gets(sock, buf) < 0) {
+ *status = 4;
+ strcpy(dsn, "Connection broken during SMTP HELO");
+ goto bail;
+ }
+ }
if (buf[0] != '2') {
if (buf[0] == '4') {
*status = 4;
/* Do an AUTH command if necessary */
if (strlen(mx_user) > 0) {
- sprintf(buf, "%s%c%s%c%s%c", mx_user, 0, mx_user, 0, mx_pass, 0);
- CtdlEncodeBase64(mailfrom, buf, strlen(mx_user) + strlen(mx_user) + strlen(mx_pass) + 3);
+ sprintf(buf, "%s%c%s%c%s", mx_user, '\0', mx_user, '\0', mx_pass);
+ CtdlEncodeBase64(mailfrom, buf, strlen(mx_user) + strlen(mx_user) + strlen(mx_pass) + 2);
snprintf(buf, sizeof buf, "AUTH PLAIN %s\r\n", mailfrom);
lprintf(CTDL_DEBUG, ">%s", buf);
sock_write(sock, buf, strlen(buf));
char addr[1024];
char dsn[1024];
char bounceto[1024];
+ char boundary[64];
int num_bounces = 0;
int bounce_this = 0;
long bounce_msgid = (-1);
int give_up = 0;
struct recptypes *valid;
int successful_bounce = 0;
+ static int seq = 0;
+ char *omsgtext;
+ size_t omsgsize;
+ long omsgid = (-1);
lprintf(CTDL_DEBUG, "smtp_do_bounce() called\n");
strcpy(bounceto, "");
-
+ sprintf(boundary, "=_Citadel_Multipart_%s_%04x%04x", config.c_fqdn, getpid(), ++seq);
lines = num_tokens(instr, '\n');
-
/* See if it's time to give up on delivery of this message */
for (i=0; i<lines; ++i) {
extract_token(buf, instr, i, '\n', sizeof buf);
give_up = 1;
}
-
+ /* Start building our bounce message */
bmsg = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage));
if (bmsg == NULL) return;
bmsg->cm_magic = CTDLMESSAGE_MAGIC;
bmsg->cm_anon_type = MES_NORMAL;
- bmsg->cm_format_type = 1;
+ bmsg->cm_format_type = FMT_RFC822;
bmsg->cm_fields['A'] = strdup("Citadel");
bmsg->cm_fields['O'] = strdup(MAILROOM);
bmsg->cm_fields['N'] = strdup(config.c_nodename);
bmsg->cm_fields['U'] = strdup("Delivery Status Notification (Failure)");
-
- if (give_up) bmsg->cm_fields['M'] = strdup(
+ bmsg->cm_fields['M'] = malloc(1024);
+
+ strcpy(bmsg->cm_fields['M'], "Content-type: multipart/mixed; boundary=\"");
+ strcat(bmsg->cm_fields['M'], boundary);
+ strcat(bmsg->cm_fields['M'], "\"\r\n");
+ strcat(bmsg->cm_fields['M'], "MIME-Version: 1.0\r\n");
+ strcat(bmsg->cm_fields['M'], "X-Mailer: " CITADEL "\r\n");
+ strcat(bmsg->cm_fields['M'], "\r\nThis is a multipart message in MIME format.\r\n\r\n");
+ strcat(bmsg->cm_fields['M'], "--");
+ strcat(bmsg->cm_fields['M'], boundary);
+ strcat(bmsg->cm_fields['M'], "\r\n");
+ strcat(bmsg->cm_fields['M'], "Content-type: text/plain\r\n\r\n");
+
+ if (give_up) strcat(bmsg->cm_fields['M'],
"A message you sent could not be delivered to some or all of its recipients\n"
"due to prolonged unavailability of its destination(s).\n"
"Giving up on the following addresses:\n\n"
);
- else bmsg->cm_fields['M'] = strdup(
+ else strcat(bmsg->cm_fields['M'],
"A message you sent could not be delivered to some or all of its recipients.\n"
"The following addresses were undeliverable:\n\n"
);
strcpy(bounceto, addr);
}
+ if (!strcasecmp(key, "msgid")) {
+ omsgid = atol(addr);
+ }
+
if (
(!strcasecmp(key, "local"))
|| (!strcasecmp(key, "remote"))
}
}
+ /* Attach the original message */
+ if (omsgid >= 0) {
+ strcat(bmsg->cm_fields['M'], "--");
+ strcat(bmsg->cm_fields['M'], boundary);
+ strcat(bmsg->cm_fields['M'], "\r\n");
+ strcat(bmsg->cm_fields['M'], "Content-type: message/rfc822\r\n");
+ strcat(bmsg->cm_fields['M'], "Content-Transfer-Encoding: 7bit\r\n");
+ strcat(bmsg->cm_fields['M'], "Content-Disposition: inline\r\n");
+ strcat(bmsg->cm_fields['M'], "\r\n");
+
+ CC->redirect_buffer = malloc(SIZ);
+ CC->redirect_len = 0;
+ CC->redirect_alloc = SIZ;
+ CtdlOutputMsg(omsgid, MT_RFC822, HEADERS_ALL, 0, 1, NULL);
+ omsgtext = CC->redirect_buffer;
+ omsgsize = CC->redirect_len;
+ CC->redirect_buffer = NULL;
+ CC->redirect_len = 0;
+ CC->redirect_alloc = 0;
+ bmsg->cm_fields['M'] = realloc(bmsg->cm_fields['M'],
+ (strlen(bmsg->cm_fields['M']) + omsgsize + 1024) );
+ strcat(bmsg->cm_fields['M'], omsgtext);
+ free(omsgtext);
+ }
+
+ /* Close the multipart MIME scope */
+ strcat(bmsg->cm_fields['M'], "--");
+ strcat(bmsg->cm_fields['M'], boundary);
+ strcat(bmsg->cm_fields['M'], "--\r\n");
+
/* Deliver the bounce if there's anything worth mentioning */
lprintf(CTDL_DEBUG, "num_bounces = %d\n", num_bounces);
if (num_bounces > 0) {
/* Free up the memory we used */
if (valid != NULL) {
- free(valid);
+ free_recipients(valid);
}
}
* Called by smtp_do_queue() to handle an individual message.
*/
void smtp_do_procmsg(long msgnum, void *userdata) {
- struct CtdlMessage *msg;
+ struct CtdlMessage *msg = NULL;
char *instr = NULL;
char *results = NULL;
int i;
* message and the message message.
*/
if (incomplete_deliveries_remaining <= 0) {
- CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, msgnum, "", 0);
- CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, text_msgid, "", 0);
+ long delmsgs[2];
+ delmsgs[0] = msgnum;
+ delmsgs[1] = text_msgid;
+ CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, delmsgs, 2, "");
}
-
/*
* Uncompleted delivery instructions remain, so delete the old
* instructions and replace with the updated ones.
*/
if (incomplete_deliveries_remaining > 0) {
- CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, msgnum, "", 0);
+ CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &msgnum, 1, "");
msg = malloc(sizeof(struct CtdlMessage));
memset(msg, 0, sizeof(struct CtdlMessage));
msg->cm_magic = CTDLMESSAGE_MAGIC;
lprintf(CTDL_ERR, "Cannot find room <%s>\n", SMTP_SPOOLOUT_ROOM);
return;
}
- CtdlForEachMessage(MSGS_ALL, 0L,
+ CtdlForEachMessage(MSGS_ALL, 0L, NULL,
SPOOLMIME, NULL, smtp_do_procmsg, NULL);
lprintf(CTDL_INFO, "SMTP: queue run completed\n");
CtdlRegisterServiceHook(config.c_smtp_port, /* SMTP MTA */
NULL,
- smtp_greeting,
+ smtp_mta_greeting,
smtp_command_loop,
NULL);
projects / citadel.git / blobdiff