9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

authd: properly abort clients who timeout or when the helper restarts

Browse source
This commit is contained in:
Elizabeth Myers 2016-04-01 02:27:48 -05:00
parent 8860e46a33
commit e158281056
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ircd/authd.c
View file

@ -306,13 +306,24 @@ configure_authd(void)
static void static void
restart_authd_cb(rb_helper * helper) restart_authd_cb(rb_helper * helper)
{ {
rb_dictionary_iter iter;
struct Client *client_p;
iwarn("authd: restart_authd_cb called, authd died?"); iwarn("authd: restart_authd_cb called, authd died?");
sendto_realops_snomask(SNO_GENERAL, L_ALL, "authd: restart_authd_cb called, authd died?"); sendto_realops_snomask(SNO_GENERAL, L_ALL, "authd: restart_authd_cb called, authd died?");
if(helper != NULL) if(helper != NULL)
{ {
rb_helper_close(helper); rb_helper_close(helper);
authd_helper = NULL; authd_helper = NULL;
} }
RB_DICTIONARY_FOREACH(client_p, &iter, cid_clients)
{
/* Abort any existing clients */
authd_abort_client(client_p);
}
start_authd(); start_authd();
} }
@ -428,7 +439,7 @@ authd_decide_client(struct Client *client_p, const char *ident, const char *host
void void
authd_abort_client(struct Client *client_p) authd_abort_client(struct Client *client_p)
{ {
if(client_p->preClient == NULL) if(client_p == NULL || client_p->preClient == NULL)
return; return;
if(client_p->preClient->authd_cid == 0) if(client_p->preClient->authd_cid == 0)
@ -436,7 +447,12 @@ authd_abort_client(struct Client *client_p)
rb_dictionary_delete(cid_clients, RB_UINT_TO_POINTER(client_p->preClient->authd_cid)); rb_dictionary_delete(cid_clients, RB_UINT_TO_POINTER(client_p->preClient->authd_cid));
if(authd_helper != NULL)
rb_helper_write(authd_helper, "E %x", client_p->preClient->authd_cid); rb_helper_write(authd_helper, "E %x", client_p->preClient->authd_cid);
/* XXX should we blindly allow like this? */
authd_decide_client(client_p, parv[2], parv[3], true, '\0', NULL, NULL);
client_p->preClient->authd_cid = 0; client_p->preClient->authd_cid = 0;
} }
@ -449,10 +465,7 @@ timeout_dead_authd_clients(void *notused __unused)
RB_DICTIONARY_FOREACH(client_p, &iter, cid_clients) RB_DICTIONARY_FOREACH(client_p, &iter, cid_clients)
{ {
if(client_p->preClient->authd_timeout < rb_current_time()) if(client_p->preClient->authd_timeout < rb_current_time())
{ authd_abort_client(client_p);
rb_helper_write(authd_helper, "E %x", client_p->preClient->authd_cid);
rb_dictionary_delete(cid_clients, RB_UINT_TO_POINTER(client_p->preClient->authd_cid));
}
} }
} }