zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-08 19:30:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

irc-proxy: expire unauthenticated clients

Browse source 
The TCP proxy allocates a client record before PASS is processed. Silent peers can keep unauthenticated connections open indefinitely, even when a proxy password is configured.

Add a configurable one-minute authentication timeout and cancel it after successful registration.
This commit is contained in:
Acts1631 2026-07-09 17:13:04 -04:00 • committed by Acts1631
commit fd44fd8b25
3 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/irc/proxy/listen.c
View file

@ -116,11 +116,21 @@ static void remove_client(CLIENT_REC *rec)
g_free(rec->proxy_address);
net_sendbuffer_destroy(rec->handle, TRUE);
g_source_remove(rec->recv_tag);
if (rec->auth_timeout != -1)
g_source_remove(rec->auth_timeout);
g_free_not_null(rec->nick);
g_free_not_null(rec->addr);
g_free(rec);
}
static int sig_client_auth_timeout(CLIENT_REC *client)
{
client->auth_timeout = -1;
if (!client->connected)
remove_client(client);
return 0;
}
static void proxy_redirect_event(CLIENT_REC *client, const char *command,
int count, const char *arg, int remote)
{
@ -222,6 +232,10 @@ static void handle_client_connect_cmd(CLIENT_REC *client,
/* client didn't send us PASS, kill it */
remove_client(client);
} else {
if (client->auth_timeout != -1) {
g_source_remove(client->auth_timeout);
client->auth_timeout = -1;
}
signal_emit("proxy client connected", 1, client);
printtext(client->server, NULL, MSGLEVEL_CLIENTNOTICE,
"Proxy: Client %s connected",
@ -471,6 +485,8 @@ static void sig_listen(LISTEN_REC *listen)
IRC_SERVER(server_find_chatnet(listen->ircnet));
}
rec->recv_tag = i_input_add(handle, I_INPUT_READ, (GInputFunction) sig_listen_client, rec);
rec->auth_timeout = g_timeout_add(settings_get_time("irssiproxy_timeout"),
(GSourceFunc) sig_client_auth_timeout, rec);
proxy_clients = g_slist_prepend(proxy_clients, rec);
listen->clients = g_slist_prepend(listen->clients, rec);

1
src/irc/proxy/proxy.c
View file

@ -75,6 +75,7 @@ static void irc_proxy_setup_changed(void)
void irc_proxy_init(void)
{
settings_add_bool("irssiproxy", "irssiproxy_prefer_ipv6", TRUE);
settings_add_time("irssiproxy", "irssiproxy_timeout", "1min");
settings_add_str("irssiproxy", "irssiproxy_ports", "");
settings_add_str("irssiproxy", "irssiproxy_password", "");
settings_add_str("irssiproxy", "irssiproxy_bind", "");

2
src/irc/proxy/proxy.h
View file

@ -22,7 +22,7 @@ typedef struct {
typedef struct {
char *nick, *addr;
NET_SENDBUF_REC *handle;
int recv_tag;
int recv_tag, auth_timeout;
char *proxy_address;
LISTEN_REC *listen;
IRC_SERVER_REC *server;