X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtp.c;h=4abb0a3fe0694c68f276a5d15f90b02444692625;hb=d4cb5c8734129f39c1e79f3a93d9cfc7db5ae058;hp=9ac94212a52f5f43ab2563c0de3ed0ff571da649;hpb=158e8958500476d1115c7b70f6c81a87bb0ade47;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index 9ac94212a..4abb0a3fe 100644
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -394,12 +394,12 @@ void smtp_help(long offset, long Flags) {
 void smtp_get_user(long offset)
 {
 	char buf[SIZ];
-	char username[SIZ];
 	citsmtp *sSMTP = SMTP;
 
-	CtdlDecodeBase64(username, ChrPtr(sSMTP->Cmd) + offset, SIZ);
+	StrBufDecodeBase64(sSMTP->Cmd);
+
 	/* syslog(LOG_DEBUG, "Trying <%s>\n", username); */
-	if (CtdlLoginExistingUser(NULL, username) == login_ok) {
+	if (CtdlLoginExistingUser(NULL, ChrPtr(sSMTP->Cmd)) == login_ok) {
 		CtdlEncodeBase64(buf, "Password:", 9, 0);
 		cprintf("334 %s\r\n", buf);
 		sSMTP->command_state = smtp_password;
@@ -418,12 +418,11 @@ void smtp_get_pass(long offset, long Flags)
 {
 	citsmtp *sSMTP = SMTP;
 	char password[SIZ];
-	long len;
 
-	memset(password, 0, sizeof(password));	
-	len = CtdlDecodeBase64(password, ChrPtr(sSMTP->Cmd), SIZ);
+	memset(password, 0, sizeof(password));
+	StrBufDecodeBase64(sSMTP->Cmd);
 	/* syslog(LOG_DEBUG, "Trying <%s>\n", password); */
-	if (CtdlTryPassword(password, len) == pass_ok) {
+	if (CtdlTryPassword(SKEY(sSMTP->Cmd)) == pass_ok) {
 		smtp_auth_greeting(offset, Flags);
 	}
 	else {
@@ -439,19 +438,44 @@ void smtp_get_pass(long offset, long Flags)
 void smtp_try_plain(long offset, long Flags)
 {
 	citsmtp *sSMTP = SMTP;
-	char decoded_authstring[1024];
-	char ident[256];
-	char user[256];
-	char pass[256];
+	const char*decoded_authstring;
+	char ident[256] = "";
+	char user[256] = "";
+	char pass[256] = "";
 	int result;
-	long len;
 
-	CtdlDecodeBase64(decoded_authstring, ChrPtr(sSMTP->Cmd), StrLength(sSMTP->Cmd));
-	safestrncpy(ident, decoded_authstring, sizeof ident);
-	safestrncpy(user, &decoded_authstring[strlen(ident) + 1], sizeof user);
-	len = safestrncpy(pass, &decoded_authstring[strlen(ident) + strlen(user) + 2], sizeof pass);
-	if (len == -1)
-		len = sizeof(pass) - 1;
+	long decoded_len;
+	long len = 0;
+	long plen = 0;
+
+	memset(pass, 0, sizeof(pass));
+	decoded_len = StrBufDecodeBase64(sSMTP->Cmd);
+
+	if (decoded_len > 0)
+	{
+		decoded_authstring = ChrPtr(sSMTP->Cmd);
+
+		len = safestrncpy(ident, decoded_authstring, sizeof ident);
+
+		decoded_len -= len - 1;
+		decoded_authstring += len + 1;
+
+		if (decoded_len > 0)
+		{
+			len = safestrncpy(user, decoded_authstring, sizeof user);
+
+			decoded_authstring += len + 1;
+			decoded_len -= len - 1;
+		}
+
+		if (decoded_len > 0)
+		{
+			plen = safestrncpy(pass, decoded_authstring, sizeof pass);
+
+			if (plen < 0)
+				plen = sizeof(pass) - 1;
+		}
+	}
 
 	sSMTP->command_state = smtp_command;
 
@@ -463,7 +487,7 @@ void smtp_try_plain(long offset, long Flags)
 	}
 
 	if (result == login_ok) {
-		if (CtdlTryPassword(pass, len) == pass_ok) {
+		if (CtdlTryPassword(pass, plen) == pass_ok) {
 			smtp_webcit_preferences_hack();
 			smtp_auth_greeting(offset, Flags);
 			return;
@@ -622,7 +646,7 @@ void smtp_mail(long offset, long flags) {
 	 * address so we don't have to contend with the empty string causing
 	 * other code to fail when it's expecting something there.
 	 */
-	if (StrLength(sSMTP->from)) {
+	if (StrLength(sSMTP->from) == 0) {
 		StrBufPlain(sSMTP->from, HKEY("someone@example.com"));
 	}
 
@@ -859,8 +883,8 @@ void smtp_data(long offset, long flags)
 			return;
 		}
 
-		CM_SetField(msg, eNodeName, config.c_nodename, strlen(config.c_nodename));
-		CM_SetField(msg, eHumanNode, config.c_humannode, strlen(config.c_humannode));
+		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));
@@ -975,6 +999,7 @@ void smtp_starttls(long offset, long flags)
  */
 void smtp_command_loop(void)
 {
+	static const ConstStr AuthPlainStr = {HKEY("AUTH PLAIN")};
 	struct CitContext *CCC = CC;
 	citsmtp *sSMTP = SMTP;
 	const char *pch, *pchs;
@@ -995,15 +1020,21 @@ void smtp_command_loop(void)
 	syslog(LOG_DEBUG, "SMTP server: %s\n", ChrPtr(sSMTP->Cmd));
 
 	if (sSMTP->command_state == smtp_user) {
-		smtp_get_user(0);
+		if (!strncmp(ChrPtr(sSMTP->Cmd), AuthPlainStr.Key, AuthPlainStr.len))
+			smtp_try_plain(0, 0);
+		else
+			smtp_get_user(0);
+		return;
 	}
 
 	else if (sSMTP->command_state == smtp_password) {
 		smtp_get_pass(0, 0);
+		return;
 	}
 
 	else if (sSMTP->command_state == smtp_plain) {
 		smtp_try_plain(0, 0);
+		return;
 	}
 
 	pchs = pch = ChrPtr(sSMTP->Cmd);