Remove MIME content caching code

[nmh] / uip / popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index bdd55c58c90f4f35bb10aca683604de57a64ec53..d61ce7678b1f1d8c6bced4544b286f3498fde1e4 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -1,107 +1,49 @@
-/*
- * 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
  * complete copyright information.
  */
 
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/utils.h>
-
-#ifdef CYRUS_SASL
-# include <sasl/sasl.h>
-# include <sasl/saslutil.h>
-# if SASL_VERSION_FULL < 0x020125
-    /* Cyrus SASL 2.1.25 introduced the sasl_callback_ft prototype,
-       which has an explicit void parameter list, according to best
-       practice.  So we need to cast to avoid compile warnings.
-       Provide this prototype for earlier versions. */
-    typedef int (*sasl_callback_ft)();
-# endif /* SASL_VERSION_FULL < 0x020125 */
-#endif /* CYRUS_SASL */
-
-#include <h/popsbr.h>
-#include <h/signals.h>
-#include <signal.h>
-#include <errno.h>
+#include "h/mh.h"
+#include "sbr/credentials.h"
+#include "sbr/client.h"
+#include "sbr/error.h"
+#include "h/utils.h"
+#include "h/oauth.h"
+#include "h/netsec.h"
+
+#include "popsbr.h"
+#include "h/signals.h"
+#include "sbr/base64.h"

 
 #define        TRM     "."
 
 #define        TRM     "."

-#define        TRMLEN  (sizeof TRM - 1)

 
 static int poprint = 0;
 
 static int poprint = 0;

-static int pophack = 0;

 
 char response[BUFSIZ];
 
 char response[BUFSIZ];

-
-static FILE *input;
-static FILE *output;
-
-#ifdef CYRUS_SASL
-static sasl_conn_t *conn;      /* SASL connection state */
-static int sasl_complete = 0;  /* Has sasl authentication succeeded? */
-static int maxoutbuf;          /* Maximum output buffer size */
-static sasl_ssf_t sasl_ssf = 0;        /* Security strength factor */
-static int sasl_get_user(void *, int, const char **, unsigned *);
-static int sasl_get_pass(sasl_conn_t *, void *, int, sasl_secret_t **);
-struct pass_context {
-    char *user;
-    char *password;
-    char *host;
-};
-
-static sasl_callback_t callbacks[] = {
-    { SASL_CB_USER, (sasl_callback_ft) sasl_get_user, NULL },
-#define POP_SASL_CB_N_USER 0
-    { SASL_CB_PASS, (sasl_callback_ft) sasl_get_pass, NULL },
-#define POP_SASL_CB_N_PASS 1
-    { SASL_CB_LOG, NULL, NULL },
-    { SASL_CB_LIST_END, NULL, NULL },
-
-#define SASL_BUFFER_SIZE 262144
-};
-#else /* CYRUS_SASL */
-# define sasl_fgetc fgetc
-#endif /* CYRUS_SASL */
+static netsec_context *nsc = NULL;

 
 /*
  * static prototypes
  */
 
 
 /*
  * static prototypes
  */
 

-static int command(const char *, ...);
+static int command(const char *, ...) CHECK_PRINTF(1, 2);

 static int multiline(void);
 
 static int multiline(void);
 

-#ifdef CYRUS_SASL
-static int pop_auth_sasl(char *, char *, char *, char *);
-static int sasl_fgetc(FILE *);
-#endif /* CYRUS_SASL */
-
-static int traverse (int (*)(char *), const char *, ...);
-static int vcommand(const char *, va_list);
-static int sasl_getline (char *, int, FILE *);
-static int putline (char *, FILE *);
-
+static int traverse(int (*)(void *, char *), void *closure,
+    const char *, ...) CHECK_PRINTF(3, 4);
+static int vcommand(const char *, va_list) CHECK_PRINTF(1, 0);
+static int pop_getline (char *, int, netsec_context *);
+static int pop_sasl_callback(enum sasl_message_type, unsigned const char *,
+                            unsigned int, unsigned char **, unsigned int *,
+                            void *, char **);

 
 

