/*
- * $Id$
- *
* This module is an SMTP and ESMTP implementation for the Citadel system.
* It is compliant with all of the following:
*
#include "config.h"
#include "control.h"
#include "user_ops.h"
-#include "policy.h"
#include "database.h"
#include "msgbase.h"
#include "internet_addressing.h"
*/
void smtp_get_pass(char *argbuf) {
char password[SIZ];
+ long len;
memset(password, 0, sizeof(password));
- CtdlDecodeBase64(password, argbuf, SIZ);
+ len = CtdlDecodeBase64(password, argbuf, SIZ);
/* CtdlLogPrintf(CTDL_DEBUG, "Trying <%s>\n", password); */
- if (CtdlTryPassword(password) == pass_ok) {
+ if (CtdlTryPassword(password, len) == pass_ok) {
smtp_auth_greeting();
}
else {
char user[256];
char pass[256];
int result;
+ long len;
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);
+ len = safestrncpy(pass, &decoded_authstring[strlen(ident) + strlen(user) + 2], sizeof pass);
+ if (len == -1)
+ len = sizeof(pass) - 1;
SMTP->command_state = smtp_command;
}
if (result == login_ok) {
- if (CtdlTryPassword(pass) == pass_ok) {
+ if (CtdlTryPassword(pass, len) == pass_ok) {
smtp_auth_greeting();
return;
}
char mx_port[256];
int lp, rp;
char *msgtext;
- char *ptr;
+ const char *ptr;
size_t msg_size;
int scan_done;
+ CitContext *CCC=CC;
/* Parse out the host portion of the recipient address */
user, node, name);
/* Load the message out of the database */
- CC->redirect_buffer = malloc(SIZ);
- CC->redirect_len = 0;
- CC->redirect_alloc = SIZ;
- CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL, ESC_DOT);
- msgtext = CC->redirect_buffer;
- msg_size = CC->redirect_len;
- CC->redirect_buffer = NULL;
- CC->redirect_len = 0;
- CC->redirect_alloc = 0;
+ CCC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
+ CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL, (ESC_DOT|SUPPRESS_ENV_TO) );
+ msg_size = StrLength(CC->redirect_buffer);
+ msgtext = SmashStrBuf(&CC->redirect_buffer);
/* If no envelope_from is supplied, extract one from the message */
if ( (envelope_from == NULL) || (IsEmptyStr(envelope_from)) ) {
scan_done = 0;
ptr = msgtext;
do {
- if (ptr = memreadline(ptr, buf, sizeof buf), *ptr == 0) {
+ if (ptr = cmemreadline(ptr, buf, sizeof buf), *ptr == 0) {
scan_done = 1;
}
if (!strncasecmp(buf, "From:", 5)) {
strcpy(mx_port, "25");
}
CtdlLogPrintf(CTDL_DEBUG, "SMTP client: connecting to %s : %s ...\n", mx_host, mx_port);
- sock = sock_connect(mx_host, mx_port, "tcp");
+ sock = sock_connect(mx_host, mx_port);
snprintf(dsn, SIZ, "Could not connect: %s", strerror(errno));
if (sock >= 0) CtdlLogPrintf(CTDL_DEBUG, "SMTP client: connected!\n");
if (sock < 0) {
return;
}
+ CCC->sReadBuf = NewStrBuf();
+ CCC->sMigrateBuf = NewStrBuf();
+ CCC->sPos = NULL;
+
/* Process the SMTP greeting from the server */
if (ml_sock_gets(&sock, buf) < 0) {
*status = 4;
user, node, name);
bail: free(msgtext);
+ FreeStrBuf(&CCC->sReadBuf);
+ FreeStrBuf(&CCC->sMigrateBuf);
if (sock != -1)
sock_close(sock);
char addr[1024];
char dsn[1024];
char bounceto[1024];
- char boundary[64];
+ StrBuf *boundary;
int num_bounces = 0;
int bounce_this = 0;
long bounce_msgid = (-1);
struct recptypes *valid;
int successful_bounce = 0;
static int seq = 0;
- char *omsgtext;
- size_t omsgsize;
+ StrBuf *BounceMB;
long omsgid = (-1);
CtdlLogPrintf(CTDL_DEBUG, "smtp_do_bounce() called\n");
strcpy(bounceto, "");
- sprintf(boundary, "=_Citadel_Multipart_%s_%04x%04x", config.c_fqdn, getpid(), ++seq);
+ boundary = NewStrBufPlain(HKEY("=_Citadel_Multipart_"));
+ StrBufAppendPrintf(boundary, "%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 */
bmsg = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage));
if (bmsg == NULL) return;
memset(bmsg, 0, sizeof(struct CtdlMessage));
+ BounceMB = NewStrBufPlain(NULL, 1024);
bmsg->cm_magic = CTDLMESSAGE_MAGIC;
bmsg->cm_anon_type = MES_NORMAL;
bmsg->cm_fields['O'] = strdup(MAILROOM);
bmsg->cm_fields['N'] = strdup(config.c_nodename);
bmsg->cm_fields['U'] = strdup("Delivery Status Notification (Failure)");
- 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'],
+ StrBufAppendBufPlain(BounceMB, HKEY("Content-type: multipart/mixed; boundary=\""), 0);
+ StrBufAppendBuf(BounceMB, boundary, 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("\"\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("MIME-Version: 1.0\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("X-Mailer: " CITADEL "\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("\r\nThis is a multipart message in MIME format.\r\n\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("--"), 0);
+ StrBufAppendBuf(BounceMB, boundary, 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("Content-type: text/plain\r\n\r\n"), 0);
+
+ if (give_up) StrBufAppendBufPlain(BounceMB, HKEY(
"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"
-);
+ ), 0);
- else strcat(bmsg->cm_fields['M'],
+ else StrBufAppendBufPlain(BounceMB, HKEY(
"A message you sent could not be delivered to some or all of its recipients.\n"
"The following addresses were undeliverable:\n\n"
-);
+ ), 0);
/*
* Now go through the instructions checking for stuff.
*/
for (i=0; i<lines; ++i) {
+ long addrlen;
+ long dsnlen;
extract_token(buf, instr, i, '\n', sizeof buf);
extract_token(key, buf, 0, '|', sizeof key);
- extract_token(addr, buf, 1, '|', sizeof addr);
+ addrlen = extract_token(addr, buf, 1, '|', sizeof addr);
status = extract_int(buf, 2);
- extract_token(dsn, buf, 3, '|', sizeof dsn);
+ dsnlen = extract_token(dsn, buf, 3, '|', sizeof dsn);
bounce_this = 0;
CtdlLogPrintf(CTDL_DEBUG, "key=<%s> addr=<%s> status=%d dsn=<%s>\n",
if (bounce_this) {
++num_bounces;
- if (bmsg->cm_fields['M'] == NULL) {
- CtdlLogPrintf(CTDL_ERR, "ERROR ... M field is null "
- "(%s:%d)\n", __FILE__, __LINE__);
- }
-
- bmsg->cm_fields['M'] = realloc(bmsg->cm_fields['M'],
- strlen(bmsg->cm_fields['M']) + 1024 );
- strcat(bmsg->cm_fields['M'], addr);
- strcat(bmsg->cm_fields['M'], ": ");
- strcat(bmsg->cm_fields['M'], dsn);
- strcat(bmsg->cm_fields['M'], "\r\n");
+ StrBufAppendBufPlain(BounceMB, addr, addrlen, 0);
+ StrBufAppendBufPlain(BounceMB, HKEY(": "), 0);
+ StrBufAppendBufPlain(BounceMB, dsn, dsnlen, 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("\r\n"), 0);
remove_token(instr, i, '\n');
--i;
/* 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");
+ StrBufAppendBufPlain(BounceMB, HKEY("--"), 0);
+ StrBufAppendBuf(BounceMB, boundary, 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("Content-type: message/rfc822\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("Content-Transfer-Encoding: 7bit\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("Content-Disposition: inline\r\n"), 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("\r\n"), 0);
- CC->redirect_buffer = malloc(SIZ);
- CC->redirect_len = 0;
- CC->redirect_alloc = SIZ;
+ CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
CtdlOutputMsg(omsgid, MT_RFC822, HEADERS_ALL, 0, 1, NULL, 0);
- 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);
+ StrBufAppendBuf(BounceMB, CC->redirect_buffer, 0);
+ FreeStrBuf(&CC->redirect_buffer);
}
/* Close the multipart MIME scope */
- strcat(bmsg->cm_fields['M'], "--");
- strcat(bmsg->cm_fields['M'], boundary);
- strcat(bmsg->cm_fields['M'], "--\r\n");
-
+ StrBufAppendBufPlain(BounceMB, HKEY("--"), 0);
+ StrBufAppendBuf(BounceMB, boundary, 0);
+ StrBufAppendBufPlain(BounceMB, HKEY("--\r\n"), 0);
+ bmsg->cm_fields['A'] = SmashStrBuf(&BounceMB);
/* Deliver the bounce if there's anything worth mentioning */
CtdlLogPrintf(CTDL_DEBUG, "num_bounces = %d\n", num_bounces);
if (num_bounces > 0) {
free_recipients(valid);
}
}
-
+ FreeStrBuf(&boundary);
CtdlFreeMessage(bmsg);
CtdlLogPrintf(CTDL_DEBUG, "Done processing bounces\n");
}
int num_processed = 0;
struct CitContext smtp_queue_CC;
- CtdlLogPrintf(CTDL_INFO, "SMTP client: processing outbound queue\n");
-
CtdlFillSystemContext(&smtp_queue_CC, "SMTP Send");
citthread_setspecific(MyConKey, (void *)&smtp_queue_CC );
+ CtdlLogPrintf(CTDL_INFO, "SMTP client: processing outbound queue\n");
if (CtdlGetRoom(&CC->room, SMTP_SPOOLOUT_ROOM) != 0) {
CtdlLogPrintf(CTDL_ERR, "Cannot find room <%s>\n", SMTP_SPOOLOUT_ROOM);
citthread_mutex_unlock (&smtp_send_lock);
CtdlLogPrintf(CTDL_INFO, "SMTP client: queue run completed; %d messages processed\n", num_processed);
+
+ CtdlClearSystemContext();
return(NULL);
}
}
/* return our Subversion id for the Log */
- return "$Id$";
+ return "smtp";
}
projects / citadel.git / blobdiff