X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_sasl.c;h=126504cc0236796152d996aafd3381d95b185d3c;hp=095a9aead0391bf3919ec17be0a243ae78c20b65;hb=230399f9632c37b66c1c117a17e8327eae6b3235;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258 diff --git a/mutt_sasl.c b/mutt_sasl.c index 095a9ae..126504c 100644 --- a/mutt_sasl.c +++ b/mutt_sasl.c @@ -13,84 +13,65 @@ # include "config.h" #endif -#include "mutt.h" -#include "account.h" -#include "mutt_sasl.h" -#include "mutt_socket.h" - -#include "lib/mem.h" -#include "lib/debug.h" - -#ifdef USE_SASL2 #include #include #include -#else -#include -#endif #include #include -#ifdef USE_SASL2 +#include +#include +#include + +#include "mutt.h" +#include "account.h" +#include "mutt_sasl.h" + static int getnameinfo_err (int ret) { int err; switch (ret) { case EAI_AGAIN: - debug_print (1, ("The name could not be resolved at this time. Future attempts may succeed.\n")); err = SASL_TRYAGAIN; break; case EAI_BADFLAGS: - debug_print (1, ("The flags had an invalid value.\n")); err = SASL_BADPARAM; break; case EAI_FAIL: - debug_print (1, ("A non-recoverable error occurred.\n")); err = SASL_FAIL; break; case EAI_FAMILY: - debug_print (1, ("The address family was not recognized or the address length was invalid for the specified family.\n")); err = SASL_BADPROT; break; case EAI_MEMORY: - debug_print (1, ("There was a memory allocation failure.\n")); err = SASL_NOMEM; break; case EAI_NONAME: - debug_print (1, ("The name does not resolve for the supplied parameters. NI_NAMEREQD is set and the host's name cannot be located, or both nodename and servname were null.\n")); err = SASL_FAIL; /* no real equivalent */ break; case EAI_SYSTEM: - debug_print (1, ("A system error occurred. The error code can be found in errno(%d,%s)).\n", - errno, strerror (errno))); err = SASL_FAIL; /* no real equivalent */ break; default: - debug_print (1, ("Unknown error %d\n", ret)); err = SASL_FAIL; /* no real equivalent */ break; } return err; } -#endif /* arbitrary. SASL will probably use a smaller buffer anyway. OTOH it's * been a while since I've had access to an SASL server which negotiated * a protection buffer. */ #define M_SASL_MAXBUF 65536 -#ifdef USE_SASL2 #define IP_PORT_BUFLEN 1024 -#endif static sasl_callback_t mutt_sasl_callbacks[5]; static int mutt_sasl_start (void); /* callbacks */ -static int mutt_sasl_cb_log (void *context, int priority, - const char *message); static int mutt_sasl_cb_authname (void *context, int id, const char **result, unsigned int *len); static int mutt_sasl_cb_pass (sasl_conn_t * conn, void *context, int id, @@ -99,11 +80,10 @@ static int mutt_sasl_cb_pass (sasl_conn_t * conn, void *context, int id, /* socket wrappers for a SASL security layer */ static int mutt_sasl_conn_open (CONNECTION * conn); static int mutt_sasl_conn_close (CONNECTION * conn); -static int mutt_sasl_conn_read (CONNECTION * conn, char *buf, size_t len); +static int mutt_sasl_conn_read (CONNECTION * conn, char *buf, ssize_t len); static int mutt_sasl_conn_write (CONNECTION * conn, const char *buf, - size_t count); + ssize_t count); -#ifdef USE_SASL2 /* utility function, stolen from sasl2 sample code */ static int iptostring (const struct sockaddr *addr, socklen_t addrlen, char *out, unsigned outlen) @@ -123,17 +103,22 @@ static int iptostring (const struct sockaddr *addr, socklen_t addrlen, if (ret) return getnameinfo_err (ret); - if (outlen < str_len (hbuf) + str_len (pbuf) + 2) + if (outlen < m_strlen(hbuf) + m_strlen(pbuf) + 2) return SASL_BUFOVER; snprintf (out, outlen, "%s;%s", hbuf, pbuf); return SASL_OK; } -#endif + +/* mutt_sasl_cb_log: callback to log SASL messages */ +static int mutt_sasl_cb_log (void *context, int priority, const char *message) +{ + return SASL_OK; +} /* mutt_sasl_start: called before doing a SASL exchange - initialises library - * (if neccessary). */ + * (if necessary). */ int mutt_sasl_start (void) { static unsigned char sasl_init = 0; @@ -156,7 +141,6 @@ int mutt_sasl_start (void) rc = sasl_client_init (callbacks); if (rc != SASL_OK) { - debug_print (1, ("libsasl initialisation failed.\n")); return SASL_FAIL; } @@ -172,13 +156,9 @@ int mutt_sasl_client_new (CONNECTION * conn, sasl_conn_t ** saslconn) { sasl_security_properties_t secprops; -#ifdef USE_SASL2 struct sockaddr_storage local, remote; socklen_t size; char iplocalport[IP_PORT_BUFLEN], ipremoteport[IP_PORT_BUFLEN]; -#else - sasl_external_properties_t extprops; -#endif const char *service; int rc; @@ -193,51 +173,34 @@ int mutt_sasl_client_new (CONNECTION * conn, sasl_conn_t ** saslconn) service = "pop"; break; default: - debug_print (1, ("account type unset\n")); return -1; } -#ifdef USE_SASL2 size = sizeof (local); if (getsockname (conn->fd, (struct sockaddr *) &local, &size)) { - debug_print (1, ("getsockname for local failed\n")); return -1; } else - if (iptostring - ((struct sockaddr *) &local, size, iplocalport, + if (iptostring((struct sockaddr *)&local, size, iplocalport, IP_PORT_BUFLEN) != SASL_OK) { - debug_print (1, ("iptostring for local failed\n")); return -1; } size = sizeof (remote); if (getpeername (conn->fd, (struct sockaddr *) &remote, &size)) { - debug_print (1, ("getsockname for remote failed\n")); return -1; } else if (iptostring ((struct sockaddr *) &remote, size, ipremoteport, IP_PORT_BUFLEN) != SASL_OK) { - debug_print (1, ("iptostring for remote failed\n")); return -1; } - debug_print (1, ("local ip: %s, remote ip:%s\n", iplocalport, ipremoteport)); - - rc = - sasl_client_new (service, conn->account.host, iplocalport, ipremoteport, - mutt_sasl_get_callbacks (&conn->account), 0, saslconn); - -#else - rc = sasl_client_new (service, conn->account.host, - mutt_sasl_get_callbacks (&conn->account), - SASL_SECURITY_LAYER, saslconn); -#endif + rc = sasl_client_new(service, conn->account.host, iplocalport, ipremoteport, + mutt_sasl_get_callbacks(&conn->account), 0, saslconn); if (rc != SASL_OK) { - debug_print (1, ("Error allocating SASL connection\n")); return -1; } @@ -245,7 +208,6 @@ int mutt_sasl_client_new (CONNECTION * conn, sasl_conn_t ** saslconn) /* Do we need to fail if this fails? I would assume having these unset * would just disable KRB4. Who wrote this code? */ -#ifndef USE_SASL2 /* with SASLv2 this all happens in sasl_client_new */ { struct sockaddr_in local, remote; socklen_t size; @@ -260,59 +222,40 @@ int mutt_sasl_client_new (CONNECTION * conn, sasl_conn_t ** saslconn) #ifdef SASL_IP_LOCAL if (sasl_setprop (*saslconn, SASL_IP_LOCAL, &local) != SASL_OK) { - debug_print (1, ("Error setting local IP address\n")); return -1; } #endif #ifdef SASL_IP_REMOTE if (sasl_setprop (*saslconn, SASL_IP_REMOTE, &remote) != SASL_OK) { - debug_print (1, ("Error setting remote IP address\n")); return -1; } #endif } -#endif /* set security properties. We use NOPLAINTEXT globally, since we can * just fall back to LOGIN in the IMAP case anyway. If that doesn't * work for POP, we can make it a flag or move this code into * imap/auth_sasl.c */ - memset (&secprops, 0, sizeof (secprops)); + p_clear(&secprops, 1); /* Work around a casting bug in the SASL krb4 module */ secprops.max_ssf = 0x7fff; secprops.maxbufsize = M_SASL_MAXBUF; secprops.security_flags |= SASL_SEC_NOPLAINTEXT; if (sasl_setprop (*saslconn, SASL_SEC_PROPS, &secprops) != SASL_OK) { - debug_print (1, ("Error setting security properties\n")); return -1; } -#if defined(USE_SSL) || defined(USE_GNUTLS) if (conn->ssf) { -#ifdef USE_SASL2 /* I'm not sure this actually has an effect, at least with SASLv2 */ - debug_print (2, ("External SSF: %d\n", conn->ssf)); if (sasl_setprop (*saslconn, SASL_SSF_EXTERNAL, &(conn->ssf)) != SASL_OK) -#else - memset (&extprops, 0, sizeof (extprops)); - extprops.ssf = conn->ssf; - debug_print (2, ("External SSF: %d\n", extprops.ssf)); - if (sasl_setprop (*saslconn, SASL_SSF_EXTERNAL, &extprops) != SASL_OK) -#endif { - debug_print (1, ("Error setting external properties\n")); return -1; } -#ifdef USE_SASL2 - debug_print (2, ("External authentication name: %s\n", conn->account.user)); if (sasl_setprop (*saslconn, SASL_AUTH_EXTERNAL, conn->account.user) != SASL_OK) { - debug_print (1, ("Error setting external properties\n")); return -1; } -#endif } -#endif return 0; } @@ -356,17 +299,13 @@ int mutt_sasl_interact (sasl_interact_t * interaction) char resp[SHORT_STRING]; while (interaction->id != SASL_CB_LIST_END) { - debug_print (2, ("filling in SASL interaction %ld.\n", interaction->id)); - snprintf (prompt, sizeof (prompt), "%s: ", interaction->prompt); resp[0] = '\0'; if (mutt_get_field (prompt, resp, sizeof (resp), 0)) return SASL_FAIL; - interaction->len = str_len (resp) + 1; - interaction->result = mem_malloc (interaction->len); - memcpy ((char*) interaction->result, resp, interaction->len); - + interaction->len = m_strlen(resp) + 1; + interaction->result = p_dupstr(resp, interaction->len - 1); interaction++; } @@ -391,25 +330,16 @@ int mutt_sasl_interact (sasl_interact_t * interaction) * for the read/write methods. */ void mutt_sasl_setup_conn (CONNECTION * conn, sasl_conn_t * saslconn) { - SASL_DATA *sasldata = (SASL_DATA *) mem_malloc (sizeof (SASL_DATA)); + SASL_DATA *sasldata = p_new(SASL_DATA, 1); sasldata->saslconn = saslconn; /* get ssf so we know whether we have to (en|de)code read/write */ -#ifdef USE_SASL2 - sasl_getprop (saslconn, SASL_SSF, (const void **) &sasldata->ssf); -#else - sasl_getprop (saslconn, SASL_SSF, (void **) &sasldata->ssf); -#endif - debug_print (3, ("SASL protection strength: %u\n", *sasldata->ssf)); + sasl_getprop (saslconn, SASL_SSF, (const void **)(void *)&sasldata->ssf); + /* Add SASL SSF to transport SSF */ conn->ssf += *sasldata->ssf; -#ifdef USE_SASL2 sasl_getprop (saslconn, SASL_MAXOUTBUF, - (const void **) &sasldata->pbufsize); -#else - sasl_getprop (saslconn, SASL_MAXOUTBUF, (void **) &sasldata->pbufsize); -#endif - debug_print (3, ("SASL protection buffer size: %u\n", *sasldata->pbufsize)); + (const void **)(void *)&sasldata->pbufsize); /* clear input buffer */ sasldata->buf = NULL; @@ -431,12 +361,8 @@ void mutt_sasl_setup_conn (CONNECTION * conn, sasl_conn_t * saslconn) conn->conn_write = mutt_sasl_conn_write; } -/* mutt_sasl_cb_log: callback to log SASL messages */ -static int mutt_sasl_cb_log (void *context, int priority, const char *message) -{ - debug_print (priority, ("SASL: %s\n", message)); - - return SASL_OK; +void mutt_sasl_done (void) { + sasl_done (); } /* mutt_sasl_cb_authname: callback to retrieve authname or user from ACCOUNT */ @@ -452,10 +378,6 @@ static int mutt_sasl_cb_authname (void *context, int id, const char **result, if (!account) return SASL_BADPARAM; - debug_print (2, ("getting %s for %s:%u\n", - id == SASL_CB_AUTHNAME ? "authname" : "user", - account->host, account->port)); - if (id == SASL_CB_AUTHNAME) { if (mutt_account_getlogin (account)) return SASL_FAIL; @@ -467,7 +389,7 @@ static int mutt_sasl_cb_authname (void *context, int id, const char **result, } if (len) - *len = str_len (*result); + *len = m_strlen(*result); return SASL_OK; } @@ -481,15 +403,12 @@ static int mutt_sasl_cb_pass (sasl_conn_t * conn, void *context, int id, if (!account || !psecret) return SASL_BADPARAM; - debug_print (2, ("getting password for %s@%s:%u\n", - account->login, account->host, account->port)); - if (mutt_account_getpass (account)) return SASL_FAIL; - len = str_len (account->pass); + len = m_strlen(account->pass); - *psecret = (sasl_secret_t *) mem_malloc (sizeof (sasl_secret_t) + len); + *psecret = xmalloc(sizeof(sasl_secret_t) + len); (*psecret)->len = len; strcpy ((char*) (*psecret)->data, account->pass); /* __STRCPY_CHECKED__ */ @@ -531,10 +450,8 @@ static int mutt_sasl_conn_close (CONNECTION * conn) /* release sasl resources */ sasl_dispose (&sasldata->saslconn); -#ifndef USE_SASL2 - mem_free (&sasldata->buf); -#endif - mem_free (&sasldata); + p_delete(&sasldata->buf); + p_delete(&sasldata); /* call underlying close */ rc = (conn->conn_close) (conn); @@ -542,7 +459,7 @@ static int mutt_sasl_conn_close (CONNECTION * conn) return rc; } -static int mutt_sasl_conn_read (CONNECTION * conn, char *buf, size_t len) +static int mutt_sasl_conn_read (CONNECTION * conn, char *buf, ssize_t len) { SASL_DATA *sasldata; int rc; @@ -564,9 +481,7 @@ static int mutt_sasl_conn_read (CONNECTION * conn, char *buf, size_t len) conn->sockdata = sasldata->sockdata; -#ifndef USE_SASL2 - mem_free (&sasldata->buf); -#endif + p_delete(&sasldata->buf); sasldata->bpos = 0; sasldata->blen = 0; @@ -581,8 +496,6 @@ static int mutt_sasl_conn_read (CONNECTION * conn, char *buf, size_t len) rc = sasl_decode (sasldata->saslconn, buf, rc, &sasldata->buf, &sasldata->blen); if (rc != SASL_OK) { - debug_print (1, ("SASL decode failed: %s\n", - sasl_errstring (rc, NULL, NULL))); goto out; } } @@ -606,16 +519,12 @@ out: } static int mutt_sasl_conn_write (CONNECTION * conn, const char *buf, - size_t len) + ssize_t len) { SASL_DATA *sasldata; int rc; -#ifdef USE_SASL2 const char *pbuf; -#else - char *pbuf; -#endif unsigned int olen, plen; sasldata = (SASL_DATA *) conn->sockdata; @@ -629,15 +538,11 @@ static int mutt_sasl_conn_write (CONNECTION * conn, const char *buf, rc = sasl_encode (sasldata->saslconn, buf, olen, &pbuf, &plen); if (rc != SASL_OK) { - debug_print (1, ("SASL encoding failed: %s\n", - sasl_errstring (rc, NULL, NULL))); goto fail; } rc = (sasldata->msasl_write) (conn, pbuf, plen); -#ifndef USE_SASL2 - mem_free (&pbuf); -#endif + p_delete(&pbuf); if (rc != plen) goto fail;