-#ifdef CYRUS_SASL
-/*
- * This function implements the AUTH command for various SASL mechanisms
- *
- * We do the whole SASL dialog here.  If this completes, then we've
- * authenticated successfully and have (possibly) negotiated a security
- * layer.
- */
-
-int
-pop_auth_sasl(char *user, char *password, char *host, char *mech)
+static int
+check_mech(char *server_mechs, size_t server_mechs_size)

 {
 {

-    int result, status, sasl_capability = 0;
-    unsigned int buflen, outlen;
-    char server_mechs[256], *buf, outbuf[BUFSIZ];
-    const char *chosen_mech;
-    sasl_security_properties_t secprops;
-    struct pass_context p_context;
-    sasl_ssf_t *ssf;
-    int *moutbuf;
+  int status;
+  bool sasl_capability = false;

 
     /*
      * First off, we're going to send the CAPA command to see if we can
 
     /*
      * First off, we're going to send the CAPA command to see if we can


@@ -118,23 +60,16 @@ pop_auth_sasl(char *user, char *password, char *host, char *mech)
        return NOTOK;
     }
 
        return NOTOK;
     }
 

-    while ((status = multiline()) != DONE)
-       switch (status) {
-       case NOTOK:
+    while ((status = multiline()) != DONE) {
+        if (status == NOTOK)

            return NOTOK;
            return NOTOK;

-           break;
-       case DONE:      /* Shouldn't be possible, but just in case */
-           break;
-       case OK:
-           if (strncasecmp(response, "SASL ", 5) == 0) {
-               /*
-                * We've seen the SASL capability.  Grab the mech list
-                */
-               sasl_capability++;
-               strncpy(server_mechs, response + 5, sizeof(server_mechs));
-           }
-           break;
-       }
+
+        if (strncasecmp(response, "SASL ", 5) == 0) {
+            /* We've seen the SASL capability.  Grab the mech list. */
+            sasl_capability = true;
+            strncpy(server_mechs, response + 5, server_mechs_size);
+        }
+    }

 
     if (!sasl_capability) {
        snprintf(response, sizeof(response), "POP server does not support "
 
     if (!sasl_capability) {
        snprintf(response, sizeof(response), "POP server does not support "


@@ -142,243 +77,67 @@ pop_auth_sasl(char *user, char *password, char *host, char *mech)
        return NOTOK;
     }
 
        return NOTOK;
     }
 

-    /*
-     * If we received a preferred mechanism, see if the server supports it.
-     */
-
-    if (mech && stringdex(mech, server_mechs) == -1) {
-       snprintf(response, sizeof(response), "Requested SASL mech \"%s\" is "
-                "not in list of supported mechanisms:\n%s",
-                mech, server_mechs);
-       return NOTOK;
-    }
-
-    /*
-     * Start the SASL process.  First off, initialize the SASL library.
-     */
-
-    callbacks[POP_SASL_CB_N_USER].context = user;
-    p_context.user = user;
-    p_context.host = host;
-    p_context.password = password;
-    callbacks[POP_SASL_CB_N_PASS].context = &p_context;
-
-    result = sasl_client_init(callbacks);
-
-    if (result != SASL_OK) {
-       snprintf(response, sizeof(response), "SASL library initialization "
-                "failed: %s", sasl_errstring(result, NULL, NULL));
-       return NOTOK;
-    }
-
-    result = sasl_client_new("pop", host, NULL, NULL, NULL, 0, &conn);
-
-    if (result != SASL_OK) {
-       snprintf(response, sizeof(response), "SASL client initialization "
-                "failed: %s", sasl_errstring(result, NULL, NULL));
-       return NOTOK;
-    }
-
-    /*
-     * Initialize the security properties
-     */
-
-    memset(&secprops, 0, sizeof(secprops));
-    secprops.maxbufsize = SASL_BUFFER_SIZE;
-    secprops.max_ssf = UINT_MAX;
+    return OK;
+}

 
 

-    result = sasl_setprop(conn, SASL_SEC_PROPS, &secprops);
+/*
+ * If capable, issue the STLS command and start the TLS negotiation
+ */

 
 

-    if (result != SASL_OK) {
-       snprintf(response, sizeof(response), "SASL security property "
-                "initialization failed: %s", sasl_errdetail(conn));
-       return NOTOK;
-    }
+static int
+pop_start_tls(void)
+{
+    int status;
+    bool stls = false;
+    char *errstr;

 
     /*
 
     /*

-     * Start the actual protocol.  Feed the mech list into the library
-     * and get out a possible initial challenge
+     * Issue the CAPA command and see if we have the STLS capability

      */
 
      */
 

-    result = sasl_client_start(conn,
-                              (const char *) (mech ? mech : server_mechs),
-                              NULL, (const char **) &buf,
-                              &buflen, &chosen_mech);
-
-    if (result != SASL_OK && result != SASL_CONTINUE) {
-       snprintf(response, sizeof(response), "SASL client start failed: %s",
-                sasl_errdetail(conn));
+    if (command("CAPA") == NOTOK) {
+       snprintf(response, sizeof(response),
+                "The POP CAPA command failed; POP server does not "
+                "support STLS");

        return NOTOK;
     }
 
        return NOTOK;
     }
 

-    if (buflen) {
-       status = sasl_encode64(buf, buflen, outbuf, sizeof(outbuf), NULL);
-       if (status != SASL_OK) {
-           snprintf(response, sizeof(response), "SASL base64 encode "
-                    "failed: %s", sasl_errstring(status, NULL, NULL));
-           return NOTOK;
-       }
-
-       status = command("AUTH %s %s", chosen_mech, outbuf);
-    } else
-       status = command("AUTH %s", chosen_mech);
-
-    while (result == SASL_CONTINUE) {
-       if (status == NOTOK)
-           return NOTOK;
-       
-       /*
-        * If we get a "+OK" prefix to our response, then we should
-        * exit out of this exchange now (because authenticated should
-        * have succeeded)
-        */
-       
-       if (strncmp(response, "+OK", 3) == 0)
-           break;
-       
-       /*
-        * Otherwise, make sure the server challenge is correctly formatted
-        */
-       
-       if (strncmp(response, "+ ", 2) != 0) {
-           command("*");
-           snprintf(response, sizeof(response),
-                    "Malformed authentication message from server");
-           return NOTOK;
-       }
-
-       result = sasl_decode64(response + 2, strlen(response + 2),
-                              outbuf, sizeof(outbuf), &outlen);
-       
-       if (result != SASL_OK) {
-           command("*");
-           snprintf(response, sizeof(response), "SASL base64 decode "
-                    "failed: %s", sasl_errstring(result, NULL, NULL));
+    while ((status = multiline()) != DONE) {
+        if (status == NOTOK)

            return NOTOK;
            return NOTOK;

-       }
-
-       result = sasl_client_step(conn, outbuf, outlen, NULL,
-                                 (const char **) &buf, &buflen);
-
-       if (result != SASL_OK && result != SASL_CONTINUE) {
-           command("*");
-           snprintf(response, sizeof(response), "SASL client negotiaton "
-                    "failed: %s", sasl_errdetail(conn));
-           return NOTOK;
-       }

 
 

-       status = sasl_encode64(buf, buflen, outbuf, sizeof(outbuf), NULL);
-
-       if (status != SASL_OK) {
-           command("*");
-           snprintf(response, sizeof(response), "SASL base64 encode "
-                    "failed: %s", sasl_errstring(status, NULL, NULL));
-           return NOTOK;
-       }
-
-       status = command(outbuf);
+       if (strcasecmp(response, "STLS") == 0)
+           stls = true;

     }
 
     }
 

-    /*
-     * If we didn't get a positive final response, then error out
-     * (that probably means we failed an authorization check).
-     */
-
-    if (status != OK)
+    if (!stls) {
+       snprintf(response, sizeof(response), "POP server does not support "
+                "STLS");

        return NOTOK;
        return NOTOK;

+    }

 
     /*
 
     /*

-     * We _should_ be okay now.  Get a few properties now that negotiation
-     * has completed.
+     * Issue STLS and then start the actual TLS negotiation

      */
 
      */
 

-    result = sasl_getprop(conn, SASL_MAXOUTBUF, (const void **) &moutbuf);
+    if (command("STLS") == NOTOK)
+       return NOTOK;

 
 

-    if (result != SASL_OK) {
-       snprintf(response, sizeof(response), "Cannot retrieve SASL negotiated "
-                "output buffer size: %s", sasl_errdetail(conn));
+    if (netsec_negotiate_tls(nsc, &errstr) != OK) {
+       snprintf(response, sizeof(response), "%s", errstr);
+       free(errstr);

        return NOTOK;
     }
 
        return NOTOK;
     }
 

-    maxoutbuf = *moutbuf;
-
-    result = sasl_getprop(conn, SASL_SSF, (const void **) &ssf);
-
-    sasl_ssf = *ssf;
-
-    if (result != SASL_OK) {
-       snprintf(response, sizeof(response), "Cannot retrieve SASL negotiated "
-                "security strength factor: %s", sasl_errdetail(conn));
-       return NOTOK;
-    }
-
-    /*
-     * Limit this to what we can deal with.  Shouldn't matter much because
-     * this is only outgoing data (which should be small)
-     */
-
-    if (maxoutbuf == 0 || maxoutbuf > BUFSIZ)
-       maxoutbuf = BUFSIZ;
-
-    sasl_complete = 1;
-
-    return status;
-}
-
-/*
- * Callback to return the userid sent down via the user parameter
- */
-
-static int
-sasl_get_user(void *context, int id, const char **result, unsigned *len)
-{
-    char *user = (char *) context;
-
-    if (! result || id != SASL_CB_USER)
-       return SASL_BADPARAM;
-
-    *result = user;
-    if (len)
-       *len = strlen(user);
-
-    return SASL_OK;
-}
-
-/*
- * Callback to return the password (we call ruserpass, which can get it
- * out of the .netrc
- */
-
-static int
-sasl_get_pass(sasl_conn_t *conn, void *context, int id, sasl_secret_t **psecret)
-{
-    struct pass_context *p_context = (struct pass_context *) context;
-    char *pass = p_context->password;
-    int len;
-
-    NMH_UNUSED (conn);
-
-    if (! psecret || id != SASL_CB_PASS)
-       return SASL_BADPARAM;
-
-    len = strlen(pass);
-
-    *psecret = (sasl_secret_t *) mh_xmalloc(sizeof(sasl_secret_t) + len);
-
-    (*psecret)->len = len;
-    strcpy((char *) (*psecret)->data, pass);
-
-    return SASL_OK;
+    return OK;

 }
 }

