#include "tools.h"
#include "internet_addressing.h"
#include "genstamp.h"
+#include "domain.h"
+#include "clientsocket.h"
struct citsmtp { /* Information about the current session */
int command_state;
+ char helo_node[256];
struct usersupp vrfy_buffer;
int vrfy_count;
char vrfy_match[256];
long SYM_SMTP;
long SYM_SMTP_RECP;
+
+
+/*****************************************************************************/
+/* SMTP SERVER (INBOUND) STUFF */
+/*****************************************************************************/
+
+
+
+
/*
* Here's where our SMTP session begins its happy day.
*/
CtdlAllocUserData(SYM_SMTP_RECP, 256);
sprintf(SMTP_RECP, "%s", "");
- cprintf("220 Welcome to the Citadel/UX ESMTP server at %s\n",
+ cprintf("220 Welcome to the Citadel/UX ESMTP server at %s\r\n",
config.c_fqdn);
}
*/
void smtp_hello(char *argbuf, int is_esmtp) {
+ safestrncpy(SMTP->helo_node, argbuf, sizeof SMTP->helo_node);
+
if (!is_esmtp) {
- cprintf("250 Greetings and joyous salutations.\n");
+ cprintf("250 Greetings and joyous salutations.\r\n");
}
else {
- cprintf("250-Greetings and joyous salutations.\n");
- cprintf("250-HELP\n");
- cprintf("250-SIZE %ld\n", config.c_maxmsglen);
- cprintf("250 AUTH=LOGIN\n");
+ cprintf("250-Greetings and joyous salutations.\r\n");
+ cprintf("250-HELP\r\n");
+ cprintf("250-SIZE %ld\r\n", config.c_maxmsglen);
+ cprintf("250 AUTH=LOGIN\r\n");
}
}
* Implement HELP command.
*/
void smtp_help(void) {
- cprintf("214-Here's the frequency, Kenneth:\n");
- cprintf("214- DATA\n");
- cprintf("214- EHLO\n");
- cprintf("214- EXPN\n");
- cprintf("214- HELO\n");
- cprintf("214- HELP\n");
- cprintf("214- MAIL\n");
- cprintf("214- NOOP\n");
- cprintf("214- QUIT\n");
- cprintf("214- RCPT\n");
- cprintf("214- RSET\n");
- cprintf("214- VRFY\n");
- cprintf("214 I could tell you more, but then I'd have to kill you.\n");
+ cprintf("214-Here's the frequency, Kenneth:\r\n");
+ cprintf("214- DATA\r\n");
+ cprintf("214- EHLO\r\n");
+ cprintf("214- EXPN\r\n");
+ cprintf("214- HELO\r\n");
+ cprintf("214- HELP\r\n");
+ cprintf("214- MAIL\r\n");
+ cprintf("214- NOOP\r\n");
+ cprintf("214- QUIT\r\n");
+ cprintf("214- RCPT\r\n");
+ cprintf("214- RSET\r\n");
+ cprintf("214- VRFY\r\n");
+ cprintf("214 I could tell you more, but then I'd have to kill you.\r\n");
}
lprintf(9, "Trying <%s>\n", username);
if (CtdlLoginExistingUser(username) == login_ok) {
encode_base64(buf, "Password:");
- cprintf("334 %s\n", buf);
+ cprintf("334 %s\r\n", buf);
SMTP->command_state = smtp_password;
}
else {
- cprintf("500 No such user.\n");
+ cprintf("500 No such user.\r\n");
SMTP->command_state = smtp_command;
}
}
decode_base64(password, argbuf);
lprintf(9, "Trying <%s>\n", password);
if (CtdlTryPassword(password) == pass_ok) {
- cprintf("235 Authentication successful.\n");
- lprintf(9, "SMTP auth login successful\n");
+ cprintf("235 Authentication successful.\r\n");
+ lprintf(9, "SMTP authenticated login successful\n");
CC->internal_pgm = 0;
CC->cs_flags &= ~CS_STEALTH;
}
else {
- cprintf("500 Authentication failed.\n");
+ cprintf("500 Authentication failed.\r\n");
}
SMTP->command_state = smtp_command;
}
char buf[256];
if (strncasecmp(argbuf, "login", 5) ) {
- cprintf("550 We only support LOGIN authentication.\n");
+ cprintf("550 We only support LOGIN authentication.\r\n");
return;
}
else {
encode_base64(buf, "Username:");
- cprintf("334 %s\n", buf);
+ cprintf("334 %s\r\n", buf);
SMTP->command_state = smtp_user;
}
}
/*
* Back end for smtp_vrfy() command
*/
-void smtp_vrfy_backend(struct usersupp *us) {
+void smtp_vrfy_backend(struct usersupp *us, void *data) {
if (!fuzzy_match(us, SMTP->vrfy_match)) {
++SMTP->vrfy_count;
void smtp_vrfy(char *argbuf) {
SMTP->vrfy_count = 0;
strcpy(SMTP->vrfy_match, argbuf);
- ForEachUser(smtp_vrfy_backend);
+ ForEachUser(smtp_vrfy_backend, NULL);
if (SMTP->vrfy_count < 1) {
- cprintf("550 String does not match anything.\n");
+ cprintf("550 String does not match anything.\r\n");
}
else if (SMTP->vrfy_count == 1) {
- cprintf("250 %s <cit%ld@%s>\n",
+ cprintf("250 %s <cit%ld@%s>\r\n",
SMTP->vrfy_buffer.fullname,
SMTP->vrfy_buffer.usernum,
config.c_fqdn);
}
else if (SMTP->vrfy_count > 1) {
- cprintf("553 Request ambiguous: %d users matched.\n",
+ cprintf("553 Request ambiguous: %d users matched.\r\n",
SMTP->vrfy_count);
}
/*
* Back end for smtp_expn() command
*/
-void smtp_expn_backend(struct usersupp *us) {
+void smtp_expn_backend(struct usersupp *us, void *data) {
if (!fuzzy_match(us, SMTP->vrfy_match)) {
if (SMTP->vrfy_count >= 1) {
- cprintf("250-%s <cit%ld@%s>\n",
+ cprintf("250-%s <cit%ld@%s>\r\n",
SMTP->vrfy_buffer.fullname,
SMTP->vrfy_buffer.usernum,
config.c_fqdn);
void smtp_expn(char *argbuf) {
SMTP->vrfy_count = 0;
strcpy(SMTP->vrfy_match, argbuf);
- ForEachUser(smtp_expn_backend);
+ ForEachUser(smtp_expn_backend, NULL);
if (SMTP->vrfy_count < 1) {
- cprintf("550 String does not match anything.\n");
+ cprintf("550 String does not match anything.\r\n");
}
else if (SMTP->vrfy_count >= 1) {
- cprintf("250 %s <cit%ld@%s>\n",
+ cprintf("250 %s <cit%ld@%s>\r\n",
SMTP->vrfy_buffer.fullname,
SMTP->vrfy_buffer.usernum,
config.c_fqdn);
void smtp_rset(void) {
memset(SMTP, 0, sizeof(struct citsmtp));
if (CC->logged_in) logout(CC);
- cprintf("250 Zap!\n");
+ cprintf("250 Zap!\r\n");
}
int cvt;
if (strlen(SMTP->from) != 0) {
- cprintf("503 Only one sender permitted\n");
+ cprintf("503 Only one sender permitted\r\n");
return;
}
if (strncasecmp(argbuf, "From:", 5)) {
- cprintf("501 Syntax error\n");
+ cprintf("501 Syntax error\r\n");
return;
}
striplt(SMTP->from);
if (strlen(SMTP->from) == 0) {
- cprintf("501 Empty sender name is not permitted\n");
+ cprintf("501 Empty sender name is not permitted\r\n");
return;
}
cvt = convert_internet_address(user, node, SMTP->from);
lprintf(9, "cvt=%d, citaddr=<%s@%s>\n", cvt, user, node);
if ( (cvt != 0) || (strcasecmp(user, CC->usersupp.fullname))) {
- cprintf("550 <%s> is not your address.\n", SMTP->from);
+ cprintf("550 <%s> is not your address.\r\n", SMTP->from);
strcpy(SMTP->from, "");
return;
}
else {
cvt = convert_internet_address(user, node, SMTP->from);
lprintf(9, "cvt=%d, citaddr=<%s@%s>\n", cvt, user, node);
- if (!strcasecmp(node, config.c_nodename)) { /* FIX use fcn */
- cprintf("550 You must log in to send mail from %s\n",
- config.c_fqdn);
+ if (CtdlHostAlias(node) == hostalias_localhost) {
+ cprintf("550 You must log in to send mail from %s\r\n",
+ node);
strcpy(SMTP->from, "");
return;
}
}
- cprintf("250 Sender ok. Groovy.\n");
+ cprintf("250 Sender ok. Groovy.\r\n");
}
int is_spam = 0; /* FIX implement anti-spamming */
if (strlen(SMTP->from) == 0) {
- cprintf("503 MAIL first, then RCPT. Duh.\n");
+ cprintf("503 MAIL first, then RCPT. Duh.\r\n");
return;
}
if (strncasecmp(argbuf, "To:", 3)) {
- cprintf("501 Syntax error\n");
+ cprintf("501 Syntax error\r\n");
return;
}
switch(cvt) {
case rfc822_address_locally_validated:
- cprintf("250 %s is a valid recipient.\n", user);
+ cprintf("250 %s is a valid recipient.\r\n", user);
++SMTP->number_of_recipients;
CtdlReallocUserData(SYM_SMTP_RECP,
strlen(SMTP_RECP) + 1024 );
return;
case rfc822_room_delivery:
- cprintf("250 Delivering to room '%s'\n", user);
+ cprintf("250 Delivering to room '%s'\r\n", user);
++SMTP->number_of_recipients;
CtdlReallocUserData(SYM_SMTP_RECP,
strlen(SMTP_RECP) + 1024 );
strcat(SMTP_RECP, "room|");
strcat(SMTP_RECP, user);
- strcat(SMTP_RECP, "|0\n");
+ strcat(SMTP_RECP, "|0|\n");
return;
case rfc822_no_such_user:
- cprintf("550 %s: no such user\n", recp);
+ cprintf("550 %s: no such user\r\n", recp);
return;
case rfc822_address_invalid:
if (is_spam) {
- cprintf("551 Away with thee, spammer!\n");
+ cprintf("551 Away with thee, spammer!\r\n");
}
else {
- cprintf("250 Remote recipient %s ok\n", recp);
+ cprintf("250 Remote recipient %s ok\r\n", recp);
++SMTP->number_of_recipients;
CtdlReallocUserData(SYM_SMTP_RECP,
strlen(SMTP_RECP) + 1024 );
strcat(SMTP_RECP, "remote|");
strcat(SMTP_RECP, recp);
- strcat(SMTP_RECP, "|0\n");
+ strcat(SMTP_RECP, "|0|\n");
return;
}
return;
}
- cprintf("599 Unknown error\n");
+ cprintf("599 Unknown error\r\n");
}
++successful_saves;
instr = mallok(1024);
- sprintf(instr, "Content-type: %s\n\nmsgid|%ld\n",
- SPOOLMIME, msgid);
+ sprintf(instr, "Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n",
+ SPOOLMIME, msgid, time(NULL) );
for (i=0; i<SMTP->number_of_recipients; ++i) {
extract_token(buf, SMTP_RECP, i, '\n');
char nowstamp[256];
if (strlen(SMTP->from) == 0) {
- cprintf("503 Need MAIL command first.\n");
+ cprintf("503 Need MAIL command first.\r\n");
return;
}
if (SMTP->number_of_recipients < 1) {
- cprintf("503 Need RCPT command first.\n");
+ cprintf("503 Need RCPT command first.\r\n");
return;
}
- cprintf("354 Transmit message now; terminate with '.' by itself\n");
+ cprintf("354 Transmit message now; terminate with '.' by itself\r\n");
generate_rfc822_datestamp(nowstamp, time(NULL));
body = mallok(4096);
+
if (body != NULL) sprintf(body,
"Received: from %s\n"
" by %s;\n"
" %s\n",
- "FIX.FIX.com",
+ SMTP->helo_node,
config.c_fqdn,
nowstamp);
body = CtdlReadMessageBody(".", config.c_maxmsglen, body);
if (body == NULL) {
- cprintf("550 Unable to save message text: internal error.\n");
+ cprintf("550 Unable to save message text: internal error.\r\n");
return;
}
CtdlFreeMessage(msg);
if (!retval) {
- cprintf("250 Message accepted for delivery.\n");
+ cprintf("250 Message accepted for delivery.\r\n");
}
else {
- cprintf("550 Internal delivery errors: %d\n", retval);
+ cprintf("550 Internal delivery errors: %d\r\n", retval);
}
}
}
else if (!strncasecmp(cmdbuf, "NOOP", 4)) {
- cprintf("250 This command successfully did nothing.\n");
+ cprintf("250 This command successfully did nothing.\r\n");
}
else if (!strncasecmp(cmdbuf, "QUIT", 4)) {
- cprintf("221 Goodbye...\n");
+ cprintf("221 Goodbye...\r\n");
CC->kill_me = 1;
return;
}
}
else {
- cprintf("502 I'm sorry Dave, I'm afraid I can't do that.\n");
+ cprintf("502 I'm sorry Dave, I'm afraid I can't do that.\r\n");
+ }
+
+}
+
+
+
+
+/*****************************************************************************/
+/* SMTP CLIENT (OUTBOUND PROCESSING) STUFF */
+/*****************************************************************************/
+
+
+
+/*
+ * smtp_try()
+ *
+ * Called by smtp_do_procmsg() to attempt delivery to one SMTP host
+ *
+ */
+void smtp_try(char *key, char *addr, int *status, char *dsn, long msgnum)
+{
+ char buf[256];
+ int sock = (-1);
+ char mxhosts[1024];
+ int num_mxhosts;
+ int mx;
+ char user[256], node[256], name[256];
+
+ /* Parse out the host portion of the recipient address */
+ process_rfc822_addr(addr, user, node, name);
+ lprintf(9, "Attempting SMTP delivery to <%s> @ <%s> (%s)\n",
+ user, node, name);
+
+ num_mxhosts = getmx(mxhosts, node);
+ lprintf(9, "Number of MX hosts for <%s> is %d\n", node, num_mxhosts);
+ if (num_mxhosts < 1) {
+ *status = 5;
+ sprintf(dsn, "No MX hosts found for <%s>", node);
+ return;
+ }
+
+ for (mx=0; mx<num_mxhosts; ++mx) {
+ extract(buf, mxhosts, mx);
+ lprintf(9, "Trying <%s>\n", buf);
+ sock = sock_connect(buf, "25", "tcp");
+ sprintf(dsn, "Could not connect: %s", strerror(errno));
+ if (sock >= 0) lprintf(9, "Connected!\n");
+ if (sock < 0) sprintf(dsn, "%s", strerror(errno));
+ if (sock >= 0) break;
+ }
+
+ if (sock < 0) {
+ *status = 4; /* dsn is already filled in */
+ return;
+ }
+
+ /* Process the SMTP greeting from the server */
+ if (sock_gets(sock, buf) < 0) {
+ *status = 4;
+ strcpy(dsn, "Connection broken during SMTP conversation");
+ sock_close(sock);
+ return;
+ }
+ lprintf(9, "%s\n", buf);
+ if (buf[0] != '2') {
+ if (buf[0] == '4') {
+ *status = 4;
+ strcpy(dsn, &buf[4]);
+ sock_close(sock);
+ return;
+ }
+ else {
+ *status = 5;
+ strcpy(dsn, &buf[4]);
+ sock_close(sock);
+ return;
+ }
+ }
+
+ /* At this point we know we are talking to a real SMTP server */
+
+ /* Do a HELO command */
+ sprintf(buf, "HELO %s", config.c_fqdn);
+ sock_puts(sock, buf);
+ if (sock_gets(sock, buf) < 0) {
+ *status = 4;
+ strcpy(dsn, "Connection broken during SMTP conversation");
+ sock_close(sock);
+ return;
+ }
+ lprintf(9, "%s\n", buf);
+ if (buf[0] != '2') {
+ if (buf[0] == '4') {
+ *status = 4;
+ strcpy(dsn, &buf[4]);
+ sock_close(sock);
+ return;
+ }
+ else {
+ *status = 5;
+ strcpy(dsn, &buf[4]);
+ sock_close(sock);
+ return;
+ }
+ }
+
+
+ /* HELO succeeded, now try the MAIL From: command */
+ sprintf(buf, "MAIL From: FIX@uncnsrd.mt-kisco.ny.us"); /* FIX */
+ sock_puts(sock, buf);
+ if (sock_gets(sock, buf) < 0) {
+ *status = 4;
+ strcpy(dsn, "Connection broken during SMTP conversation");
+ sock_close(sock);
+ return;
+ }
+ lprintf(9, "%s\n", buf);
+ if (buf[0] != '2') {
+ if (buf[0] == '4') {
+ *status = 4;
+ strcpy(dsn, &buf[4]);
+ sock_close(sock);
+ return;
+ }
+ else {
+ *status = 5;
+ strcpy(dsn, &buf[4]);
+ sock_close(sock);
+ return;
+ }
+ }
+
+
+ /* MAIL succeeded, now try the RCPT To: command */
+ sprintf(buf, "RCPT To: %s", addr);
+ sock_puts(sock, buf);
+ if (sock_gets(sock, buf) < 0) {
+ *status = 4;
+ strcpy(dsn, "Connection broken during SMTP conversation");
+ sock_close(sock);
+ return;
+ }
+ lprintf(9, "%s\n", buf);
+ if (buf[0] != '2') {
+ if (buf[0] == '4') {
+ *status = 4;
+ strcpy(dsn, &buf[4]);
+ sock_close(sock);
+ return;
+ }
+ else {
+ *status = 5;
+ strcpy(dsn, &buf[4]);
+ sock_close(sock);
+ return;
+ }
+ }
+
+
+ /* RCPT succeeded, now try the DATA command */
+ sock_puts(sock, "DATA");
+ if (sock_gets(sock, buf) < 0) {
+ *status = 4;
+ strcpy(dsn, "Connection broken during SMTP conversation");
+ sock_close(sock);
+ return;
+ }
+ lprintf(9, "%s\n", buf);
+ if (buf[0] != '3') {
+ if (buf[0] == '4') {
+ *status = 3;
+ strcpy(dsn, &buf[4]);
+ sock_close(sock);
+ return;
+ }
+ else {
+ *status = 5;
+ strcpy(dsn, &buf[4]);
+ sock_close(sock);
+ return;
+ }
+ }
+
+ /* If we reach this point, the server is expecting data */
+ CtdlOutputMsg(msgnum, MT_RFC822, 0, 0, NULL, sock, 1);
+ sock_puts(sock, ".");
+ if (sock_gets(sock, buf) < 0) {
+ *status = 4;
+ strcpy(dsn, "Connection broken during SMTP conversation");
+ sock_close(sock);
+ return;
+ }
+ lprintf(9, "%s\n", buf);
+ if (buf[0] != '2') {
+ if (buf[0] == '4') {
+ *status = 4;
+ strcpy(dsn, &buf[4]);
+ sock_close(sock);
+ return;
+ }
+ else {
+ *status = 5;
+ strcpy(dsn, &buf[4]);
+ sock_close(sock);
+ return;
+ }
+ }
+
+ /* We did it! */
+ strcpy(dsn, &buf[4]);
+ *status = 2;
+
+ sock_puts(sock, "QUIT");
+ sock_gets(sock, buf);
+ lprintf(9, "%s\n", buf);
+ sock_close(sock);
+}
+
+
+
+
+/*
+ * smtp_do_procmsg()
+ *
+ * Called by smtp_do_queue() to handle an individual message.
+ */
+void smtp_do_procmsg(long msgnum) {
+ struct CtdlMessage *msg;
+ char *instr = NULL;
+ char *results = NULL;
+ int i;
+ int lines;
+ int status;
+ char buf[1024];
+ char key[1024];
+ char addr[1024];
+ char dsn[1024];
+ long text_msgid = (-1);
+
+ msg = CtdlFetchMessage(msgnum);
+ if (msg == NULL) {
+ lprintf(3, "SMTP: tried %ld but no such message!\n", msgnum);
+ return;
+ }
+
+ instr = strdoop(msg->cm_fields['M']);
+ CtdlFreeMessage(msg);
+
+ /* Strip out the headers amd any other non-instruction line */
+ lines = num_tokens(instr, '\n');
+ for (i=0; i<lines; ++i) {
+ extract_token(buf, instr, i, '\n');
+ if (num_tokens(buf, '|') < 2) {
+ lprintf(9, "removing <%s>\n", buf);
+ remove_token(instr, i, '\n');
+ --lines;
+ --i;
+ }
+ }
+
+ /* Learn the message ID */
+ lines = num_tokens(instr, '\n');
+ for (i=0; i<lines; ++i) {
+ extract_token(buf, instr, i, '\n');
+ extract(key, buf, 0);
+ if (!strcasecmp(key, "msgid")) {
+ text_msgid = extract_long(buf, 1);
+ }
+ }
+
+ if (text_msgid < 0L) {
+ lprintf(3, "SMTP: no 'msgid' directive found!\n");
+ phree(instr);
+ return;
+ }
+
+ /* Plow through the instructions looking for 'remote' directives and
+ * a status of 0 (no delivery yet attempted) or 3 (transient errors
+ * were experienced and it's time to try again)
+ */
+ lines = num_tokens(instr, '\n');
+ for (i=0; i<lines; ++i) {
+ extract_token(buf, instr, i, '\n');
+ extract(key, buf, 0);
+ extract(addr, buf, 1);
+ status = extract_int(buf, 2);
+ extract(dsn, buf, 3);
+ if ( (!strcasecmp(key, "remote"))
+ && ((status==0)||(status==3)) ) {
+ remove_token(instr, i, '\n');
+ --i;
+ --lines;
+ lprintf(9, "SMTP: Trying <%s>\n", addr);
+ smtp_try(key, addr, &status, dsn, text_msgid);
+ if (status != 2) {
+ if (results == NULL) {
+ results = mallok(1024);
+ memset(results, 0, 1024);
+ }
+ else {
+ results = reallok(results,
+ strlen(results) + 1024);
+ }
+ sprintf(&results[strlen(results)],
+ "%s|%s|%d|%s\n",
+ key, addr, status, dsn);
+ }
+ }
+ }
+
+ if (results != NULL) {
+ instr = reallok(instr, strlen(instr) + strlen(results) + 2);
+ strcat(instr, results);
+ phree(results);
+ }
+
+ /* Delete the instructions and replace with the updated ones */
+ CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, msgnum, NULL);
+ msg = mallok(sizeof(struct CtdlMessage));
+ memset(msg, 0, sizeof(struct CtdlMessage));
+ msg->cm_magic = CTDLMESSAGE_MAGIC;
+ msg->cm_anon_type = MES_NORMAL;
+ msg->cm_format_type = FMT_RFC822;
+ msg->cm_fields['M'] = malloc(strlen(instr)+256);
+ sprintf(msg->cm_fields['M'],
+ "Content-type: %s\n\n%s\n", SPOOLMIME, instr);
+ phree(instr);
+ CtdlSaveMsg(msg, "", SMTP_SPOOLOUT_ROOM, MES_LOCAL, 1);
+ CtdlFreeMessage(msg);
+}
+
+
+
+/*
+ * smtp_do_queue()
+ *
+ * Run through the queue sending out messages.
+ */
+void smtp_do_queue(void) {
+ lprintf(5, "SMTP: processing outbound queue\n");
+
+ if (getroom(&CC->quickroom, SMTP_SPOOLOUT_ROOM) != 0) {
+ lprintf(3, "Cannot find room <%s>\n", SMTP_SPOOLOUT_ROOM);
+ return;
}
+ CtdlForEachMessage(MSGS_ALL, 0L, SPOOLMIME, NULL, smtp_do_procmsg);
+ lprintf(5, "SMTP: queue run completed\n");
}
+/**** FIX temporary hack to run the queue *****/
+void cmd_qqqq(char *argbuf) {
+ smtp_do_queue();
+ cprintf("%d ok\n", OK);
+}
+
+
+
+/*****************************************************************************/
+/* MODULE INITIALIZATION STUFF */
+/*****************************************************************************/
+
+
char *Dynamic_Module_Init(void)
{
SYM_SMTP = CtdlGetDynamicSymbol();
CtdlRegisterServiceHook(SMTP_PORT,
smtp_greeting,
smtp_command_loop);
+
+ /**** FIX ... temporary hack to run the queue ******/
+ CtdlRegisterProtoHook(cmd_qqqq, "QQQQ", "run the queue");
+
create_room(SMTP_SPOOLOUT_ROOM, 3, "", 0);
return "$Id$";
}
projects / citadel.git / blobdiff