MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 18:22:50 +01:00
Code Issues Releases Wiki Activity

authd: It Works, Bitches™

Browse source
This commit is contained in:
Elizabeth Myers 2016-03-28 16:47:51 -05:00
parent 1345a41dda
commit 50808796e0
3 changed files with 32 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
ircd/authd.c
View file

@ -48,7 +48,7 @@ static EVH timeout_dead_authd_clients;
rb_helper *authd_helper; rb_helper *authd_helper;
static char *authd_path; static char *authd_path;
uint32_t cid = 1; uint32_t cid;
static rb_dictionary *cid_clients; static rb_dictionary *cid_clients;
static struct ev_entry *timeout_ev; static struct ev_entry *timeout_ev;
@ -115,15 +115,15 @@ parse_authd_reply(rb_helper * helper)
{ {
ssize_t len; ssize_t len;
int parc; int parc;
char dnsBuf[READBUF_SIZE]; char authdBuf[READBUF_SIZE];
char *parv[MAXPARA + 1]; char *parv[MAXPARA + 1];
long lcid; long lcid;
char *id; uint32_t cid;
struct Client *client_p; struct Client *client_p;
while((len = rb_helper_read(helper, dnsBuf, sizeof(dnsBuf))) > 0) while((len = rb_helper_read(helper, authdBuf, sizeof(authdBuf))) > 0)
{ {
parc = rb_string_to_array(dnsBuf, parv, MAXPARA+1); parc = rb_string_to_array(authdBuf, parv, MAXPARA+1);
switch (*parv[0]) switch (*parv[0])
{ {
@ -135,30 +135,23 @@ parse_authd_reply(rb_helper * helper)
return; return;
} }
if((lcid = strtol(parv[1], NULL, 16)) > UINT32_MAX) if((lcid = strtol(parv[1], NULL, 16)) > UINT32_MAX || lcid < 0)
{ {
iwarn("authd sent us back a bad client ID"); iwarn("authd sent us back a bad client ID: %ld", lcid);
restart_authd(); restart_authd();
return; return;
} }
cid = (uint32_t)lcid;
/* cid to uid (retrieve and delete) */ /* cid to uid (retrieve and delete) */
if((id = rb_dictionary_delete(cid_clients, RB_UINT_TO_POINTER((uint32_t)lcid))) == NULL) if((client_p = rb_dictionary_delete(cid_clients, RB_UINT_TO_POINTER(cid))) == NULL)
{ {
iwarn("authd sent us back an unknown client ID"); iwarn("authd sent us back an unknown client ID %x", cid);
restart_authd(); restart_authd();
return; return;
} }
if((client_p = find_id(id)) == NULL)
{
/* Client vanished... */
rb_free(id);
return;
}
rb_free(id);
authd_decide_client(client_p, parv[2], parv[3], true, '\0', NULL, NULL); authd_decide_client(client_p, parv[2], parv[3], true, '\0', NULL, NULL);
break; break;
case 'R': /* Reject client */ case 'R': /* Reject client */
@ -169,30 +162,23 @@ parse_authd_reply(rb_helper * helper)
return; return;
} }
if((lcid = strtol(parv[1], NULL, 16)) > UINT32_MAX) if((lcid = strtol(parv[1], NULL, 16)) > UINT32_MAX || lcid < 0)
{ {
iwarn("authd sent us back a bad client ID"); iwarn("authd sent us back a bad client ID %ld", lcid);
restart_authd(); restart_authd();
return; return;
} }
cid = (uint32_t)lcid;
/* cid to uid (retrieve and delete) */ /* cid to uid (retrieve and delete) */
if((id = rb_dictionary_delete(cid_clients, RB_UINT_TO_POINTER((uint32_t)lcid))) == NULL) if((client_p = rb_dictionary_delete(cid_clients, RB_UINT_TO_POINTER(cid))) == NULL)
{ {
iwarn("authd sent us back an unknown client ID"); iwarn("authd sent us back an unknown client ID %x", cid);
restart_authd(); restart_authd();
return; return;
} }
if((client_p = find_id(id)) == NULL)
{
/* Client vanished... */
rb_free(id);
return;
}
rb_free(id);
authd_decide_client(client_p, parv[3], parv[4], false, toupper(*parv[2]), parv[5], parv[6]); authd_decide_client(client_p, parv[3], parv[4], false, toupper(*parv[2]), parv[5], parv[6]);
break; break;
case 'N': /* Notice to client */ case 'N': /* Notice to client */
@ -203,25 +189,23 @@ parse_authd_reply(rb_helper * helper)
return; return;
} }
if((lcid = strtol(parv[1], NULL, 16)) > UINT32_MAX) if((lcid = strtol(parv[1], NULL, 16)) > UINT32_MAX || lcid < 0)
{ {
iwarn("authd sent us back a bad client ID"); iwarn("authd sent us back a bad client ID %ld", lcid);
restart_authd(); restart_authd();
return; return;
} }
cid = (uint32_t)lcid;
/* cid to uid */ /* cid to uid */
if((id = rb_dictionary_retrieve(cid_clients, RB_UINT_TO_POINTER((uint32_t)lcid))) == NULL) if((client_p = rb_dictionary_retrieve(cid_clients, RB_UINT_TO_POINTER(cid))) == NULL)
{ {
iwarn("authd sent us back an unknown client ID"); iwarn("authd sent us back an unknown client ID %x", cid);
restart_authd(); restart_authd();
return; return;
} }
if((client_p = find_id(id)) == NULL)
/* Client vanished... we'll let the timeout code handle it */
return;
sendto_one_notice(client_p, ":%s", parv[2]); sendto_one_notice(client_p, ":%s", parv[2]);
break; break;
case 'E': /* DNS Result */ case 'E': /* DNS Result */
@ -315,8 +299,8 @@ configure_authd(void)
/* These will do for now */ /* These will do for now */
set_authd_timeout("ident_timeout", GlobalSetOptions.ident_timeout); set_authd_timeout("ident_timeout", GlobalSetOptions.ident_timeout);
set_authd_timeout("rdns_timeout", ConfigFileEntry.connect_timeout); set_authd_timeout("rdns_timeout", ConfigFileEntry.connect_timeout);
set_authd_timeout("blacklist_timeout", ConfigFileEntry.connect_timeout); set_authd_timeout("rbl_timeout", ConfigFileEntry.connect_timeout);
ident_check_enable(ConfigFileEntry.disable_auth); ident_check_enable(!ConfigFileEntry.disable_auth);
} }
static void static void
@ -377,13 +361,13 @@ authd_initiate_client(struct Client *client_p)
uint16_t client_port, listen_port; uint16_t client_port, listen_port;
uint32_t authd_cid; uint32_t authd_cid;
if(client_p->preClient == NULL || client_p->preClient->authd_cid == 0) if(client_p->preClient == NULL || client_p->preClient->authd_cid != 0)
return; return;
authd_cid = client_p->preClient->authd_cid = generate_cid(); authd_cid = client_p->preClient->authd_cid = generate_cid();
/* Collisions are extremely unlikely, so disregard the possibility */ /* Collisions are extremely unlikely, so disregard the possibility */
rb_dictionary_add(cid_clients, RB_UINT_TO_POINTER(authd_cid), rb_strdup(client_p->id)); rb_dictionary_add(cid_clients, RB_UINT_TO_POINTER(authd_cid), client_p);
/* Retrieve listener and client IP's */ /* Retrieve listener and client IP's */
rb_inet_ntop_sock((struct sockaddr *)&client_p->preClient->lip, listen_ipaddr, sizeof(listen_ipaddr)); rb_inet_ntop_sock((struct sockaddr *)&client_p->preClient->lip, listen_ipaddr, sizeof(listen_ipaddr));
@ -476,14 +460,6 @@ timeout_dead_authd_clients(void *notused __unused)
RB_DICTIONARY_FOREACH(id, &iter, cid_clients) RB_DICTIONARY_FOREACH(id, &iter, cid_clients)
{ {
struct Client *client_p; struct Client *client_p;
if((client_p = find_id(id)) == NULL)
{
/* This shouldn't happen... but just in case... */
rb_helper_write(authd_helper, "E %x", RB_POINTER_TO_UINT(iter.cur->key));
rb_free(id);
rb_dictionary_delete(cid_clients, iter.cur->key);
continue;
}
if(client_p->preClient->authd_timeout < rb_current_time()) if(client_p->preClient->authd_timeout < rb_current_time())
{ {
@ -517,7 +493,7 @@ add_blacklist(const char *host, const char *reason, uint8_t iptype, rb_dlink_lis
{ {
rb_dlink_node *ptr; rb_dlink_node *ptr;
struct blacklist_stats *stats = rb_malloc(sizeof(struct blacklist_stats)); struct blacklist_stats *stats = rb_malloc(sizeof(struct blacklist_stats));
char filterbuf[BUFSIZE]; char filterbuf[BUFSIZE] = "*";
size_t s = 0; size_t s = 0;
/* Build a list of comma-separated values for authd. /* Build a list of comma-separated values for authd.

4
ircd/ircd.c
View file

@ -845,8 +845,6 @@ charybdis_main(int argc, char *argv[])
return 0; /* Why? We want the launcher to exit out. */ return 0; /* Why? We want the launcher to exit out. */
} }
configure_authd();
me.from = &me; me.from = &me;
me.servptr = &me; me.servptr = &me;
SetMe(&me); SetMe(&me);
@ -865,6 +863,8 @@ charybdis_main(int argc, char *argv[])
load_help(); load_help();
open_logfiles(); open_logfiles();
configure_authd();
ilog(L_MAIN, "Server Ready"); ilog(L_MAIN, "Server Ready");
/* We want try_connections to be called as soon as possible now! -- adrian */ /* We want try_connections to be called as soon as possible now! -- adrian */

2
ircd/newconf.c
View file

@ -55,7 +55,7 @@ static struct alias_entry *yy_alias = NULL;
static char *yy_blacklist_host = NULL; static char *yy_blacklist_host = NULL;
static char *yy_blacklist_reason = NULL; static char *yy_blacklist_reason = NULL;
static uint8_t yy_blacklist_iptype = 0; static uint8_t yy_blacklist_iptype = 0;
static rb_dlink_list yy_blacklist_filters; static rb_dlink_list yy_blacklist_filters = { NULL, NULL, 0 };
static char *yy_privset_extends = NULL; static char *yy_privset_extends = NULL;