-#endif /* CYRUS_SASL */
-

 
 /*
  * Split string containing proxy command into an array of arguments
  * suitable for passing to exec. Returned array must be freed. Shouldn't
  * be possible to call this with host set to NULL.
  */
 
 /*
  * Split string containing proxy command into an array of arguments
  * suitable for passing to exec. Returned array must be freed. Shouldn't
  * be possible to call this with host set to NULL.
  */

-char **
+static char **

 parse_proxy(char *proxy, char *host)
 {
     char **pargv, **p;
 parse_proxy(char *proxy, char *host)
 {
     char **pargv, **p;


@@ -405,7 +164,7 @@ parse_proxy(char *proxy, char *host)
 
    /* put together list of arguments */
     p = pargv = mh_xmalloc(pargc * sizeof(char *));
 
    /* put together list of arguments */
     p = pargv = mh_xmalloc(pargc * sizeof(char *));

-    c = *pargv = mh_xmalloc(plen * sizeof(char));
+    c = *pargv = mh_xmalloc(plen);

     for (cur = pro; *cur; cur++) {
         if (isspace(*cur) && cur[1] && !isspace(cur[1])) {
            *c++ = '\0';
     for (cur = pro; *cur; cur++) {
         if (isspace(*cur) && cur[1] && !isspace(cur[1])) {
            *c++ = '\0';


@@ -417,31 +176,44 @@ parse_proxy(char *proxy, char *host)
        } else if (!isspace(*cur))
            *c++ = *cur;
     }
        } else if (!isspace(*cur))
            *c++ = *cur;
     }

+    *c = '\0';

     *++p = NULL;
     return pargv;
 }
 
 int
     *++p = NULL;
     return pargv;
 }
 
 int

