X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/174611d912b777c16d46d2085665cdc73bda12e2..052d7bfb0a9a541c6975c3ed679dd3ac9e5c0886:/uip/popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 466146c3..0d655b84 100644
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -1,5 +1,4 @@
-/*
- * popsbr.c -- POP client subroutines
+/* popsbr.c -- POP client subroutines
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -15,10 +14,8 @@
 #include <h/signals.h>
 
 #define	TRM	"."
-#define	TRMLEN	(sizeof TRM - 1)
 
 static int poprint = 0;
-static int pophack = 0;
 
 char response[BUFSIZ];
 static netsec_context *nsc = NULL;
@@ -134,8 +131,8 @@ parse_proxy(char *proxy, char *host)
 }
 
 int
-pop_init (char *host, char *port, char *user, char *pass, char *proxy,
-	  int snoop, int sasl, char *mech, int tls, const char *oauth_svc)
+pop_init (char *host, char *port, char *user, char *proxy, int snoop,
+	  int sasl, char *mech, int tls, const char *oauth_svc)
 {
     int fd1, fd2;
     char buffer[BUFSIZ];
@@ -146,6 +143,8 @@ pop_init (char *host, char *port, char *user, char *pass, char *proxy,
     if (user)
 	netsec_set_userid(nsc, user);
 
+    netsec_set_hostname(nsc, host);
+
     if (oauth_svc != NULL) {
 	if (netsec_set_oauth_service(nsc, oauth_svc) != OK) {
 	    snprintf(response, sizeof(response), "OAuth2 not supported");
@@ -213,8 +212,8 @@ pop_init (char *host, char *port, char *user, char *pass, char *proxy,
     netsec_set_fd(nsc, fd1, fd2);
     netsec_set_snoop(nsc, snoop);
 
-    if (tls) {
-	if (netsec_set_tls(nsc, 1, &errstr) != OK) {
+    if (tls & P_INITTLS) {
+	if (netsec_set_tls(nsc, 1, tls & P_NOVERIFY, &errstr) != OK) {
 	    snprintf(response, sizeof(response), "%s", errstr);
 	    free(errstr);
 	    return NOTOK;
@@ -228,8 +227,8 @@ pop_init (char *host, char *port, char *user, char *pass, char *proxy,
     }
 
     if (sasl) {
-	if (netsec_set_sasl_params(nsc, host, "pop", mech,
-				   pop_sasl_callback, &errstr) != OK) {
+	if (netsec_set_sasl_params(nsc, "pop", mech, pop_sasl_callback,
+				   &errstr) != OK) {
 	    snprintf(response, sizeof(response), "%s", errstr);
 	    free(errstr);
 	    return NOTOK;
@@ -241,6 +240,8 @@ pop_init (char *host, char *port, char *user, char *pass, char *proxy,
 	    if (poprint)
 		fprintf (stderr, "<--- %s\n", response);
 	    if (*response == '+') {
+                nmh_creds_t creds;
+
 		if (sasl) {
 		    char server_mechs[256];
 		    if (check_mech(server_mechs, sizeof(server_mechs)) != OK)
@@ -253,16 +254,24 @@ pop_init (char *host, char *port, char *user, char *pass, char *proxy,
 			return NOTOK;
 		    }
 		    return OK;
-		} else
-		if (command ("USER %s", user) != NOTOK
-		    && command ("%s %s", (pophack++, "PASS"),
-					pass) != NOTOK)
-		return OK;
+		}
+
+                if (!(creds = nmh_get_credentials(host, user)))
+                    return NOTOK;
+                if (command ("USER %s", nmh_cred_get_user(creds))
+                                                            != NOTOK) {
+                    if (command("PASS %s", nmh_cred_get_password(creds))
+                                                            != NOTOK) {
+                        nmh_credentials_free(creds);
+                        return OK;
+                    }
+                }
+                nmh_credentials_free(creds);
 	    }
 	    strncpy (buffer, response, sizeof(buffer));
 	    command ("QUIT");
 	    strncpy (response, buffer, sizeof(response));
-				/* and fall */
+	    /* FALLTHRU */
 
 	case NOTOK: 
 	case DONE: 
@@ -383,7 +392,7 @@ pop_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
 	    *outdata = NULL;
 	    *outdatalen = 0;
 	} else {
-	    rc = decodeBase64(line + 2, (const char **) outdata, &len, 0, NULL);
+	    rc = decodeBase64(line + 2, outdata, &len, 0, NULL);
 	    *outdatalen = len;
 	    if (rc != OK) {
 		netsec_err(errstr, "Unable to decode base64 response");
@@ -425,7 +434,7 @@ pop_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
 	if (line == NULL)
 	    return NOTOK;
 
-	if (strncmp(line, "+OK", 3) != 0) {
+	if (!has_prefix(line, "+OK")) {
 	    netsec_err(errstr, "Authentication failed: %s", line);
 	    return NOTOK;
 	}
@@ -533,7 +542,7 @@ pop_retr (int msgno, int (*action)(char *))
 static int
 traverse (int (*action)(char *), const char *fmt, ...)
 {
-    int result;
+    int result, snoopstate;
     va_list ap;
     char buffer[sizeof(response)];
 
@@ -545,13 +554,18 @@ traverse (int (*action)(char *), const char *fmt, ...)
 	return NOTOK;
     strncpy (buffer, response, sizeof(buffer));
 
+    if ((snoopstate = netsec_get_snoop(nsc)))
+	netsec_set_snoop(nsc, 0);
+
     for (;;)
 	switch (multiline ()) {
 	    case NOTOK: 
+		netsec_set_snoop(nsc, snoopstate);
 		return NOTOK;
 
 	    case DONE: 
 		strncpy (response, buffer, sizeof(response));
+		netsec_set_snoop(nsc, snoopstate);
 		return OK;
 
 	    case OK: 
@@ -672,15 +686,14 @@ vcommand (const char *fmt, va_list ap)
 int
 multiline (void)
 {
-    char buffer[BUFSIZ + TRMLEN];
+    char buffer[BUFSIZ + LEN(TRM)];
 
     if (pop_getline (buffer, sizeof buffer, nsc) != OK)
 	return NOTOK;
-    if (strncmp (buffer, TRM, TRMLEN) == 0) {
-	if (buffer[TRMLEN] == 0)
+    if (has_prefix(buffer, TRM)) {
+	if (buffer[LEN(TRM)] == 0)
 	    return DONE;
-	else
-	    strncpy (response, buffer + TRMLEN, sizeof(response));
+        strncpy (response, buffer + LEN(TRM), sizeof(response));
     }
     else
 	strncpy (response, buffer, sizeof(response));
@@ -717,11 +730,11 @@ pop_getline (char *s, int n, netsec_context *ns)
      *
      * We get a length back from netsec_readline, but the rest of the POP
      * code doesn't handle it; the assumptions are that everything from
-     * the network can be respresented as C strings.  That should get fixed
+     * the network can be represented as C strings.  That should get fixed
      * someday.
      */
 
-    destlen = len < ((size_t) (n - 1)) ? len : (size_t) (n - 1);
+    destlen = min(len, (size_t)(n - 1));
 
     memcpy(s, p, destlen);
     s[destlen] = '\0';