vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

opm: don't start until we've finished ident and rDNS queries.

Browse source 
This ensures that if we reject the client, they will always have a
username and hostname if ircd decides to accept them.
This commit is contained in:
Elizabeth Myers 2016-04-03 00:05:53 -05:00
parent cfb9253671
commit 85589ba32f
1 changed files with 62 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
authd/providers/opm.c
View file

@ -39,6 +39,7 @@ typedef enum protocol_t
struct opm_lookup
{
rb_dlink_list scans; /* List of scans */
bool in_progress;
};
struct opm_proxy
@ -601,35 +602,19 @@ create_listener(const char *ip, uint16_t port)
return true;
}
static void
opm_destroy(void)
{
struct auth_client *auth;
rb_dictionary_iter iter;
/* Nuke all opm lookups */
RB_DICTIONARY_FOREACH(auth, &iter, auth_clients)
{
opm_cancel(auth);
}
}
static bool
opm_start(struct auth_client *auth)
opm_scan(struct auth_client *auth)
{
rb_dlink_node *ptr;
struct opm_lookup *lookup = rb_malloc(sizeof(struct opm_lookup));
struct opm_lookup *lookup;
if(!opm_enable || rb_dlink_list_length(&proxy_scanners) == 0)
{
notice_client(auth->cid, "*** Proxy scanning disabled, not scanning");
return true;
}
lrb_assert(auth != NULL);
lookup = auth->data[PROVIDER_OPM];
auth->data[PROVIDER_OPM] = lookup = rb_malloc(sizeof(struct opm_lookup));
auth->timeout[PROVIDER_OPM] = rb_current_time() + opm_timeout;
lookup->in_progress = true;
RB_DLINK_FOREACH(ptr, proxy_scanners.head)
{
struct opm_proxy *proxy = ptr->data;
@ -637,8 +622,48 @@ opm_start(struct auth_client *auth)
}
notice_client(auth->cid, "*** Scanning for open proxies...");
set_provider_on(auth, PROVIDER_OPM);
}
/* This is called every time a provider is completed as long as we are marked not done */
static void
blacklists_initiate(struct auth_client *auth, provider_t provider)
{
struct opm_lookup *lookup = auth->data[PROVIDER_OPM];
lrb_assert(provider != PROVIDER_OPM);
lrb_assert(!is_provider_done(auth, PROVIDER_OPM));
lrb_assert(rb_dlink_list_length(&proxy_scanners) > 0);
if(lookup == NULL || lookup->in_progress)
/* Nothing to do */
return;
else if(!(is_provider_done(auth, PROVIDER_RDNS) && is_provider_done(auth, PROVIDER_IDENT)))
/* Don't start until we've completed these */
return;
else
opm_scan(auth);
}
static bool
opm_start(struct auth_client *auth)
{
if(auth->data[PROVIDER_OPM] != NULL)
return true;
if(!opm_enable || rb_dlink_list_length(&proxy_scanners) == 0)
{
/* Nothing to do... */
notice_client(auth->cid, "*** Proxy scanning disabled, not scanning");
return true;
}
auth->data[PROVIDER_BLACKLIST] = rb_malloc(sizeof(struct opm_lookup));
if(is_provider_done(auth, PROVIDER_RDNS) && is_provider_done(auth, PROVIDER_IDENT))
/* This probably can't happen but let's handle this case anyway */
opm_scan(auth);
set_provider_on(auth, PROVIDER_BLACKLIST);
return true;
}
@ -666,6 +691,20 @@ opm_cancel(struct auth_client *auth)
}
}
static void
opm_destroy(void)
{
struct auth_client *auth;
rb_dictionary_iter iter;
/* Nuke all opm lookups */
RB_DICTIONARY_FOREACH(auth, &iter, auth_clients)
{
opm_cancel(auth);
}
}
static void
add_conf_opm_timeout(const char *key __unused, int parc __unused, const char **parv)
{