-pop_init (char *host, char *port, char *user, char *pass, char *proxy,
-         int snoop, int sasl, char *mech)
+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];
 {
     int fd1, fd2;
     char buffer[BUFSIZ];

-#ifndef CYRUS_SASL
-    NMH_UNUSED (sasl);
-    NMH_UNUSED (mech);
-#endif /* ! CYRUS_SASL */
+    char *errstr;
+
+    nsc = netsec_init();  
+
+    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");
+           return NOTOK;
+       }
+    }

 
     if (proxy && *proxy) {
        int pid;
        int inpipe[2];    /* for reading from the server */
        int outpipe[2];    /* for sending to the server */
 
 
     if (proxy && *proxy) {
        int pid;
        int inpipe[2];    /* for reading from the server */
        int outpipe[2];    /* for sending to the server */
 

-       /* first give up any root priviledges we may have for rpop */
-       setuid(getuid());
-
-       pipe(inpipe);
-       pipe(outpipe);
+       if (pipe(inpipe) < 0) {
+          adios ("inpipe", "pipe");
+       }
+       if (pipe(outpipe) < 0) {
+          adios ("outpipe", "pipe");
+       }

 
        pid=fork();
        if (pid==0) {
 
        pid=fork();
        if (pid==0) {


@@ -466,7 +238,7 @@ pop_init (char *host, char *port, char *user, char *pass, char *proxy,
           close(1);
           free(*argv);
           free(argv);
           close(1);
           free(*argv);
           free(argv);

-          exit(10);
+          exit(1);

        }
 
        /* okay in the parent we do some stuff */
        }
 
        /* okay in the parent we do some stuff */


@@ -479,93 +251,280 @@ pop_init (char *host, char *port, char *user, char *pass, char *proxy,
        fd2=outpipe[1];
 
     } else {
        fd2=outpipe[1];
 
     } else {

-

        if ((fd1 = client (host, port ? port : "pop3", response,
                           sizeof(response), snoop)) == NOTOK) {
            return NOTOK;
        }
        if ((fd1 = client (host, port ? port : "pop3", response,
                           sizeof(response), snoop)) == NOTOK) {
            return NOTOK;
        }

+       fd2 = fd1;
+    }

 
 

-       if ((fd2 = dup (fd1)) == NOTOK) {
-           char *s;
+    SIGNAL (SIGPIPE, SIG_IGN);
+
+    netsec_set_fd(nsc, fd1, fd2);
+    netsec_set_snoop(nsc, snoop);

 
 

-           if ((s = strerror(errno)))
-               snprintf (response, sizeof(response),
-                   "unable to dup connection descriptor: %s", s);
-           else
-               snprintf (response, sizeof(response),
-                   "unable to dup connection descriptor: unknown error");
-           close (fd1);
+    if (tls & P_TLSENABLEMASK) {
+       if (netsec_set_tls(nsc, 1, tls & P_NOVERIFY, &errstr) != OK) {
+           snprintf(response, sizeof(response), "%s", errstr);
+           free(errstr);

            return NOTOK;
        }
            return NOTOK;
        }

+
+       if (tls & P_INITTLS) {
+           if (netsec_negotiate_tls(nsc, &errstr) != OK) {
+               snprintf(response, sizeof(response), "%s", errstr);
+               free(errstr);
+               return NOTOK;
+           }
+       }

     }
     }

-    if (pop_set (fd1, fd2, snoop) == NOTOK)
-       return NOTOK;

 
 

-    SIGNAL (SIGPIPE, SIG_IGN);
+    if (sasl) {
+       if (netsec_set_sasl_params(nsc, "pop", mech, pop_sasl_callback,
+                                  NULL, &errstr) != OK) {
+           snprintf(response, sizeof(response), "%s", errstr);
+           free(errstr);
+           return NOTOK;
+       }
+    }

 
 

-    switch (sasl_getline (response, sizeof response, input)) {
+    switch (pop_getline (response, sizeof response, nsc)) {

        case OK: 
            if (poprint)
                fprintf (stderr, "<--- %s\n", response);
            if (*response == '+') {
        case OK: 
            if (poprint)
                fprintf (stderr, "<--- %s\n", response);
            if (*response == '+') {

-#  ifdef CYRUS_SASL
+                nmh_creds_t creds;
+
+               if (tls & P_STARTTLS)
+                   if (pop_start_tls() != OK)
+                       return NOTOK;
+

                if (sasl) {
                if (sasl) {

-                   if (pop_auth_sasl(user, pass, host, mech) != NOTOK)
-                       return OK;
-               } else
-#  endif /* CYRUS_SASL */
-               if (command ("USER %s", user) != NOTOK
-                   && command ("%s %s", (pophack++, "PASS"),
-                                       pass) != NOTOK)
-               return OK;
+                   char server_mechs[256];
+                   if (check_mech(server_mechs, sizeof(server_mechs)) != OK)
+                       return NOTOK;
+                   if (netsec_negotiate_sasl(nsc, server_mechs,
+                                             &errstr) != OK) {
+                       strncpy(response, errstr, sizeof(response));
+                       response[sizeof(response) - 1] = '\0';
+                       free(errstr);
+                       return 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));
            }
            strncpy (buffer, response, sizeof(buffer));
            command ("QUIT");
            strncpy (response, buffer, sizeof(response));

-                               /* and fall */
+           /* FALLTHRU */

 
        case NOTOK: 
        case DONE: 
 
        case NOTOK: 
        case DONE: 

-           if (poprint)            
-               fprintf (stderr, "%s\n", response);
-           fclose (input);
-           fclose (output);
+           if (poprint) {
+               fputs(response, stderr);
+                putc('\n', stderr);
+            }
+           netsec_shutdown(nsc);
+           nsc = NULL;

            return NOTOK;
     }
 
     return NOTOK;      /* NOTREACHED */
 }
 
            return NOTOK;
     }
 
     return NOTOK;      /* NOTREACHED */
 }
 

-int
-pop_set (int in, int out, int snoop)
+
+/*
+ * Our SASL callback; we are given SASL tokens and then have to format
+ * them according to the protocol requirements, and then process incoming
+ * messages and feed them back into the SASL library.
+ */
+
+static int
+pop_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
+                 unsigned int indatalen, unsigned char **outdata,
+                 unsigned int *outdatalen, void *context, char **errstr)

 {
 {

+    int rc, snoopoffset;
+    char *mech, *line;
+    size_t len, b64len;
+    NMH_UNUSED(context);

 
 

-    if ((input = fdopen (in, "r")) == NULL
-           || (output = fdopen (out, "w")) == NULL) {
-       strncpy (response, "fdopen failed on connection descriptor", sizeof(response));
-       if (input)
-           fclose (input);
-       else
-           close (in);
-       close (out);
-       return NOTOK;
-    }
+    switch (mtype) {
+    case NETSEC_SASL_START:
+       /*
+        * Generate our AUTH message, but there is a wrinkle.
+        *
+        * Technically, according to RFC 5034, if your command INCLUDING
+        * an initial response exceeds 255 octets (including CRLF), you
+        * can't issue this all in one go, but have to just issue the
+        * AUTH command, wait for a blank initial response, and then
+        * send your data.
+        */
+
+       mech = netsec_get_sasl_mechanism(nsc);
+
+       if (indatalen) {
+           char *b64data;
+           b64data = mh_xmalloc(BASE64SIZE(indatalen));
+           writeBase64raw(indata, indatalen, (unsigned char *) b64data);
+           b64len = strlen(b64data);
+
+           /* Formula here is AUTH + SP + mech + SP + out + CR + LF */
+           len = b64len + 8 + strlen(mech);
+           if (len > 255) {
+               rc = netsec_printf(nsc, errstr, "AUTH %s\r\n", mech);
+               if (rc)
+                   return NOTOK;
+               if (netsec_flush(nsc, errstr) != OK)
+                   return NOTOK;
+               line = netsec_readline(nsc, &len, errstr);
+               if (! line)
+                   return NOTOK;
+               /*
+                * If the protocol is being followed correctly, should just
+                * be a "+ ", nothing else.
+                */
+               if (len != 2 || strcmp(line, "+ ") != 0) {
+                   netsec_err(errstr, "Did not get expected blank response "
+                              "for initial challenge response");
+                   return NOTOK;
+               }
+               rc = netsec_printf(nsc, errstr, "%s\r\n", b64data);
+               free(b64data);
+               if (rc != OK)
+                   return NOTOK;
+               netsec_set_snoop_callback(nsc, netsec_b64_snoop_decoder, NULL);
+               rc = netsec_flush(nsc, errstr);
+               netsec_set_snoop_callback(nsc, NULL, NULL);
+               if (rc != OK)
+                   return NOTOK;
+           } else {
+               rc = netsec_printf(nsc, errstr, "AUTH %s %s\r\n", mech,
+                                  b64data);
+               free(b64data);
+               if (rc != OK)
+                   return NOTOK;
+               netsec_set_snoop_callback(nsc, netsec_b64_snoop_decoder,
+                                         &snoopoffset);
+               snoopoffset = 6 + strlen(mech);
+               rc = netsec_flush(nsc, errstr);
+               netsec_set_snoop_callback(nsc, NULL, NULL);
+               if (rc != OK)
+                   return NOTOK;
+           }
+       } else {
+           if (netsec_printf(nsc, errstr, "AUTH %s\r\n", mech) != OK)
+               return NOTOK;
+           if (netsec_flush(nsc, errstr) != OK)
+               return NOTOK;
+       }

 
 

-    poprint = snoop;
+       break;

 
 

-    return OK;
-}
+       /*
+        * We should get one line back, with our base64 data.  Decode that
+        * and feed it back into the SASL library.
+        */
+    case NETSEC_SASL_READ:
+       netsec_set_snoop_callback(nsc, netsec_b64_snoop_decoder, &snoopoffset);
+       snoopoffset = 2;
+       line = netsec_readline(nsc, &len, errstr);
+       netsec_set_snoop_callback(nsc, NULL, NULL);

 
 

+       if (line == NULL)
+           return NOTOK;
+       if (len < 2 || (len == 2 && strcmp(line, "+ ") != 0)) {
+           netsec_err(errstr, "Invalid format for SASL response");
+           return NOTOK;
+       }
+
+       if (len == 2) {
+           *outdata = NULL;
+           *outdatalen = 0;
+       } else {
+           rc = decodeBase64(line + 2, outdata, &len, 0);
+           *outdatalen = len;
+           if (rc != OK) {
+               netsec_err(errstr, "Unable to decode base64 response");
+               return NOTOK;
+           }
+       }
+       break;
+
+    /*
+     * Our encoding is pretty simple, so this is easy.
+     */
+
+    case NETSEC_SASL_WRITE:
+       if (indatalen == 0) {
+           rc = netsec_printf(nsc, errstr, "\r\n");
+       } else {
+           unsigned char *b64data;
+           b64data = mh_xmalloc(BASE64SIZE(indatalen));
+           writeBase64raw(indata, indatalen, b64data);
+           rc = netsec_printf(nsc, errstr, "%s\r\n", b64data);
+           free(b64data);
+       }
+
+       if (rc != OK)
+           return NOTOK;
+
+       if (indatalen > 0)
+           netsec_set_snoop_callback(nsc, netsec_b64_snoop_decoder, NULL);
+       rc = netsec_flush(nsc, errstr);
+       netsec_set_snoop_callback(nsc, NULL, NULL);
+       if (rc != OK)
+           return NOTOK;
+       break;
+
+    /*
+     * Finish the protocol; we're looking for an +OK
+     */
+
+    case NETSEC_SASL_FINISH:
+       line = netsec_readline(nsc, &len, errstr);
+       if (line == NULL)
+           return NOTOK;
+
+       if (!has_prefix(line, "+OK")) {
+           netsec_err(errstr, "Authentication failed: %s", line);
+           return NOTOK;
+       }
+       break;
+
+    /*
+     * Cancel the SASL exchange in the middle of the commands; for
+     * POP, that's a single "*".
+     *
+     * It's unclear to me if I should be returning errors up; I finally
+     * decided the answer should be "yes", and if the upper layer wants to
+     * ignore them that's their choice.
+     */
+
+    case NETSEC_SASL_CANCEL:
+       rc = netsec_printf(nsc, errstr, "*\r\n");
+       if (rc == OK)
+           rc = netsec_flush(nsc, errstr);
+       if (rc != OK)
+           return NOTOK;
+       break;
+    }

 
 

-int
-pop_fd (char *in, int inlen, char *out, int outlen)
-{
-    snprintf (in, inlen, "%d", fileno (input));
-    snprintf (out, outlen, "%d", fileno (output));

     return OK;
 }
 
     return OK;
 }
 

