X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop_auth.c;h=976317c7ab04e8ee7a41773238f9fa398f82ad29;hp=1fa17ece0fef7e511eb165631cb12beede724ce4;hb=2afa942ab1afde7acc8c8ef4670cddcbd25b1b3e;hpb=bbc4fd52516a8afefbd14c77e34f8389d6f0a6ed diff --git a/pop/pop_auth.c b/pop/pop_auth.c index 1fa17ec..976317c 100644 --- a/pop/pop_auth.c +++ b/pop/pop_auth.c @@ -7,36 +7,18 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include + +#include +#include #include "mutt.h" -#include "ascii.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 -#ifdef USE_SASL /* SASL authenticator */ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method) { @@ -47,38 +29,26 @@ 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 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 - rc = - sasl_client_start (saslconn, method, &interaction, &pc, &olen, &mech); -#else - rc = sasl_client_start (saslconn, method, NULL, - &interaction, &pc, &olen, &mech); -#endif + for (;;) { + rc = sasl_client_start (saslconn, method, &interaction, &pc, &olen, + &mech); if (rc != SASL_INTERACT) break; mutt_sasl_interact (interaction); } 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; } @@ -91,8 +61,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); @@ -103,21 +73,15 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method) if (rc != SASL_CONTINUE) break; -#ifdef USE_SASL2 - if (!str_ncmp (inbuf, "+ ", 2) + if (!m_strncmp(inbuf, "+ ", 2) && sasl_decode64 (inbuf, strlen (inbuf), buf, LONG_STRING - 1, &len) != SASL_OK) -#else - if (!str_ncmp (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; @@ -132,22 +96,19 @@ 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 - mem_free (&pc); -#endif + p_delete((char **)&pc); } } if (rc != SASL_OK) goto bail; - if (!str_ncmp (inbuf, "+OK", 3)) { + if (!m_strncmp(inbuf, "+OK", 3)) { mutt_sasl_setup_conn (pop_data->conn, saslconn); return POP_A_SUCCESS; } @@ -156,7 +117,7 @@ bail: sasl_dispose (&saslconn); /* terminate SASL sessoin if the last responce is not +OK nor -ERR */ - if (!str_ncmp (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; @@ -168,23 +129,23 @@ bail: return POP_A_FAILURE; } -#endif /* Get the server timestamp for APOP authentication */ void pop_apop_timestamp (POP_DATA * pop_data, char *buf) { char *p1, *p2; - mem_free (&pop_data->timestamp); + p_delete(&pop_data->timestamp); if ((p1 = strchr (buf, '<')) && (p2 = strchr (p1, '>'))) { p2[1] = '\0'; - pop_data->timestamp = str_dup (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]; @@ -205,29 +166,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; @@ -243,14 +208,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.")); } @@ -258,12 +220,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) { @@ -271,6 +228,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); @@ -280,12 +241,10 @@ static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, const char *method) } static pop_auth_t pop_authenticators[] = { -#ifdef USE_SASL {pop_auth_sasl, NULL}, -#endif {pop_auth_apop, "apop"}, {pop_auth_user, "user"}, - {NULL} + {NULL, NULL} }; /* @@ -297,7 +256,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; @@ -305,20 +264,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 = str_dup (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) { @@ -350,11 +308,10 @@ pop_query_status pop_authenticate (POP_DATA * pop_data) method = comma; } - mem_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) {