X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_sasl.c;h=d5738b635f4c37b5f8dfce6be81b1153f096f7e2;hp=095a9aead0391bf3919ec17be0a243ae78c20b65;hb=08fa240d29322ece4c7bceebfae6c6d3fb856f0e;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258 diff --git a/mutt_sasl.c b/mutt_sasl.c index 095a9ae..d5738b6 100644 --- a/mutt_sasl.c +++ b/mutt_sasl.c @@ -13,25 +13,22 @@ # include "config.h" #endif +#include + #include "mutt.h" #include "account.h" #include "mutt_sasl.h" -#include "mutt_socket.h" +#include -#include "lib/mem.h" #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; @@ -73,16 +70,13 @@ static int getnameinfo_err (int ret) } 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]; @@ -103,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) @@ -123,17 +116,16 @@ 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_start: called before doing a SASL exchange - initialises library - * (if neccessary). */ + * (if necessary). */ int mutt_sasl_start (void) { static unsigned char sasl_init = 0; @@ -172,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; @@ -197,7 +185,6 @@ int mutt_sasl_client_new (CONNECTION * conn, sasl_conn_t ** saslconn) return -1; } -#ifdef USE_SASL2 size = sizeof (local); if (getsockname (conn->fd, (struct sockaddr *) &local, &size)) { debug_print (1, ("getsockname for local failed\n")); @@ -230,12 +217,6 @@ int mutt_sasl_client_new (CONNECTION * conn, sasl_conn_t ** saslconn) 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) { debug_print (1, ("Error allocating SASL connection\n")); return -1; @@ -245,7 +226,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; @@ -272,13 +252,12 @@ int mutt_sasl_client_new (CONNECTION * conn, sasl_conn_t ** saslconn) } #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; @@ -288,31 +267,20 @@ int mutt_sasl_client_new (CONNECTION * conn, sasl_conn_t ** saslconn) 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; } @@ -363,10 +331,8 @@ int mutt_sasl_interact (sasl_interact_t * interaction) 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,24 +357,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 + 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 + (const void **)(void *)&sasldata->pbufsize); debug_print (3, ("SASL protection buffer size: %u\n", *sasldata->pbufsize)); /* clear input buffer */ @@ -431,6 +389,10 @@ 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) { @@ -467,7 +429,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; } @@ -487,9 +449,9 @@ static int mutt_sasl_cb_pass (sasl_conn_t * conn, void *context, int id, 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 +493,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); @@ -564,9 +524,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; @@ -611,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; @@ -635,9 +589,7 @@ static int mutt_sasl_conn_write (CONNECTION * conn, const char *buf, } rc = (sasldata->msasl_write) (conn, pbuf, plen); -#ifndef USE_SASL2 - mem_free (&pbuf); -#endif + p_delete(&pbuf); if (rc != plen) goto fail;