-

 /*
  * Find out number of messages available
  * and their total size.
 /*
  * Find out number of messages available
  * and their total size.


@@ -586,68 +545,16 @@ pop_stat (int *nmsgs, int *nbytes)
 
 
 int
 
 
 int

-pop_list (int msgno, int *nmsgs, int *msgs, int *bytes)
-{
-    int i;
-    int *ids = NULL;
-
-    if (msgno) {
-       if (command ("LIST %d", msgno) == NOTOK)
-           return NOTOK;
-       *msgs = *bytes = 0;
-       if (ids) {
-           *ids = 0;
-           sscanf (response, "+OK %d %d %d", msgs, bytes, ids);
-       }
-       else
-           sscanf (response, "+OK %d %d", msgs, bytes);
-       return OK;
-    }
-
-    if (command ("LIST") == NOTOK)
-       return NOTOK;
-
-    for (i = 0; i < *nmsgs; i++)
-       switch (multiline ()) {
-           case NOTOK: 
-               return NOTOK;
-           case DONE: 
-               *nmsgs = ++i;
-               return OK;
-           case OK: 
-               *msgs = *bytes = 0;
-               if (ids) {
-                   *ids = 0;
-                   sscanf (response, "%d %d %d",
-                           msgs++, bytes++, ids++);
-               }
-               else
-                   sscanf (response, "%d %d", msgs++, bytes++);
-               break;
-       }
-    for (;;)
-       switch (multiline ()) {
-           case NOTOK: 
-               return NOTOK;
-           case DONE: 
-               return OK;
-           case OK: 
-               break;
-       }
-}
-
-
-int
-pop_retr (int msgno, int (*action)(char *))
+pop_retr (int msgno, int (*action)(void *, char *), void *closure)

 {
 {

-    return traverse (action, "RETR %d", msgno);
+    return traverse (action, closure, "RETR %d", msgno);

 }
 
 
 static int
 }
 
 
 static int

-traverse (int (*action)(char *), const char *fmt, ...)
+traverse (int (*action)(void *, char *), void *closure, const char *fmt, ...)

 {
 {

-    int result;
+    int result, snoopstate;

     va_list ap;
     char buffer[sizeof(response)];
 
     va_list ap;
     char buffer[sizeof(response)];
 


@@ -659,19 +566,24 @@ traverse (int (*action)(char *), const char *fmt, ...)
        return NOTOK;
     strncpy (buffer, response, sizeof(buffer));
 
        return NOTOK;
     strncpy (buffer, response, sizeof(buffer));
 

-    for (;;)
-       switch (multiline ()) {
-           case NOTOK: 
-               return NOTOK;
-
-           case DONE: 
-               strncpy (response, buffer, sizeof(response));
-               return OK;
+    if ((snoopstate = netsec_get_snoop(nsc)))
+       netsec_set_snoop(nsc, 0);
+
+    for (;;) {
+        result = multiline();
+        if (result == OK) {
+            result = (*action)(closure, response);
+            if (result == OK)
+                continue;
+        } else if (result == DONE) {
+            strncpy(response, buffer, sizeof(response));
+            result = OK;
+        }
+        break;
+    }

 
 

-           case OK: 
-               (*action) (response);
-               break;
-       }
+    netsec_set_snoop(nsc, snoopstate);
+    return result;

 }
 
 
 }
 
 


@@ -682,27 +594,6 @@ pop_dele (int msgno)
 }
 
 
 }
 
 

-int
-pop_noop (void)
-{
-    return command ("NOOP");
-}
-
-
-int
-pop_rset (void)
-{
-    return command ("RSET");
-}
-
-
-int
-pop_top (int msgno, int lines, int (*action)(char *))
-{
-    return traverse (action, "TOP %d %d", msgno, lines);
-}
-
-

 int
 pop_quit (void)
 {
 int
 pop_quit (void)
 {


@@ -718,18 +609,14 @@ pop_quit (void)
 int
 pop_done (void)
 {
 int
 pop_done (void)
 {

-#ifdef CYRUS_SASL
-    if (conn)
-       sasl_dispose(&conn);
-#endif /* CYRUS_SASL */
-    fclose (input);
-    fclose (output);
+    if (nsc)
+       netsec_shutdown(nsc);

 
     return OK;
 }
 
 
 
     return OK;
 }
 
 

