jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Add an option to stop the connection when SASL fails.

Browse Source
This commit is contained in:
LemonBoy 2016-07-12 13:59:46 +02:00
parent 955cf622a5
commit 91c9e871c7
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/fe-common/irc/fe-sasl.c
View File

@ -23,6 +23,9 @@
#include "signals.h" #include "signals.h"
#include "levels.h" #include "levels.h"
#include "irc-servers.h"
#include "settings.h"
#include "printtext.h" #include "printtext.h"
static void sig_sasl_success(IRC_SERVER_REC *server) static void sig_sasl_success(IRC_SERVER_REC *server)
@ -35,14 +38,28 @@ static void sig_sasl_failure(IRC_SERVER_REC *server, const char *reason)
printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_SASL_ERROR, reason); printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_SASL_ERROR, reason);
} }
static void sig_cap_end(IRC_SERVER_REC *server)
{
/* The negotiation has now been terminated, if we didn't manage to
* authenticate successfully with the server just disconnect. */
if (server->sasl_success == FALSE &&
settings_get_bool("sasl_disconnect_on_failure"))
server_disconnect(SERVER(server));
}
void fe_sasl_init(void) void fe_sasl_init(void)
{ {
settings_add_bool("server", "sasl_disconnect_on_failure", TRUE);
signal_add("server sasl success", (SIGNAL_FUNC) sig_sasl_success); signal_add("server sasl success", (SIGNAL_FUNC) sig_sasl_success);
signal_add("server sasl failure", (SIGNAL_FUNC) sig_sasl_failure); signal_add("server sasl failure", (SIGNAL_FUNC) sig_sasl_failure);
signal_add_first("server cap end", (SIGNAL_FUNC) sig_cap_end);
} }
void fe_sasl_deinit(void) void fe_sasl_deinit(void)
{ {
signal_remove("server sasl success", (SIGNAL_FUNC) sig_sasl_success); signal_remove("server sasl success", (SIGNAL_FUNC) sig_sasl_success);
signal_remove("server sasl failure", (SIGNAL_FUNC) sig_sasl_failure); signal_remove("server sasl failure", (SIGNAL_FUNC) sig_sasl_failure);
signal_remove("server cap end", (SIGNAL_FUNC) sig_cap_end);
} }

1
src/irc/core/irc-servers.h
View File

@ -68,6 +68,7 @@ struct _IRC_SERVER_REC {
unsigned int motd_got:1; /* We've received MOTD */ unsigned int motd_got:1; /* We've received MOTD */
unsigned int isupport_sent:1; /* Server has sent us an isupport reply */ unsigned int isupport_sent:1; /* Server has sent us an isupport reply */
unsigned int cap_complete:1; /* We've done the initial CAP negotiation */ unsigned int cap_complete:1; /* We've done the initial CAP negotiation */
unsigned int sasl_success:1; /* Did we authenticate successfully ? */
int max_kicks_in_cmd; /* max. number of people to kick with one /KICK command */ int max_kicks_in_cmd; /* max. number of people to kick with one /KICK command */
int max_modes_in_cmd; /* max. number of mode changes in one /MODE command */ int max_modes_in_cmd; /* max. number of mode changes in one /MODE command */

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

@ -48,6 +48,7 @@ static gboolean sasl_timeout(IRC_SERVER_REC *server)
cap_finish_negotiation(server); cap_finish_negotiation(server);
server->sasl_timeout = 0; server->sasl_timeout = 0;
server->sasl_success = FALSE;
signal_emit("server sasl failure", 2, server, "The authentication timed out"); signal_emit("server sasl failure", 2, server, "The authentication timed out");
@ -84,6 +85,8 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from
params = event_get_params(data, 2, NULL, &error); params = event_get_params(data, 2, NULL, &error);
server->sasl_success = FALSE;
signal_emit("server sasl failure", 2, server, error); signal_emit("server sasl failure", 2, server, error);
/* Terminate the negotiation */ /* Terminate the negotiation */
@ -99,6 +102,8 @@ static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *f
server->sasl_timeout = 0; server->sasl_timeout = 0;
} }
server->sasl_success = TRUE;
signal_emit("server sasl success", 1, server); signal_emit("server sasl success", 1, server);
/* We're already authenticated, do nothing */ /* We're already authenticated, do nothing */
@ -112,6 +117,8 @@ static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *f
server->sasl_timeout = 0; server->sasl_timeout = 0;
} }
server->sasl_success = TRUE;
signal_emit("server sasl success", 1, server); signal_emit("server sasl success", 1, server);
/* The authentication succeeded, time to finish the CAP negotiation */ /* The authentication succeeded, time to finish the CAP negotiation */