projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more charset improvements.
[apps/madmutt.git]
/
pop
/
pop_auth.c
diff --git
a/pop/pop_auth.c
b/pop/pop_auth.c
index
2583e18
..
5cb2519
100644
(file)
--- a/
pop/pop_auth.c
+++ b/
pop/pop_auth.c
@@
-11,23
+11,22
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+#include <lib-hash/hash.h>
+
#include "mutt.h"
#include "mx.h"
#include "mutt.h"
#include "mx.h"
-#include "md5.h"
#include "pop.h"
#include "pop.h"
+
#include <string.h>
#include <unistd.h>
#ifdef USE_SASL
#include <string.h>
#include <unistd.h>
#ifdef USE_SASL
-#ifdef USE_SASL2
#include <sasl/sasl.h>
#include <sasl/saslutil.h>
#include <sasl/sasl.h>
#include <sasl/saslutil.h>
-#else
-#include <sasl.h>
-#include <saslutil.h>
-#endif
-
#include "mutt_sasl.h"
#endif
#include "mutt_sasl.h"
#endif
@@
-42,31
+41,23
@@
static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
char inbuf[LONG_STRING];
const char *mech;
char inbuf[LONG_STRING];
const char *mech;
-#ifdef USE_SASL
2
+#ifdef USE_SASL
const char *pc = NULL;
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) {
#endif
unsigned int len, olen;
unsigned char client_start;
if (mutt_sasl_client_new (pop_data->conn, &saslconn) < 0) {
- dprint (1,
- (debugfile,
- "pop_auth_sasl: Error allocating SASL connection.\n"));
return POP_A_FAILURE;
}
if (!method)
method = pop_data->auth_list;
return POP_A_FAILURE;
}
if (!method)
method = pop_data->auth_list;
-
FOREVER
{
-#ifdef USE_SASL
2
+
for (;;)
{
+#ifdef USE_SASL
rc =
sasl_client_start (saslconn, method, &interaction, &pc, &olen, &mech);
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;
#endif
if (rc != SASL_INTERACT)
break;
@@
-74,10
+65,6
@@
static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
}
if (rc != SASL_OK && rc != SASL_CONTINUE) {
}
if (rc != SASL_OK && rc != SASL_CONTINUE) {
- dprint (1,
- (debugfile,
- "pop_auth_sasl: Failure starting authentication exchange. No shared mechanisms?\n"));
-
/* SASL doesn't support suggested mechanisms, so fall back */
return POP_A_UNAVAIL;
}
/* SASL doesn't support suggested mechanisms, so fall back */
return POP_A_UNAVAIL;
}
@@
-90,8
+77,8
@@
static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
olen = strlen (buf);
/* looping protocol */
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);
mutt_socket_write (pop_data->conn, buf);
if (mutt_socket_readln (inbuf, sizeof (inbuf), pop_data->conn) < 0) {
sasl_dispose (&saslconn);
@@
-102,23
+89,17
@@
static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
if (rc != SASL_CONTINUE)
break;
if (rc != SASL_CONTINUE)
break;
-#ifdef USE_SASL
2
- if (!m
utt_strncmp
(inbuf, "+ ", 2)
+#ifdef USE_SASL
+ if (!m
_strncmp
(inbuf, "+ ", 2)
&& sasl_decode64 (inbuf, strlen (inbuf), buf, LONG_STRING - 1,
&len) != SASL_OK)
&& sasl_decode64 (inbuf, strlen (inbuf), buf, LONG_STRING - 1,
&len) != SASL_OK)
-#else
- if (!mutt_strncmp (inbuf, "+ ", 2)
- && sasl_decode64 (inbuf, strlen (inbuf), buf, &len) != SASL_OK)
#endif
{
#endif
{
- dprint (1,
- (debugfile,
- "pop_auth_sasl: error base64-decoding server response.\n"));
goto bail;
}
if (!client_start)
goto bail;
}
if (!client_start)
-
FOREVER
{
+
for (;;)
{
rc = sasl_client_step (saslconn, buf, len, &interaction, &pc, &olen);
if (rc != SASL_INTERACT)
break;
rc = sasl_client_step (saslconn, buf, len, &interaction, &pc, &olen);
if (rc != SASL_INTERACT)
break;
@@
-133,16
+114,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) {
/* send out response, or line break if none needed */
if (pc) {
if (sasl_encode64 (pc, olen, buf, sizeof (buf), &olen) != SASL_OK) {
- dprint (1,
- (debugfile,
- "pop_auth_sasl: error base64-encoding client response.\n"));
goto bail;
}
/* sasl_client_st(art|ep) allocate pc with malloc, expect me to
* free it */
goto bail;
}
/* sasl_client_st(art|ep) allocate pc with malloc, expect me to
* free it */
-#ifndef USE_SASL
2
-
FREE
(&pc);
+#ifndef USE_SASL
+
p_delete
(&pc);
#endif
}
}
#endif
}
}
@@
-150,7
+128,7
@@
static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
if (rc != SASL_OK)
goto bail;
if (rc != SASL_OK)
goto bail;
- if (!m
utt_strncmp
(inbuf, "+OK", 3)) {
+ if (!m
_strncmp
(inbuf, "+OK", 3)) {
mutt_sasl_setup_conn (pop_data->conn, saslconn);
return POP_A_SUCCESS;
}
mutt_sasl_setup_conn (pop_data->conn, saslconn);
return POP_A_SUCCESS;
}
@@
-159,9
+137,9
@@
bail:
sasl_dispose (&saslconn);
/* terminate SASL sessoin if the last responce is not +OK nor -ERR */
sasl_dispose (&saslconn);
/* terminate SASL sessoin if the last responce is not +OK nor -ERR */
- if (!m
utt_strncmp
(inbuf, "+ ", 2)) {
+ if (!m
_strncmp
(inbuf, "+ ", 2)) {
snprintf (buf, sizeof (buf), "*\r\n");
snprintf (buf, sizeof (buf), "*\r\n");
- if (pop_query (pop_data, buf, sizeof (buf)) ==
-1
)
+ if (pop_query (pop_data, buf, sizeof (buf)) ==
PQ_NOT_CONNECTED
)
return POP_A_SOCKET;
}
return POP_A_SOCKET;
}
@@
-178,16
+156,17
@@
void pop_apop_timestamp (POP_DATA * pop_data, char *buf)
{
char *p1, *p2;
{
char *p1, *p2;
-
FREE
(&pop_data->timestamp);
+
p_delete
(&pop_data->timestamp);
if ((p1 = strchr (buf, '<')) && (p2 = strchr (p1, '>'))) {
p2[1] = '\0';
if ((p1 = strchr (buf, '<')) && (p2 = strchr (p1, '>'))) {
p2[1] = '\0';
- pop_data->timestamp =
safe_strdup
(p1);
+ pop_data->timestamp =
m_strdup
(p1);
}
}
/* APOP authenticator */
}
}
/* 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];
{
MD5_CTX mdContext;
unsigned char digest[16];
@@
-208,34
+187,38
@@
static pop_auth_res_t pop_auth_apop (POP_DATA * pop_data, const char *method)
strlen (pop_data->conn->account.pass));
MD5Final (digest, &mdContext);
strlen (pop_data->conn->account.pass));
MD5Final (digest, &mdContext);
- for (i = 0; i < s
izeof
(digest); i++)
+ for (i = 0; i < s
sizeof
(digest); i++)
sprintf (hash + 2 * i, "%02x", digest[i]);
/* Send APOP command to server */
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))) {
switch (pop_query (pop_data, buf, sizeof (buf))) {
- case
0
:
+ case
PQ_OK
:
return POP_A_SUCCESS;
return POP_A_SUCCESS;
- case
-1
:
+ case
PQ_NOT_CONNECTED
:
return POP_A_SOCKET;
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 */
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];
{
char buf[LONG_STRING];
-
int
ret;
+
pop_query_status
ret;
- if (
!pop_data->cmd_user
)
+ if (
pop_data->cmd_user == CMD_NOT_AVAILABLE
)
return POP_A_UNAVAIL;
mutt_message _("Logging in...");
return POP_A_UNAVAIL;
mutt_message _("Logging in...");
@@
-243,37
+226,33
@@
static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, const char *method)
snprintf (buf, sizeof (buf), "USER %s\r\n", pop_data->conn->account.user);
ret = pop_query (pop_data, buf, sizeof (buf));
snprintf (buf, sizeof (buf), "USER %s\r\n", pop_data->conn->account.user);
ret = pop_query (pop_data, buf, sizeof (buf));
- if (pop_data->cmd_user == 2) {
- if (ret == 0) {
- pop_data->cmd_user = 1;
-
- dprint (1, (debugfile, "pop_auth_user: set USER capability\n"));
+ if (pop_data->cmd_user == CMD_UNKNOWN) {
+ if (ret == PQ_OK) {
+ pop_data->cmd_user = CMD_AVAILABLE;
}
}
- if (ret ==
-2
) {
- pop_data->cmd_user =
0
;
+ if (ret ==
PQ_ERR
) {
+ pop_data->cmd_user =
CMD_NOT_AVAILABLE
;
- dprint (1, (debugfile, "pop_auth_user: unset USER capability\n"));
snprintf (pop_data->err_msg, sizeof (pop_data->err_msg),
_("Command USER is not supported by server."));
}
}
snprintf (pop_data->err_msg, sizeof (pop_data->err_msg),
_("Command USER is not supported by server."));
}
}
- if (ret ==
0
) {
+ if (ret ==
PQ_OK
) {
snprintf (buf, sizeof (buf), "PASS %s\r\n", pop_data->conn->account.pass);
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_d (pop_data, buf, sizeof (buf), NULL);
}
switch (ret) {
}
switch (ret) {
- case
0
:
+ case
PQ_OK
:
return POP_A_SUCCESS;
return POP_A_SUCCESS;
- case
-1
:
+ case
PQ_NOT_CONNECTED
:
return POP_A_SOCKET;
return POP_A_SOCKET;
+ case PFD_FUNCT_ERROR:
+ case PQ_ERR:
+ default:
+ break;
}
mutt_error ("%s %s", _("Login failed."), pop_data->err_msg);
}
mutt_error ("%s %s", _("Login failed."), pop_data->err_msg);
@@
-288,7
+267,7
@@
static pop_auth_t pop_authenticators[] = {
#endif
{pop_auth_apop, "apop"},
{pop_auth_user, "user"},
#endif
{pop_auth_apop, "apop"},
{pop_auth_user, "user"},
- {NULL}
+ {NULL
, NULL
}
};
/*
};
/*
@@
-298,9
+277,9
@@
static pop_auth_t pop_authenticators[] = {
* -2 - login failed,
* -3 - authentication canceled.
*/
* -2 - login failed,
* -3 - authentication canceled.
*/
-
int
pop_authenticate (POP_DATA * pop_data)
+
pop_query_status
pop_authenticate (POP_DATA * pop_data)
{
{
- ACCOUNT *ac
c
t = &pop_data->conn->account;
+ ACCOUNT *act = &pop_data->conn->account;
pop_auth_t *authenticator;
char *methods;
char *comma;
pop_auth_t *authenticator;
char *methods;
char *comma;
@@
-308,20
+287,19
@@
int pop_authenticate (POP_DATA * pop_data)
int attempts = 0;
int ret = POP_A_UNAVAIL;
int attempts = 0;
int ret = POP_A_UNAVAIL;
- if (mutt_account_getuser (ac
ct) || !ac
ct->user[0] ||
- mutt_account_getpass (ac
ct) || !ac
ct->pass[0])
- return
-3
;
+ if (mutt_account_getuser (ac
t) || !a
ct->user[0] ||
+ mutt_account_getpass (ac
t) || !a
ct->pass[0])
+ return
PFD_FUNCT_ERROR
;
if (PopAuthenticators && *PopAuthenticators) {
/* Try user-specified list of authentication methods */
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';
method = methods;
while (method) {
comma = strchr (method, ':');
if (comma)
*comma++ = '\0';
- dprint (2, (debugfile, "pop_authenticate: Trying method %s\n", method));
authenticator = pop_authenticators;
while (authenticator->authenticate) {
authenticator = pop_authenticators;
while (authenticator->authenticate) {
@@
-330,12
+308,12
@@
int pop_authenticate (POP_DATA * pop_data)
ret = authenticator->authenticate (pop_data, method);
if (ret == POP_A_SOCKET)
switch (pop_connect (pop_data)) {
ret = authenticator->authenticate (pop_data, method);
if (ret == POP_A_SOCKET)
switch (pop_connect (pop_data)) {
- case
0
:
+ case
PQ_OK
:
{
ret = authenticator->authenticate (pop_data, method);
break;
}
{
ret = authenticator->authenticate (pop_data, method);
break;
}
- case
-2
:
+ case
PQ_ERR
:
ret = POP_A_FAILURE;
}
ret = POP_A_FAILURE;
}
@@
-353,25
+331,23
@@
int pop_authenticate (POP_DATA * pop_data)
method = comma;
}
method = comma;
}
-
FREE
(&methods);
+
p_delete
(&methods);
}
else {
/* Fall back to default: any authenticator */
}
else {
/* Fall back to default: any authenticator */
- dprint (2,
- (debugfile, "pop_authenticate: Using any available method.\n"));
authenticator = pop_authenticators;
while (authenticator->authenticate) {
ret = authenticator->authenticate (pop_data, authenticator->method);
if (ret == POP_A_SOCKET)
switch (pop_connect (pop_data)) {
authenticator = pop_authenticators;
while (authenticator->authenticate) {
ret = authenticator->authenticate (pop_data, authenticator->method);
if (ret == POP_A_SOCKET)
switch (pop_connect (pop_data)) {
- case
0
:
+ case
PQ_OK
:
{
ret =
authenticator->authenticate (pop_data, authenticator->method);
break;
}
{
ret =
authenticator->authenticate (pop_data, authenticator->method);
break;
}
- case
-2
:
+ case
PQ_ERR
:
ret = POP_A_FAILURE;
}
ret = POP_A_FAILURE;
}
@@
-387,13
+363,13
@@
int pop_authenticate (POP_DATA * pop_data)
switch (ret) {
case POP_A_SUCCESS:
switch (ret) {
case POP_A_SUCCESS:
- return
0
;
+ return
PQ_OK
;
case POP_A_SOCKET:
case POP_A_SOCKET:
- return
-1
;
+ return
PQ_NOT_CONNECTED
;
case POP_A_UNAVAIL:
if (!attempts)
mutt_error (_("No authenticators available"));
}
case POP_A_UNAVAIL:
if (!attempts)
mutt_error (_("No authenticators available"));
}
- return
-2
;
+ return
PQ_ERR
;
}
}