-int
+static int

 command(const char *fmt, ...)
 {
     va_list ap;
 command(const char *fmt, ...)
 {
     va_list ap;


@@ -746,44 +633,42 @@ command(const char *fmt, ...)
 static int
 vcommand (const char *fmt, va_list ap)
 {
 static int
 vcommand (const char *fmt, va_list ap)
 {

-    char *cp, buffer[BUFSIZ];
-
-    vsnprintf (buffer, sizeof(buffer), fmt, ap);
-    if (poprint) {
-#ifdef CYRUS_SASL
-       if (sasl_ssf)
-           fprintf(stderr, "(encrypted) ");
-#endif /* CYRUS_SASL */
-       if (pophack) {
-           if ((cp = strchr (buffer, ' ')))
-               *cp = 0;
-           fprintf (stderr, "---> %s ********\n", buffer);
-           if (cp)
-               *cp = ' ';
-           pophack = 0;
-       }
-       else
-           fprintf (stderr, "---> %s\n", buffer);
+    /* char *cp; */
+    char *errstr;
+
+    if (netsec_vprintf(nsc, &errstr, fmt, ap) != OK) {
+       strncpy(response, errstr, sizeof(response));
+       response[sizeof(response) - 1] = '\0';
+       free(errstr);
+       return NOTOK;

     }
 
     }
 

-    if (putline (buffer, output) == NOTOK)
+    if (netsec_printf(nsc, &errstr, "\r\n") != OK) {
+       strncpy(response, errstr, sizeof(response));
+       response[sizeof(response) - 1] = '\0';
+       free(errstr);

        return NOTOK;
        return NOTOK;

+    }

 
 

-#ifdef CYRUS_SASL
-    if (poprint && sasl_ssf)
-       fprintf(stderr, "(decrypted) ");
-#endif /* CYRUS_SASL */
+    if (netsec_flush(nsc, &errstr) != OK) {
+       strncpy(response, errstr, sizeof(response));
+       response[sizeof(response) - 1] = '\0';
+       free(errstr);
+       return NOTOK;
+    }

 
 

-    switch (sasl_getline (response, sizeof response, input)) {
+    switch (pop_getline (response, sizeof response, nsc)) {

        case OK: 
            if (poprint)
                fprintf (stderr, "<--- %s\n", response);
        case OK: 
            if (poprint)
                fprintf (stderr, "<--- %s\n", response);

-           return (*response == '+' ? OK : NOTOK);
+           return *response == '+' ? OK : NOTOK;

 
        case NOTOK: 
        case DONE: 
 
        case NOTOK: 
        case DONE: 

-           if (poprint)            
-               fprintf (stderr, "%s\n", response);
+           if (poprint) {
+               fputs(response, stderr);
+                putc('\n', stderr);
+            }

            return NOTOK;
     }
 
            return NOTOK;
     }
 


@@ -791,27 +676,17 @@ vcommand (const char *fmt, va_list ap)
 }
 
 
 }
 
 

-int
+static int

 multiline (void)
 {
 multiline (void)
 {

-    char buffer[BUFSIZ + TRMLEN];
+    char buffer[BUFSIZ + LEN(TRM)];

 
 

-    if (sasl_getline (buffer, sizeof buffer, input) != OK)
+    if (pop_getline (buffer, sizeof buffer, nsc) != OK)

        return NOTOK;
        return NOTOK;

-#ifdef DEBUG
-    if (poprint) {
-#ifdef CYRUS_SASL
-       if (sasl_ssf)
-           fprintf(stderr, "(decrypted) ");
-#endif /* CYRUS_SASL */
-       fprintf (stderr, "<--- %s\n", response);
-    }
-#endif /* DEBUG */
-    if (strncmp (buffer, TRM, TRMLEN) == 0) {
-       if (buffer[TRMLEN] == 0)
+    if (has_prefix(buffer, TRM)) {
+       if (buffer[LEN(TRM)] == 0)

            return DONE;
            return DONE;

-       else
-           strncpy (response, buffer + TRMLEN, sizeof(response));
+        strncpy (response, buffer + LEN(TRM), sizeof(response));

     }
     else
        strncpy (response, buffer, sizeof(response));
     }
     else
        strncpy (response, buffer, sizeof(response));


@@ -820,156 +695,42 @@ multiline (void)
 }
 
 /*
 }
 
 /*

- * Note that these functions have been modified to deal with layer encryption
- * in the SASL case
+ * This is now just a thin wrapper around netsec_readline().

  */
 
 static int
  */
 
 static int

-sasl_getline (char *s, int n, FILE *iop)
+pop_getline (char *s, int n, netsec_context *ns)

 {
 {

-    int c = -2;
+    /* int c = -2; */

     char *p;
     char *p;

+    size_t len, destlen;
+    /* int rc; */
+    char *errstr;

 
 

-    p = s;
-    while (--n > 0 && (c = sasl_fgetc (iop)) != EOF && c != -2) 
-       if ((*p++ = c) == '\n')
-           break;
-    if (c == -2)
-       return NOTOK;
-    if (ferror (iop) && c != EOF) {
-       strncpy (response, "error on connection", sizeof(response));
-       return NOTOK;
-    }
-    if (c == EOF && p == s) {
-       strncpy (response, "connection closed by foreign host", sizeof(response));
-       return DONE;
-    }
-    *p = 0;
-    if (*--p == '\n')
-       *p = 0;
-    if (*--p == '\r')
-       *p = 0;
-
-    return OK;
-}
+    p = netsec_readline(ns, &len, &errstr);

 
 

-
-static int
-putline (char *s, FILE *iop)
-{
-#ifdef CYRUS_SASL
-    char outbuf[BUFSIZ], *buf;
-    int result;
-    unsigned int buflen;
-
-    if (!sasl_complete) {
-#endif /* CYRUS_SASL */
-       fprintf (iop, "%s\r\n", s);
-#ifdef CYRUS_SASL
-    } else {
-       /*
-        * Build an output buffer, encrypt it using sasl_encode, and
-        * squirt out the results.
-        */
-       strncpy(outbuf, s, sizeof(outbuf) - 3);
-       outbuf[sizeof(outbuf) - 3] = '\0';   /* Just in case */
-       strcat(outbuf, "\r\n");
-
-       result = sasl_encode(conn, outbuf, strlen(outbuf),
-                            (const char **) &buf, &buflen);
-
-       if (result != SASL_OK) {
-           snprintf(response, sizeof(response), "SASL encoding error: %s",
-                    sasl_errdetail(conn));
-           return NOTOK;
-       }
-
-       fwrite(buf, buflen, 1, iop);
-    }
-#endif /* CYRUS_SASL */
-
-    fflush (iop);
-    if (ferror (iop)) {
-       strncpy (response, "lost connection", sizeof(response));
+    if (p == NULL) {
+       strncpy(response, errstr, sizeof(response));
+       response[sizeof(response) - 1] = '\0';
+       free(errstr);

        return NOTOK;
     }
 
        return NOTOK;
     }
 

-    return OK;
-}
-
-#ifdef CYRUS_SASL
-/*
- * Okay, our little fgetc replacement.  Hopefully this is a little more
- * efficient than the last one.
- */
-static int
-sasl_fgetc(FILE *f)
-{
-    static unsigned char *buffer = NULL, *ptr;
-    static unsigned int size = 0;
-    static int cnt = 0;
-    unsigned int retbufsize = 0;
-    int cc, result;
-    char *retbuf, tmpbuf[SASL_BUFFER_SIZE];
-

     /*
     /*

-     * If we have some leftover data, return that
+     * If we had an error, it should have been returned already.  Since
+     * netsec_readline() strips off the CR-LF ending, just copy the existing
+     * buffer into response now.
+     *
+     * 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 represented as C strings.  That should get fixed
+     * someday.

      */
 
      */
 

-    if (cnt) {
-       cnt--;
-       return (int) *ptr++;
-    }
-
-    /*
-     * Otherwise, fill our buffer until we have some data to return.
-     */
-
-    while (retbufsize == 0) {
-
-       cc = read(fileno(f), tmpbuf, sizeof(tmpbuf));
-
-       if (cc == 0)
-           return EOF;
+    destlen = min(len, (size_t)(n - 1));

 
 

-       if (cc < 0) {
-           snprintf(response, sizeof(response), "Error during read from "
-                    "network: %s", strerror(errno));
-           return -2;
-       }
-
-       /*
-        * We're not allowed to call sasl_decode until sasl_complete is
-        * true, so we do these gyrations ...
-        */
-       
-       if (!sasl_complete) {
-
-           retbuf = tmpbuf;
-           retbufsize = cc;
-
-       } else {
-
-           result = sasl_decode(conn, tmpbuf, cc,
-                                (const char **) &retbuf, &retbufsize);
-
-           if (result != SASL_OK) {
-               snprintf(response, sizeof(response), "Error during SASL "
-                        "decoding: %s", sasl_errdetail(conn));
-               return -2;
-           }
-       }
-    }
-
-    if (retbufsize > size) {
-       buffer = mh_xrealloc(buffer, retbufsize);
-       size = retbufsize;
-    }
-
-    memcpy(buffer, retbuf, retbufsize);
-    ptr = buffer + 1;
-    cnt = retbufsize - 1;
-
-    return (int) buffer[0];
+    memcpy(s, p, destlen);
+    s[destlen] = '\0';
+    
+    return OK;

 }
 }

-#endif /* CYRUS_SASL */