Mirrors/hexchat
1
0
Fork 0
mirror of https://github.com/hexchat/hexchat.git synced 2024-09-19 17:11:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Moved SASL PLAIN authentication to own function

Browse Source
This commit is contained in:
Patrick Okraku 2023-11-01 17:15:23 +01:00 committed by Patrick Griffis
parent 44d14a436b
commit 50ca0d5b09
1 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/common/inbound.c
View File

@ -1901,34 +1901,10 @@ inbound_cap_list (server *serv, char *nick, char *extensions,
NULL, NULL, 0, tags_data->timestamp); NULL, NULL, 0, tags_data->timestamp);
} }
void static void
inbound_sasl_authenticate (server *serv, char *data) plain_authenticate(server *serv, char *user, char *password)
{ {
ircnet *net = (ircnet*)serv->network; char *pass = encode_sasl_pass_plain (user, password);
char *user, *pass = NULL;
const char *mech = sasl_mechanisms[serv->sasl_mech];
/* Got a list of supported mechanisms from outdated inspircd
* just ignore it as it goes against spec */
if (strchr (data, ',') != NULL)
return;
if (net->user && !(net->flags & FLAG_USE_GLOBAL))
user = net->user;
else
user = prefs.hex_irc_user_name;
switch (serv->sasl_mech)
{
case MECH_PLAIN:
pass = encode_sasl_pass_plain (user, serv->password);
break;
#ifdef USE_OPENSSL
case MECH_EXTERNAL:
pass = g_strdup ("+");
break;
#endif
}
if (pass == NULL) if (pass == NULL)
{ {
@ -1955,8 +1931,36 @@ inbound_sasl_authenticate (server *serv, char *data)
} }
if (pass_len % 400 == 0) if (pass_len % 400 == 0)
tcp_sendf (serv, "AUTHENTICATE +\r\n"); tcp_sendf (serv, "AUTHENTICATE +\r\n");
g_free (pass); }
void
inbound_sasl_authenticate (server *serv, char *data)
{
ircnet *net = (ircnet*)serv->network;
char *user, *pass = NULL;
const char *mech = sasl_mechanisms[serv->sasl_mech];
/* Got a list of supported mechanisms from outdated inspircd
* just ignore it as it goes against spec */
if (strchr (data, ',') != NULL)
return;
if (net->user && !(net->flags & FLAG_USE_GLOBAL))
user = net->user;
else
user = prefs.hex_irc_user_name;
switch (serv->sasl_mech)
{
case MECH_PLAIN:
plain_authenticate(serv, user, serv->password);
break;
#ifdef USE_OPENSSL
case MECH_EXTERNAL:
tcp_sendf (serv, "AUTHENTICATE +\r\n");
break;
#endif
}
EMIT_SIGNAL_TIMESTAMP (XP_TE_SASLAUTH, serv->server_session, user, (char*)mech, EMIT_SIGNAL_TIMESTAMP (XP_TE_SASLAUTH, serv->server_session, user, (char*)mech,
NULL, NULL, 0, 0); NULL, NULL, 0, 0);