mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-02-23 15:10:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

pop3: Added support for sasl login authentication

Browse Source
This commit is contained in:
Steve Holme 2012-06-01 15:59:29 +01:00
parent 379efd62aa
commit 2df6e6d9f8
2 changed files with 87 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
lib/pop3.c
View File

@ -282,6 +282,8 @@ static void state(struct connectdata *conn, pop3state newstate)
"STARTTLS", "STARTTLS",
"AUTH", "AUTH",
"AUTH_PLAIN", "AUTH_PLAIN",
"AUTH_LOGIN",
"AUTH_LOGIN_PASSWD",
"AUTH_FINAL", "AUTH_FINAL",
"USER", "USER",
"PASS", "PASS",
@ -343,7 +345,12 @@ static CURLcode pop3_authenticate(struct connectdata *conn)
/* Check supported authentication mechanisms by decreasing order of /* Check supported authentication mechanisms by decreasing order of
security */ security */
if(pop3c->authmechs & SASL_AUTH_PLAIN) { if(pop3c->authmechs & SASL_AUTH_LOGIN) {
mech = "LOGIN";
authstate = POP3_AUTH_LOGIN;
pop3c->authused = SASL_AUTH_LOGIN;
}
else if(pop3c->authmechs & SASL_AUTH_PLAIN) {
mech = "PLAIN"; mech = "PLAIN";
authstate = POP3_AUTH_PLAIN; authstate = POP3_AUTH_PLAIN;
pop3c->authused = SASL_AUTH_PLAIN; pop3c->authused = SASL_AUTH_PLAIN;
@ -492,7 +499,75 @@ static CURLcode pop3_state_auth_plain_resp(struct connectdata *conn,
return result; return result;
} }
/* For final responses in the AUTH sequence */ /* For AUTH LOGIN responses */
static CURLcode pop3_state_auth_login_resp(struct connectdata *conn,
int pop3code,
pop3state instate)
{
CURLcode result = CURLE_OK;
struct SessionHandle *data = conn->data;
size_t len = 0;
char *authuser = NULL;
(void)instate; /* no use for this yet */
if(pop3code != '+') {
failf(data, "Access denied: %d", pop3code);
result = CURLE_LOGIN_DENIED;
}
else {
result = Curl_sasl_create_login_message(conn->data, conn->user,
&authuser, &len);
if(!result) {
if(authuser) {
result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", authuser);
if(!result)
state(conn, POP3_AUTH_LOGIN_PASSWD);
}
Curl_safefree(authuser);
}
}
return result;
}
/* For AUTH LOGIN user entry responses */
static CURLcode pop3_state_auth_login_password_resp(struct connectdata *conn,
int pop3code,
pop3state instate)
{
CURLcode result = CURLE_OK;
struct SessionHandle *data = conn->data;
size_t len = 0;
char *authpasswd = NULL;
(void)instate; /* no use for this yet */
if(pop3code != '+') {
failf(data, "Access denied: %d", pop3code);
result = CURLE_LOGIN_DENIED;
}
else {
result = Curl_sasl_create_login_message(conn->data, conn->passwd,
&authpasswd, &len);
if(!result) {
if(authpasswd) {
result = Curl_pp_sendf(&conn->proto.pop3c.pp, "%s", authpasswd);
if(!result)
state(conn, POP3_AUTH_FINAL);
}
Curl_safefree(authpasswd);
}
}
return result;
}
/* For final responses to the AUTH sequence */
static CURLcode pop3_state_auth_final_resp(struct connectdata *conn, static CURLcode pop3_state_auth_final_resp(struct connectdata *conn,
int pop3code, int pop3code,
pop3state instate) pop3state instate)
@ -688,6 +763,14 @@ static CURLcode pop3_statemach_act(struct connectdata *conn)
result = pop3_state_auth_plain_resp(conn, pop3code, pop3c->state); result = pop3_state_auth_plain_resp(conn, pop3code, pop3c->state);
break; break;
case POP3_AUTH_LOGIN:
result = pop3_state_auth_login_resp(conn, pop3code, pop3c->state);
break;
case POP3_AUTH_LOGIN_PASSWD:
result = pop3_state_auth_login_password_resp(conn, pop3code, pop3c->state);
break;
case POP3_AUTH_FINAL: case POP3_AUTH_FINAL:
result = pop3_state_auth_final_resp(conn, pop3code, pop3c->state); result = pop3_state_auth_final_resp(conn, pop3code, pop3c->state);
break; break;

2
lib/pop3.h
View File

@ -32,6 +32,8 @@ typedef enum {
POP3_STARTTLS, POP3_STARTTLS,
POP3_AUTH, POP3_AUTH,
POP3_AUTH_PLAIN, POP3_AUTH_PLAIN,
POP3_AUTH_LOGIN,
POP3_AUTH_LOGIN_PASSWD,
POP3_AUTH_FINAL, POP3_AUTH_FINAL,
POP3_USER, POP3_USER,
POP3_PASS, POP3_PASS,