X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/af2971700a5d9fbc9f68c4afca5ba6567e800260..81299194c0afb9c87fbde2970cc0bd8304b8df70:/mts/smtp/smtp.c?ds=sidebyside

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 65de0a7f..a29ca695 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -90,13 +90,15 @@ static int sm_verbose = 0;
 static FILE *sm_rfp = NULL;
 static FILE *sm_wfp = NULL;
 
+static int next_line_encoded = 0;
+
 #ifdef CYRUS_SASL
 /*
  * Some globals needed by SASL
  */
 
 static sasl_conn_t *conn = NULL;	/* SASL connection state */
-static int sasl_complete = 0;		/* Has authentication succeded? */
+static int sasl_complete = 0;		/* Has authentication succeeded? */
 static sasl_ssf_t sasl_ssf;		/* Our security strength factor */
 static int maxoutbuf;			/* Maximum crypto output buffer */
 static char *sasl_outbuffer;		/* SASL output buffer for encryption */
@@ -168,6 +170,7 @@ static int sm_rrecord (char *, int *);
 static int sm_rerror (int);
 static void alrmser (int);
 static char *EHLOset (char *);
+static char *prepare_for_display (const char *, int *);
 static int sm_fwrite(char *, int);
 static int sm_fputs(char *);
 static int sm_fputc(int);
@@ -1169,11 +1172,15 @@ smtalk (int time, char *fmt, ...)
     }
 
     if (sm_debug) {
+	char *decoded_buffer =
+            prepare_for_display (buffer, &next_line_encoded);
+
 	if (sasl_ssf)
 		printf("(sasl-encrypted) ");
 	if (tls_active)
 		printf("(tls-encrypted) ");
-	printf ("=> %s\n", buffer);
+	printf ("=> %s\n", decoded_buffer);
+	free (decoded_buffer);
 	fflush (stdout);
     }
 
@@ -1223,7 +1230,7 @@ sm_wstream (char *buffer, int len)
 	return (ferror (sm_wfp) ? sm_werror () : OK);
     }
 
-    for (bp = buffer; len > 0; bp++, len--) {
+    for (bp = buffer; bp && len > 0; bp++, len--) {
 	switch (*bp) {
 	    case '\n': 
 		sm_nl = TRUE;
@@ -1272,7 +1279,9 @@ sm_fwrite(char *buffer, int len)
 	    }
 	} else
 #endif /* TLS_SUPPORT */
-	fwrite(buffer, sizeof(*buffer), len, sm_wfp);
+	if ((int) fwrite(buffer, sizeof(*buffer), len, sm_wfp) < len) {
+	    advise ("sm_fwrite", "fwrite");
+	}
 #ifdef CYRUS_SASL
     } else {
 	while (len >= maxoutbuf - sasl_outbuflen) {
@@ -1288,7 +1297,10 @@ sm_fwrite(char *buffer, int len)
 		return NOTOK;
 	    }
 
-	    fwrite(output, sizeof(*output), outputlen, sm_wfp);
+	    if (fwrite(output, sizeof(*output), outputlen, sm_wfp) <
+		outputlen) {
+		advise ("sm_fwrite", "fwrite");
+	    }
 	}
 
 	if (len > 0) {
@@ -1397,7 +1409,7 @@ tls_negotiate(void)
 #endif /* TLS_SUPPORT */
 
 /*
- * Convenience functions to replace occurences of fputs() and fputc()
+ * Convenience functions to replace occurrences of fputs() and fputc()
  */
 
 static int
@@ -1435,7 +1447,9 @@ sm_fflush(void)
 	    return;
 	}
 
-	fwrite(output, sizeof(*output), outputlen, sm_wfp);
+	if (fwrite(output, sizeof(*output), outputlen, sm_wfp) < outputlen) {
+	    advise ("sm_fflush", "fwrite");
+	}
 	sasl_outbuflen = 0;
     }
 #endif /* CYRUS_SASL */
@@ -1467,7 +1481,7 @@ smhear (void)
     int i, code, cont, bc = 0, rc, more;
     unsigned char *bp;
     char *rp;
-    char **ehlo = NULL, buffer[BUFSIZ];
+    char **ehlo = EHLOkeys, buffer[BUFSIZ];
 
     if (doingEHLO) {
 	static int at_least_once = 0;
@@ -1497,11 +1511,15 @@ again: ;
     for (more = FALSE; sm_rrecord ((char *) (bp = (unsigned char *) buffer),
 				   &bc) != NOTOK ; ) {
 	if (sm_debug) {
+	    char *decoded_buffer =
+                prepare_for_display (buffer, &next_line_encoded);
+
 	    if (sasl_ssf > 0)
 		printf("(sasl-decrypted) ");
 	    if (tls_active)
 		printf("(tls-decrypted) ");
-	    printf ("<= %s\n", buffer);
+	    printf ("<= %s\n", decoded_buffer);
+	    free (decoded_buffer);
 	    fflush (stdout);
 	}
 
@@ -1843,3 +1861,69 @@ EHLOset (char *s)
 
     return 0;
 }
+
+
+/*
+ * Detects, using heuristics, if an SMTP server or client response string
+ * contains a base64-encoded portion.  If it does, decodes it and replaces
+ * any non-printable characters with a hex representation.  Caller is
+ * responsible for free'ing return value.  If the decode fails, a copy of
+ * the input string is returned.
+ */
+static
+char *
+prepare_for_display (const char *string, int *next_line_encoded) {
+    const char *start = NULL;
+    const char *decoded;
+    size_t decoded_len;
+    int prefix_len = -1;
+
+    if (strncmp (string, "AUTH ", 5) == 0) {
+        /* AUTH line:  the mechanism isn't encoded.  If there's an initial
+           response, it must be base64 encoded.. */
+        char *mechanism = strchr (string + 5, ' ');
+
+        if (mechanism != NULL) {
+            prefix_len = (int) (mechanism - string + 1);
+        } /* else no space following the mechanism, so no initial response */
+        *next_line_encoded = 0;
+    } else if (strncmp (string, "334 ", 4) == 0) {
+        /* 334 is the server's request for user or password. */
+        prefix_len = 4;
+        /* The next (client response) line must be base64 encoded. */
+        *next_line_encoded = 1;
+    } else if (*next_line_encoded) {
+        /* "next" line now refers to this line, which is a base64-encoded
+           client response. */
+        prefix_len = 0;
+        *next_line_encoded = 0;
+    } else {
+        *next_line_encoded = 0;
+    }
+
+    /* Don't attempt to decoded unencoded initial response ('=') or cancel
+       response ('*'). */
+    if (prefix_len > -1  &&
+        string[prefix_len] != '='  &&  string[prefix_len] != '*') {
+        start = string + prefix_len;
+    }
+
+    if (start  &&  decodeBase64 (start, &decoded, &decoded_len, 1, NULL) == OK) {
+        char *hexified;
+        char *prefix = mh_xmalloc(prefix_len + 1);
+        char *display_string;
+
+        /* prefix is the beginning portion, which isn't base64 encoded. */
+        snprintf (prefix, prefix_len + 1, "%*s", prefix_len, string);
+        hexify ((const unsigned char *) decoded, decoded_len, &hexified);
+        /* Wrap the decoded portion in "b64<>". */
+        display_string = concat (prefix, "b64<", hexified, ">", NULL);
+        free (hexified);
+        free (prefix);
+        free ((char *) decoded);
+
+        return display_string;
+    } else {
+        return getcpy (string);
+    }
+}