moparisthebest/imapfilter
1
0
Fork 0
mirror of https://github.com/moparisthebest/imapfilter synced 2024-11-14 05:15:09 -05:00
Code Issues Releases Wiki Activity

Improve the failure handling during login/logout

Browse Source 
Some of the requests/responses need to close connection, while some
don't.

Also, now a login error returns a different status value.
This commit is contained in:
Lefteris Chatzimparmpas 2012-02-28 19:52:19 +01:00
parent a4616e5ca5
commit dba6d38403
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/account.lua
View File

@ -69,7 +69,9 @@ function Account._login_user(self)
self._account.ssl, self._account.username,
self._account.password)
self._check_result(self, 'login', r)
if r == false then return true end
if r == false then
error('failed to authenticate to ' .. self._string .. '.', 0)
end
self._account.session = s
self._account.selected = nil

28
src/request.c
View File

@ -24,8 +24,9 @@ int send_continuation(session *ssn, const char *data, size_t len);
#define CHECK(F) \
switch ((F)) { \
case -1: \
case STATUS_BYE: \
goto fail; \
case STATUS_BYE: \
goto abort; \
}
#define TRY(F) \
@ -156,7 +157,7 @@ request_login(session **ssnptr, const char *server, const char *port, const
session *ssn = *ssnptr;
if (*ssnptr && (*ssnptr)->socket != -1)
return STATUS_NONE;
return STATUS_PREAUTH;
if (!*ssnptr) {
ssn = *ssnptr = session_new();
@ -210,13 +211,13 @@ request_login(session **ssnptr, const char *server, const char *port, const
if (r == STATUS_CONTINUE) {
if ((out = auth_cram_md5(user, pass, in)) ==
NULL)
goto fail;
goto abort;
CHECK(send_continuation(ssn, (char *)(out),
strlen((char *)(out))));
xfree(out);
CHECK(rl = response_generic(ssn, t));
} else
goto fail;
goto abort;
}
if (rl != STATUS_OK) {
CHECK(t = send_request(ssn, "LOGIN \"%s\" \"%s\"",
@ -227,7 +228,9 @@ request_login(session **ssnptr, const char *server, const char *port, const
if (rl == STATUS_NO) {
error("username %s or password rejected at %s\n",
ssn->username, ssn->server);
goto fail;
close_connection(ssn);
session_destroy(ssn);
return STATUS_NO;
}
} else {
rl = STATUS_PREAUTH;
@ -248,6 +251,8 @@ request_login(session **ssnptr, const char *server, const char *port, const
}
return rl;
abort:
close_connection(ssn);
fail:
session_destroy(ssn);
@ -261,20 +266,13 @@ fail:
int
request_logout(session *ssn)
{
int t, r;
CHECK(t = send_request(ssn, "LOGOUT"));
CHECK(r = response_generic(ssn, t));
if (r == STATUS_OK) {
if (response_generic(ssn, send_request(ssn, "LOGOUT")) == -1) {
session_destroy(ssn);
} else {
close_connection(ssn);
session_destroy(ssn);
}
return r;
fail:
session_destroy(ssn);
return STATUS_OK;
}