aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Merge branch 'sasl-timeout' into 'security'

Browse Source 
Fix Sasl timeout error

See merge request irssi/irssi!33
This commit is contained in:
Nei 2018-02-06 06:46:11 +00:00
commit 12483c688a
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/irc/core/sasl.c
View File

@ -55,10 +55,21 @@ static gboolean sasl_timeout(IRC_SERVER_REC *server)
return FALSE; return FALSE;
} }
static void sasl_timeout_stop(IRC_SERVER_REC *server)
{
/* Stop any pending timeout, if any */
if (server->sasl_timeout != 0) {
g_source_remove(server->sasl_timeout);
server->sasl_timeout = 0;
}
}
static void sasl_start(IRC_SERVER_REC *server, const char *data, const char *from) static void sasl_start(IRC_SERVER_REC *server, const char *data, const char *from)
{ {
IRC_SERVER_CONNECT_REC *conn; IRC_SERVER_CONNECT_REC *conn;
sasl_timeout_stop(server);
conn = server->connrec; conn = server->connrec;
switch (conn->sasl_mechanism) { switch (conn->sasl_mechanism) {
@ -77,11 +88,6 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from
{ {
char *params, *error; char *params, *error;
/* Stop any pending timeout, if any */
if (server->sasl_timeout != 0) {
g_source_remove(server->sasl_timeout);
server->sasl_timeout = 0;
}
params = event_get_params(data, 2, NULL, &error); params = event_get_params(data, 2, NULL, &error);
@ -97,10 +103,7 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from
static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *from) static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *from)
{ {
if (server->sasl_timeout != 0) { sasl_timeout_stop(server);
g_source_remove(server->sasl_timeout);
server->sasl_timeout = 0;
}
server->sasl_success = TRUE; server->sasl_success = TRUE;
@ -112,10 +115,7 @@ static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *f
static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *from) static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *from)
{ {
if (server->sasl_timeout != 0) { sasl_timeout_stop(server);
g_source_remove(server->sasl_timeout);
server->sasl_timeout = 0;
}
server->sasl_success = TRUE; server->sasl_success = TRUE;
@ -265,7 +265,7 @@ static void sasl_step_fail(IRC_SERVER_REC *server)
irc_send_cmd_now(server, "AUTHENTICATE *"); irc_send_cmd_now(server, "AUTHENTICATE *");
cap_finish_negotiation(server); cap_finish_negotiation(server);
server->sasl_timeout = 0; sasl_timeout_stop(server);
signal_emit("server sasl failure", 2, server, "The server sent an invalid payload"); signal_emit("server sasl failure", 2, server, "The server sent an invalid payload");
} }
@ -274,11 +274,7 @@ static void sasl_step(IRC_SERVER_REC *server, const char *data, const char *from
{ {
GString *req = NULL; GString *req = NULL;
/* Stop the timer */ sasl_timeout_stop(server);
if (server->sasl_timeout != 0) {
g_source_remove(server->sasl_timeout);
server->sasl_timeout = 0;
}
if (!sasl_reassemble_incoming(server, data, &req)) { if (!sasl_reassemble_incoming(server, data, &req)) {
sasl_step_fail(server); sasl_step_fail(server);
@ -302,10 +298,7 @@ static void sasl_disconnected(IRC_SERVER_REC *server)
return; return;
} }
if (server->sasl_timeout != 0) { sasl_timeout_stop(server);
g_source_remove(server->sasl_timeout);
server->sasl_timeout = 0;
}
} }
void sasl_init(void) void sasl_init(void)