# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "account.h"
#include "mutt_sasl.h"
-#include "mutt_socket.h"
+#include <lib-network/mutt_socket.h>
-#include "lib/mem.h"
#include "lib/debug.h"
-#ifdef USE_SASL2
#include <errno.h>
#include <netdb.h>
#include <sasl/sasl.h>
-#else
-#include <sasl.h>
-#endif
+
#include <sys/socket.h>
#include <netinet/in.h>
-#ifdef USE_SASL2
static int getnameinfo_err (int ret)
{
int err;
}
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_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)
if (ret)
return getnameinfo_err (ret);
- if (outlen < safe_strlen (hbuf) + safe_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;
{
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;
return -1;
}
-#ifdef USE_SASL2
size = sizeof (local);
if (getsockname (conn->fd, (struct sockaddr *) &local, &size)) {
debug_print (1, ("getsockname for local failed\n"));
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;
/*** 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;
}
#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;
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 */
+ 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;
- 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;
}
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++;
if (mutt_get_field (prompt, resp, sizeof (resp), 0))
return SASL_FAIL;
- interaction->len = safe_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++;
}
* 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
+ 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 */
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)
{
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)
{
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 = safe_strlen (*result);
+ *len = m_strlen(*result);
return SASL_OK;
}
return SASL_BADPARAM;
debug_print (2, ("getting password for %s@%s:%u\n",
- account->user, account->host, account->port));
+ account->login, account->host, account->port));
if (mutt_account_getpass (account))
return SASL_FAIL;
- len = safe_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;
}
/* 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);
conn->sockdata = sasldata->sockdata;
-#ifndef USE_SASL2
- FREE (&sasldata->buf);
-#endif
+ p_delete(&sasldata->buf);
sasldata->bpos = 0;
sasldata->blen = 0;
SASL_DATA *sasldata;
int rc;
-#ifdef USE_SASL2
const char *pbuf;
-#else
- char *pbuf;
-#endif
unsigned int olen, plen;
sasldata = (SASL_DATA *) conn->sockdata;
}
rc = (sasldata->msasl_write) (conn, pbuf, plen);
-#ifndef USE_SASL2
- FREE (&pbuf);
-#endif
+ p_delete(&pbuf);
if (rc != plen)
goto fail;
projects / apps / madmutt.git / blobdiff