X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop_auth.c;h=d17d52f0134fbce7117118ed811de9b6bc5ae2a6;hp=840f9e808fd5d46c64cb45a023d097fe7f73e924;hb=d63fe782146b7e2860d45fd6c2cf5369d9b0a87a;hpb=814a01519c9605d479201b99eb16c97b0ad8635d diff --git a/pop/pop_auth.c b/pop/pop_auth.c index 840f9e8..d17d52f 100644 --- a/pop/pop_auth.c +++ b/pop/pop_auth.c @@ -7,31 +7,17 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include + +#include #include "mutt.h" #include "mx.h" -#include "md5.h" #include "pop.h" -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/debug.h" - -#include -#include - #ifdef USE_SASL -#ifdef USE_SASL2 #include #include -#else -#include -#include -#endif - #include "mutt_sasl.h" #endif @@ -46,29 +32,23 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method) char inbuf[LONG_STRING]; const char *mech; -#ifdef USE_SASL2 +#ifdef USE_SASL const char *pc = NULL; -#else - char *pc = NULL; #endif unsigned int len, olen; unsigned char client_start; if (mutt_sasl_client_new (pop_data->conn, &saslconn) < 0) { - debug_print (1, ("Error allocating SASL connection.\n")); return POP_A_FAILURE; } if (!method) method = pop_data->auth_list; - FOREVER { -#ifdef USE_SASL2 + for (;;) { +#ifdef USE_SASL rc = sasl_client_start (saslconn, method, &interaction, &pc, &olen, &mech); -#else - rc = sasl_client_start (saslconn, method, NULL, - &interaction, &pc, &olen, &mech); #endif if (rc != SASL_INTERACT) break; @@ -76,8 +56,6 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method) } if (rc != SASL_OK && rc != SASL_CONTINUE) { - debug_print (1, ("Failure starting authentication exchange. No shared mechanisms?\n")); - /* SASL doesn't support suggested mechanisms, so fall back */ return POP_A_UNAVAIL; } @@ -90,8 +68,8 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method) olen = strlen (buf); /* looping protocol */ - FOREVER { - strfcpy (buf + olen, "\r\n", sizeof (buf) - olen); + for (;;) { + m_strcpy(buf + olen, sizeof(buf) - olen, "\r\n"); mutt_socket_write (pop_data->conn, buf); if (mutt_socket_readln (inbuf, sizeof (inbuf), pop_data->conn) < 0) { sasl_dispose (&saslconn); @@ -102,21 +80,17 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method) if (rc != SASL_CONTINUE) break; -#ifdef USE_SASL2 - if (!safe_strncmp (inbuf, "+ ", 2) +#ifdef USE_SASL + if (!m_strncmp(inbuf, "+ ", 2) && sasl_decode64 (inbuf, strlen (inbuf), buf, LONG_STRING - 1, &len) != SASL_OK) -#else - if (!safe_strncmp (inbuf, "+ ", 2) - && sasl_decode64 (inbuf, strlen (inbuf), buf, &len) != SASL_OK) #endif { - debug_print (1, ("error base64-decoding server response.\n")); goto bail; } if (!client_start) - FOREVER { + for (;;) { rc = sasl_client_step (saslconn, buf, len, &interaction, &pc, &olen); if (rc != SASL_INTERACT) break; @@ -131,14 +105,13 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method) /* send out response, or line break if none needed */ if (pc) { if (sasl_encode64 (pc, olen, buf, sizeof (buf), &olen) != SASL_OK) { - debug_print (1, ("error base64-encoding client response.\n")); goto bail; } /* sasl_client_st(art|ep) allocate pc with malloc, expect me to * free it */ -#ifndef USE_SASL2 - FREE (&pc); +#ifndef USE_SASL + p_delete(&pc); #endif } } @@ -146,7 +119,7 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method) if (rc != SASL_OK) goto bail; - if (!safe_strncmp (inbuf, "+OK", 3)) { + if (!m_strncmp(inbuf, "+OK", 3)) { mutt_sasl_setup_conn (pop_data->conn, saslconn); return POP_A_SUCCESS; } @@ -155,7 +128,7 @@ bail: sasl_dispose (&saslconn); /* terminate SASL sessoin if the last responce is not +OK nor -ERR */ - if (!safe_strncmp (inbuf, "+ ", 2)) { + if (!m_strncmp(inbuf, "+ ", 2)) { snprintf (buf, sizeof (buf), "*\r\n"); if (pop_query (pop_data, buf, sizeof (buf)) == PQ_NOT_CONNECTED) return POP_A_SOCKET; @@ -174,16 +147,17 @@ void pop_apop_timestamp (POP_DATA * pop_data, char *buf) { char *p1, *p2; - FREE (&pop_data->timestamp); + p_delete(&pop_data->timestamp); if ((p1 = strchr (buf, '<')) && (p2 = strchr (p1, '>'))) { p2[1] = '\0'; - pop_data->timestamp = safe_strdup (p1); + pop_data->timestamp = m_strdup(p1); } } /* APOP authenticator */ -static pop_auth_res_t pop_auth_apop (POP_DATA * pop_data, const char *method) +static pop_auth_res_t pop_auth_apop (POP_DATA * pop_data, + const char *method __attribute__ ((unused))) { MD5_CTX mdContext; unsigned char digest[16]; @@ -204,29 +178,33 @@ static pop_auth_res_t pop_auth_apop (POP_DATA * pop_data, const char *method) strlen (pop_data->conn->account.pass)); MD5Final (digest, &mdContext); - for (i = 0; i < sizeof (digest); i++) + for (i = 0; i < ssizeof(digest); i++) sprintf (hash + 2 * i, "%02x", digest[i]); /* Send APOP command to server */ - snprintf (buf, sizeof (buf), "APOP %s %s\r\n", pop_data->conn->account.user, - hash); + snprintf(buf, sizeof(buf), "APOP %s %s\r\n", pop_data->conn->account.user, + hash); switch (pop_query (pop_data, buf, sizeof (buf))) { case PQ_OK: return POP_A_SUCCESS; case PQ_NOT_CONNECTED: return POP_A_SOCKET; + case PFD_FUNCT_ERROR: + case PQ_ERR: + default: + break; } - mutt_error _("APOP authentication failed."); - + mutt_error ("%s %s", _("APOP authentication failed."), pop_data->err_msg); mutt_sleep (2); return POP_A_FAILURE; } /* USER authenticator */ -static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, const char *method) +static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, + const char *method __attribute__ ((unused))) { char buf[LONG_STRING]; pop_query_status ret; @@ -242,14 +220,11 @@ static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, const char *method) if (pop_data->cmd_user == CMD_UNKNOWN) { if (ret == PQ_OK) { pop_data->cmd_user = CMD_AVAILABLE; - - debug_print (1, ("set USER capability\n")); } if (ret == PQ_ERR) { pop_data->cmd_user = CMD_NOT_AVAILABLE; - debug_print (1, ("unset USER capability\n")); snprintf (pop_data->err_msg, sizeof (pop_data->err_msg), _("Command USER is not supported by server.")); } @@ -257,12 +232,7 @@ static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, const char *method) if (ret == PQ_OK) { snprintf (buf, sizeof (buf), "PASS %s\r\n", pop_data->conn->account.pass); - ret = pop_query_d (pop_data, buf, sizeof (buf), -#ifdef DEBUG - /* don't print the password unless we're at the ungodly debugging level */ - DebugLevel < M_SOCK_LOG_FULL ? "PASS *\r\n" : -#endif - NULL); + ret = pop_query (pop_data, buf, sizeof (buf)); } switch (ret) { @@ -270,6 +240,10 @@ static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, const char *method) return POP_A_SUCCESS; case PQ_NOT_CONNECTED: return POP_A_SOCKET; + case PFD_FUNCT_ERROR: + case PQ_ERR: + default: + break; } mutt_error ("%s %s", _("Login failed."), pop_data->err_msg); @@ -284,7 +258,7 @@ static pop_auth_t pop_authenticators[] = { #endif {pop_auth_apop, "apop"}, {pop_auth_user, "user"}, - {NULL} + {NULL, NULL} }; /* @@ -296,7 +270,7 @@ static pop_auth_t pop_authenticators[] = { */ pop_query_status pop_authenticate (POP_DATA * pop_data) { - ACCOUNT *acct = &pop_data->conn->account; + ACCOUNT *act = &pop_data->conn->account; pop_auth_t *authenticator; char *methods; char *comma; @@ -304,20 +278,19 @@ pop_query_status pop_authenticate (POP_DATA * pop_data) int attempts = 0; int ret = POP_A_UNAVAIL; - if (mutt_account_getuser (acct) || !acct->user[0] || - mutt_account_getpass (acct) || !acct->pass[0]) + if (mutt_account_getuser (act) || !act->user[0] || + mutt_account_getpass (act) || !act->pass[0]) return PFD_FUNCT_ERROR; if (PopAuthenticators && *PopAuthenticators) { /* Try user-specified list of authentication methods */ - methods = safe_strdup (PopAuthenticators); + methods = m_strdup(PopAuthenticators); method = methods; while (method) { comma = strchr (method, ':'); if (comma) *comma++ = '\0'; - debug_print (2, ("Trying method %s\n", method)); authenticator = pop_authenticators; while (authenticator->authenticate) { @@ -349,11 +322,10 @@ pop_query_status pop_authenticate (POP_DATA * pop_data) method = comma; } - FREE (&methods); + p_delete(&methods); } else { /* Fall back to default: any authenticator */ - debug_print (2, ("Using any available method.\n")); authenticator = pop_authenticators; while (authenticator->authenticate) {