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 pull request #304 from LemonBoy/sasl_user_options

Browse Source 
Allow the user to set and modify the SASL parameters
This commit is contained in:
ailin-nemui 2015-09-26 19:07:54 +02:00
commit 18989e76db
4 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/help/in/network.in
View File

@ -32,6 +32,12 @@
additional commands to the server. additional commands to the server.
-cmdmax: Specifies the maximum number of commands to perform before -cmdmax: Specifies the maximum number of commands to perform before
starting the internal flood protection. starting the internal flood protection.
-sasl_mechanism Specifies the mechanism to use for the SASL authentication.
At the moment irssi only supports the 'plain' and the
'external' mechanisms.
-sasl_username Specifies the username to use during the SASL authentication.
-sasl_password Specifies the password to use during the SASL authentication.
The name of the network to add, edit or remove; if no parameter is given, The name of the network to add, edit or remove; if no parameter is given,
the list of networks will be displayed. the list of networks will be displayed.

24
src/fe-common/irc/fe-ircnet.c
View File

@ -82,10 +82,12 @@ static void cmd_network_list(void)
} }
/* SYNTAX: NETWORK ADD [-nick <nick>] [-user <user>] [-realname <name>] /* SYNTAX: NETWORK ADD [-nick <nick>] [-user <user>] [-realname <name>]
[-host <host>] [-usermode <mode>] [-autosendcmd <cmd>] [-host <host>] [-usermode <mode>] [-autosendcmd <cmd>]
[-querychans <count>] [-whois <count>] [-msgs <count>] [-querychans <count>] [-whois <count>] [-msgs <count>]
[-kicks <count>] [-modes <count>] [-kicks <count>] [-modes <count>] [-cmdspeed <ms>]
[-cmdspeed <ms>] [-cmdmax <count>] <name> */ [-cmdmax <count>] [-sasl_mechanism <mechanism>]
[-sasl_username <username>] [-sasl_password <password>]
<name> */
static void cmd_network_add(const char *data) static void cmd_network_add(const char *data)
{ {
GHashTable *optlist; GHashTable *optlist;
@ -112,6 +114,9 @@ static void cmd_network_add(const char *data)
} }
if (g_hash_table_lookup(optlist, "usermode")) g_free_and_null(rec->usermode); if (g_hash_table_lookup(optlist, "usermode")) g_free_and_null(rec->usermode);
if (g_hash_table_lookup(optlist, "autosendcmd")) g_free_and_null(rec->autosendcmd); if (g_hash_table_lookup(optlist, "autosendcmd")) g_free_and_null(rec->autosendcmd);
if (g_hash_table_lookup(optlist, "sasl_mechanism")) g_free_and_null(rec->sasl_mechanism);
if (g_hash_table_lookup(optlist, "sasl_username")) g_free_and_null(rec->sasl_username);
if (g_hash_table_lookup(optlist, "sasl_password")) g_free_and_null(rec->sasl_password);
} }
value = g_hash_table_lookup(optlist, "kicks"); value = g_hash_table_lookup(optlist, "kicks");
@ -148,6 +153,14 @@ static void cmd_network_add(const char *data)
value = g_hash_table_lookup(optlist, "autosendcmd"); value = g_hash_table_lookup(optlist, "autosendcmd");
if (value != NULL && *value != '\0') rec->autosendcmd = g_strdup(value); if (value != NULL && *value != '\0') rec->autosendcmd = g_strdup(value);
/* the validity of the parameters is checked in sig_server_setup_fill_chatnet */
value = g_hash_table_lookup(optlist, "sasl_mechanism");
if (value != NULL && *value != '\0') rec->sasl_mechanism = g_strdup(value);
value = g_hash_table_lookup(optlist, "sasl_username");
if (value != NULL && *value != '\0') rec->sasl_username = g_strdup(value);
value = g_hash_table_lookup(optlist, "sasl_password");
if (value != NULL && *value != '\0') rec->sasl_password = g_strdup(value);
ircnet_create(rec); ircnet_create(rec);
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NETWORK_ADDED, name); printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_NETWORK_ADDED, name);
@ -186,7 +199,8 @@ void fe_ircnet_init(void)
command_bind("network add", NULL, (SIGNAL_FUNC) cmd_network_add); command_bind("network add", NULL, (SIGNAL_FUNC) cmd_network_add);
command_bind("network remove", NULL, (SIGNAL_FUNC) cmd_network_remove); command_bind("network remove", NULL, (SIGNAL_FUNC) cmd_network_remove);
command_set_options("network add", "-kicks -msgs -modes -whois -cmdspeed -cmdmax -nick -user -realname -host -autosendcmd -querychans -usermode"); command_set_options("network add", "-kicks -msgs -modes -whois -cmdspeed "
"-cmdmax -nick -user -realname -host -autosendcmd -querychans -usermode -sasl_mechanism -sasl_username -sasl_password");
} }
void fe_ircnet_deinit(void) void fe_ircnet_deinit(void)

12
src/irc/core/irc-chatnets.c
View File

@ -49,9 +49,9 @@ static void sig_chatnet_read(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
rec->max_modes = config_node_get_int(node, "max_modes", 0); rec->max_modes = config_node_get_int(node, "max_modes", 0);
rec->max_whois = config_node_get_int(node, "max_whois", 0); rec->max_whois = config_node_get_int(node, "max_whois", 0);
rec->sasl_mechanism = config_node_get_str(node, "sasl_mechanism", NULL); rec->sasl_mechanism = g_strdup(config_node_get_str(node, "sasl_mechanism", NULL));
rec->sasl_username = config_node_get_str(node, "sasl_username", NULL); rec->sasl_username = g_strdup(config_node_get_str(node, "sasl_username", NULL));
rec->sasl_password = config_node_get_str(node, "sasl_password", NULL); rec->sasl_password = g_strdup(config_node_get_str(node, "sasl_password", NULL));
} }
static void sig_chatnet_saved(IRC_CHATNET_REC *rec, CONFIG_NODE *node) static void sig_chatnet_saved(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
@ -88,8 +88,12 @@ static void sig_chatnet_saved(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
static void sig_chatnet_destroyed(IRC_CHATNET_REC *rec) static void sig_chatnet_destroyed(IRC_CHATNET_REC *rec)
{ {
if (IS_IRC_CHATNET(rec)) if (IS_IRC_CHATNET(rec)) {
g_free(rec->usermode); g_free(rec->usermode);
g_free(rec->sasl_mechanism);
g_free(rec->sasl_username);
g_free(rec->sasl_password);
}
} }

2
src/irc/core/irc-servers-setup.c
View File

@ -81,7 +81,7 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
if (ircnet->max_query_chans > 0) if (ircnet->max_query_chans > 0)
conn->max_query_chans = ircnet->max_query_chans; conn->max_query_chans = ircnet->max_query_chans;
/* Validate the SASL parameters filled by sig_chatnet_read() */ /* Validate the SASL parameters filled by sig_chatnet_read() or cmd_network_add */
conn->sasl_mechanism = SASL_MECHANISM_NONE; conn->sasl_mechanism = SASL_MECHANISM_NONE;
if (ircnet->sasl_mechanism != NULL) { if (ircnet->sasl_mechanism != NULL) {