X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_sasl.c;h=d5738b635f4c37b5f8dfce6be81b1153f096f7e2;hp=6b856e460d44a65b5c476a55e45b159c29e5c099;hb=08fa240d29322ece4c7bceebfae6c6d3fb856f0e;hpb=c3e57678c8be193fc137854020f3a90887be97c9 diff --git a/mutt_sasl.c b/mutt_sasl.c index 6b856e4..d5738b6 100644 --- a/mutt_sasl.c +++ b/mutt_sasl.c @@ -13,82 +13,70 @@ # include "config.h" #endif +#include + #include "mutt.h" #include "account.h" #include "mutt_sasl.h" -#include "mutt_socket.h" +#include + +#include "lib/debug.h" -#ifdef USE_SASL2 #include #include #include -#else -#include -#endif + #include #include -#ifdef USE_SASL2 static int getnameinfo_err (int ret) { int err; - dprint (1, (debugfile, "getnameinfo: ")); switch (ret) { case EAI_AGAIN: - dprint (1, - (debugfile, - "The name could not be resolved at this time. Future attempts may succeed.\n")); + debug_print (1, ("The name could not be resolved at this time. Future attempts may succeed.\n")); err = SASL_TRYAGAIN; break; case EAI_BADFLAGS: - dprint (1, (debugfile, "The flags had an invalid value.\n")); + debug_print (1, ("The flags had an invalid value.\n")); err = SASL_BADPARAM; break; case EAI_FAIL: - dprint (1, (debugfile, "A non-recoverable error occurred.\n")); + debug_print (1, ("A non-recoverable error occurred.\n")); err = SASL_FAIL; break; case EAI_FAMILY: - dprint (1, - (debugfile, - "The address family was not recognized or the address length was invalid for the specified family.\n")); + 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: - dprint (1, (debugfile, "There was a memory allocation failure.\n")); + debug_print (1, ("There was a memory allocation failure.\n")); err = SASL_NOMEM; break; case EAI_NONAME: - dprint (1, - (debugfile, - "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")); + 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: - dprint (1, - (debugfile, - "A system error occurred. The error code can be found in errno(%d,%s)).\n", - errno, strerror (errno))); + 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: - dprint (1, (debugfile, "Unknown error %d\n", ret)); + 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]; @@ -109,7 +97,6 @@ static int mutt_sasl_conn_read (CONNECTION * conn, char *buf, size_t len); static int mutt_sasl_conn_write (CONNECTION * conn, const char *buf, size_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) @@ -129,17 +116,16 @@ static int iptostring (const struct sockaddr *addr, socklen_t addrlen, if (ret) return getnameinfo_err (ret); - if (outlen < strlen (hbuf) + strlen (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_start: called before doing a SASL exchange - initialises library - * (if neccessary). */ + * (if necessary). */ int mutt_sasl_start (void) { static unsigned char sasl_init = 0; @@ -162,8 +148,7 @@ int mutt_sasl_start (void) rc = sasl_client_init (callbacks); if (rc != SASL_OK) { - dprint (1, - (debugfile, "mutt_sasl_start: libsasl initialisation failed.\n")); + debug_print (1, ("libsasl initialisation failed.\n")); return SASL_FAIL; } @@ -179,13 +164,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; @@ -200,70 +181,51 @@ int mutt_sasl_client_new (CONNECTION * conn, sasl_conn_t ** saslconn) service = "pop"; break; default: - dprint (1, (debugfile, "mutt_sasl_client_new: account type unset\n")); + debug_print (1, ("account type unset\n")); return -1; } -#ifdef USE_SASL2 size = sizeof (local); if (getsockname (conn->fd, (struct sockaddr *) &local, &size)) { - dprint (1, - (debugfile, - "mutt_sasl_client_new: getsockname for local failed\n")); + debug_print (1, ("getsockname for local failed\n")); return -1; } else if (iptostring ((struct sockaddr *) &local, size, iplocalport, IP_PORT_BUFLEN) != SASL_OK) { - dprint (1, - (debugfile, - "mutt_sasl_client_new: iptostring for local failed\n")); + debug_print (1, ("iptostring for local failed\n")); return -1; } size = sizeof (remote); if (getpeername (conn->fd, (struct sockaddr *) &remote, &size)) { - dprint (1, - (debugfile, - "mutt_sasl_client_new: getsockname for remote failed\n")); + debug_print (1, ("getsockname for remote failed\n")); return -1; } else if (iptostring ((struct sockaddr *) &remote, size, ipremoteport, IP_PORT_BUFLEN) != SASL_OK) { - dprint (1, - (debugfile, - "mutt_sasl_client_new: iptostring for remote failed\n")); + debug_print (1, ("iptostring for remote failed\n")); return -1; } - dprint (1, - (debugfile, "local ip: %s, remote ip:%s\n", iplocalport, - ipremoteport)); + 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 - if (rc != SASL_OK) { - dprint (1, (debugfile, - "mutt_sasl_client_new: Error allocating SASL connection\n")); + debug_print (1, ("Error allocating SASL connection\n")); return -1; } /*** set sasl IP properties, necessary for use with krb4 ***/ /* Do we need to fail if this fails? I would assume having these unset - * would just disable KRB4. Who wrote this code? I'm not sure how this - * interacts with the NSS code either, since that mucks with the fd. */ -#ifndef USE_SASL2 /* with SASLv2 this all happens in sasl_client_new */ + * would just disable KRB4. Who wrote this code? + */ { struct sockaddr_in local, remote; socklen_t size; @@ -278,72 +240,47 @@ 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) { - dprint (1, (debugfile, - "mutt_sasl_client_new: Error setting local IP address\n")); + 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) { - dprint (1, (debugfile, - "mutt_sasl_client_new: Error setting remote IP address\n")); + 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) { - dprint (1, (debugfile, - "mutt_sasl_client_new: Error setting security properties\n")); + debug_print (1, ("Error setting security properties\n")); return -1; } - /* we currently don't have an SSF finder for NSS (I don't know the API). - * If someone does it'd probably be trivial to write mutt_nss_get_ssf(). - * I have a feeling more SSL code could be shared between those two files, - * but I haven't looked into it yet, since I still don't know the APIs. */ -#if (defined(USE_SSL) || defined(USE_GNUTLS) && !defined(USE_NSS)) - if (conn->account.flags & M_ACCT_SSL) { -#ifdef USE_SASL2 /* I'm not sure this actually has an effect, at least with SASLv2 */ - dprint (2, (debugfile, "External SSF: %d\n", conn->ssf)); + if (conn->ssf) { + 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; - dprint (2, (debugfile, "External SSF: %d\n", extprops.ssf)); - if (sasl_setprop (*saslconn, SASL_SSF_EXTERNAL, &extprops) != SASL_OK) -#endif { - dprint (1, - (debugfile, - "mutt_sasl_client_new: Error setting external properties\n")); + debug_print (1, ("Error setting external properties\n")); return -1; } -#ifdef USE_SASL2 - dprint (2, - (debugfile, "External authentication name: %s\n", - conn->account.user)); + debug_print (2, ("External authentication name: %s\n", conn->account.user)); if (sasl_setprop (*saslconn, SASL_AUTH_EXTERNAL, conn->account.user) != SASL_OK) { - dprint (1, - (debugfile, - "mutt_sasl_client_new: Error setting external properties\n")); + debug_print (1, ("Error setting external properties\n")); return -1; } -#endif } -#endif return 0; } @@ -354,12 +291,12 @@ sasl_callback_t *mutt_sasl_get_callbacks (ACCOUNT * account) callback = mutt_sasl_callbacks; - callback->id = SASL_CB_AUTHNAME; + callback->id = SASL_CB_USER; callback->proc = mutt_sasl_cb_authname; callback->context = account; callback++; - callback->id = SASL_CB_USER; + callback->id = SASL_CB_AUTHNAME; callback->proc = mutt_sasl_cb_authname; callback->context = account; callback++; @@ -387,20 +324,15 @@ int mutt_sasl_interact (sasl_interact_t * interaction) char resp[SHORT_STRING]; while (interaction->id != SASL_CB_LIST_END) { - dprint (2, - (debugfile, - "mutt_sasl_interact: filling in SASL interaction %ld.\n", - interaction->id)); + 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 = mutt_strlen (resp) + 1; - interaction->result = safe_malloc (interaction->len); - memcpy (interaction->result, resp, interaction->len); - + interaction->len = m_strlen(resp) + 1; + interaction->result = p_dupstr(resp, interaction->len - 1); interaction++; } @@ -425,27 +357,17 @@ 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 *) safe_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 - dprint (3, (debugfile, "SASL protection strength: %u\n", *sasldata->ssf)); + sasl_getprop (saslconn, SASL_SSF, (const void **)(void *)&sasldata->ssf); + debug_print (3, ("SASL protection strength: %u\n", *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 - dprint (3, - (debugfile, "SASL protection buffer size: %u\n", - *sasldata->pbufsize)); + (const void **)(void *)&sasldata->pbufsize); + debug_print (3, ("SASL protection buffer size: %u\n", *sasldata->pbufsize)); /* clear input buffer */ sasldata->buf = NULL; @@ -467,16 +389,19 @@ void mutt_sasl_setup_conn (CONNECTION * conn, sasl_conn_t * saslconn) conn->conn_write = mutt_sasl_conn_write; } +void mutt_sasl_done (void) { + sasl_done (); +} + /* mutt_sasl_cb_log: callback to log SASL messages */ static int mutt_sasl_cb_log (void *context, int priority, const char *message) { - dprint (priority, (debugfile, "SASL: %s\n", message)); + debug_print (priority, ("SASL: %s\n", message)); return SASL_OK; } -/* mutt_sasl_cb_authname: callback to retrieve authname or user (mutt - * doesn't distinguish, even if some SASL plugins do) from ACCOUNT */ +/* mutt_sasl_cb_authname: callback to retrieve authname or user from ACCOUNT */ static int mutt_sasl_cb_authname (void *context, int id, const char **result, unsigned *len) { @@ -489,17 +414,22 @@ static int mutt_sasl_cb_authname (void *context, int id, const char **result, if (!account) return SASL_BADPARAM; - dprint (2, (debugfile, "mutt_sasl_cb_authname: getting %s for %s:%u\n", + debug_print (2, ("getting %s for %s:%u\n", id == SASL_CB_AUTHNAME ? "authname" : "user", account->host, account->port)); - if (mutt_account_getuser (account)) - return SASL_FAIL; - - *result = account->user; + if (id == SASL_CB_AUTHNAME) { + if (mutt_account_getlogin (account)) + return SASL_FAIL; + *result = account->login; + } else { + if (mutt_account_getuser (account)) + return SASL_FAIL; + *result = account->user; + } if (len) - *len = strlen (*result); + *len = m_strlen(*result); return SASL_OK; } @@ -513,18 +443,17 @@ static int mutt_sasl_cb_pass (sasl_conn_t * conn, void *context, int id, if (!account || !psecret) return SASL_BADPARAM; - dprint (2, (debugfile, - "mutt_sasl_cb_pass: getting password for %s@%s:%u\n", - account->user, account->host, account->port)); + 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 = strlen (account->pass); + len = m_strlen(account->pass); - *psecret = (sasl_secret_t *) safe_malloc (sizeof (sasl_secret_t) + len); + *psecret = xmalloc(sizeof(sasl_secret_t) + len); (*psecret)->len = len; - strcpy ((*psecret)->data, account->pass); /* __STRCPY_CHECKED__ */ + strcpy ((char*) (*psecret)->data, account->pass); /* __STRCPY_CHECKED__ */ return SASL_OK; } @@ -564,10 +493,8 @@ static int mutt_sasl_conn_close (CONNECTION * conn) /* release sasl resources */ sasl_dispose (&sasldata->saslconn); -#ifndef USE_SASL2 - FREE (&sasldata->buf); -#endif - FREE (&sasldata); + p_delete(&sasldata->buf); + p_delete(&sasldata); /* call underlying close */ rc = (conn->conn_close) (conn); @@ -597,9 +524,7 @@ static int mutt_sasl_conn_read (CONNECTION * conn, char *buf, size_t len) conn->sockdata = sasldata->sockdata; -#ifndef USE_SASL2 - FREE (&sasldata->buf); -#endif + p_delete(&sasldata->buf); sasldata->bpos = 0; sasldata->blen = 0; @@ -614,7 +539,7 @@ 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) { - dprint (1, (debugfile, "SASL decode failed: %s\n", + debug_print (1, ("SASL decode failed: %s\n", sasl_errstring (rc, NULL, NULL))); goto out; } @@ -644,11 +569,7 @@ static int mutt_sasl_conn_write (CONNECTION * conn, const char *buf, SASL_DATA *sasldata; int rc; -#ifdef USE_SASL2 const char *pbuf; -#else - char *pbuf; -#endif unsigned int olen, plen; sasldata = (SASL_DATA *) conn->sockdata; @@ -662,15 +583,13 @@ static int mutt_sasl_conn_write (CONNECTION * conn, const char *buf, rc = sasl_encode (sasldata->saslconn, buf, olen, &pbuf, &plen); if (rc != SASL_OK) { - dprint (1, (debugfile, "SASL encoding failed: %s\n", + 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 - FREE (&pbuf); -#endif + p_delete(&pbuf); if (rc != plen) goto fail;