aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-11-03 04:27:19 -05:00
Code

Merge branch 'security' into 'master'

Browse Source 
Security

See merge request irssi/irssi!34
This commit is contained in:
Nei 2018-02-13 09:51:22 +00:00
commit b0d9cb33cd
3 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fe-common/core/chat-completion.c
View File

@ -173,6 +173,7 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
{ {
CHANNEL_REC *channel; CHANNEL_REC *channel;
int own; int own;
g_return_if_fail(nick != NULL);
channel = channel_find(server, target); channel = channel_find(server, target);
if (channel != NULL) { if (channel != NULL) {
@ -185,6 +186,7 @@ static void sig_message_join(SERVER_REC *server, const char *channel,
const char *nick, const char *address) const char *nick, const char *address)
{ {
CHANNEL_REC *chanrec; CHANNEL_REC *chanrec;
g_return_if_fail(nick != NULL);
chanrec = channel_find(server, channel); chanrec = channel_find(server, channel);
if (chanrec != NULL) if (chanrec != NULL)

10
src/fe-common/irc/fe-irc-commands.c
View File

@ -345,15 +345,17 @@ static void cmd_ts(const char *data)
} }
typedef struct { typedef struct {
IRC_SERVER_REC *server; char *server_tag;
char *nick; char *nick;
} OPER_PASS_REC; } OPER_PASS_REC;
static void cmd_oper_got_pass(const char *password, OPER_PASS_REC *rec) static void cmd_oper_got_pass(const char *password, OPER_PASS_REC *rec)
{ {
if (*password != '\0') SERVER_REC *server_rec = server_find_tag(rec->server_tag);
irc_send_cmdv(rec->server, "OPER %s %s", rec->nick, password); if (*password != '\0' && IS_IRC_SERVER(server_rec))
irc_send_cmdv((IRC_SERVER_REC *) server_rec, "OPER %s %s", rec->nick, password);
g_free(rec->nick); g_free(rec->nick);
g_free(rec->server_tag);
g_free(rec); g_free(rec);
} }
@ -374,7 +376,7 @@ static void cmd_oper(const char *data, IRC_SERVER_REC *server)
OPER_PASS_REC *rec; OPER_PASS_REC *rec;
rec = g_new(OPER_PASS_REC, 1); rec = g_new(OPER_PASS_REC, 1);
rec->server = server; rec->server_tag = g_strdup(server->tag);
rec->nick = g_strdup(*nick != '\0' ? nick : server->nick); rec->nick = g_strdup(*nick != '\0' ? nick : server->nick);
format = format_get_text(MODULE_NAME, NULL, server, NULL, format = format_get_text(MODULE_NAME, NULL, server, NULL,

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)