rb_dlink_list auth_providers;
static rb_dlink_list free_pids;
-static uint32_t pid;
+static uint32_t allocated_pids;
static struct ev_entry *timeout_ev;
/* Initalise all providers */
rb_dlink_node *ptr, *nptr;
rb_dictionary_iter iter;
struct auth_client *auth;
- struct auth_provider *provider;
/* Cancel outstanding connections */
RB_DICTIONARY_FOREACH(auth, &iter, auth_clients)
{
+ auth_client_ref(auth);
+
/* TBD - is this the right thing? */
reject_client(auth, UINT32_MAX, "destroy",
"Authentication system is down... try reconnecting in a few seconds");
+
+ auth_client_unref(auth);
}
RB_DLINK_FOREACH_SAFE(ptr, nptr, auth_providers.head)
}
else
{
- if(pid == UINT32_MAX)
+ if(allocated_pids == MAX_PROVIDERS || allocated_pids == UINT32_MAX)
{
- /* If this happens, well, I don't know what to say. Probably a bug.
- * In any case, UINT32_MAX is a special sentinel. */
warn_opers(L_WARN, "Cannot load additional provider, max reached!");
return;
}
- provider->id = pid++;
+ provider->id = allocated_pids++;
}
if(provider->opt_handlers != NULL)
auth->providers_cancelled = true;
- if(auth->refcount > 0)
+ if(auth->providers_active > 0)
{
rb_dlink_node *ptr;
}
}
-/* Provider is done
- * WARNING: do not use auth instance after calling! */
+/* Provider is done */
void
provider_done(struct auth_client *auth, uint32_t id)
{
lrb_assert(is_provider_running(auth, id));
lrb_assert(id != UINT32_MAX);
- lrb_assert(id <= pid);
+ lrb_assert(id < allocated_pids);
set_provider_done(auth, id);
- if(auth->refcount == 0 && !auth->providers_starting)
+ if(auth->providers_active == 0 && !auth->providers_starting)
{
/* All done */
- accept_client(auth, UINT32_MAX);
+ accept_client(auth);
return;
}
}
}
-/* Reject a client and cancel any outstanding providers
- * WARNING: do not use auth instance after calling! */
+/* Reject a client and cancel any outstanding providers */
void
reject_client(struct auth_client *auth, uint32_t id, const char *data, const char *fmt, ...)
{
- unsigned int refcount = auth->refcount;
char buf[BUFSIZE];
va_list args;
* --Elizafox
*/
rb_helper_write(authd_helper, "R %x %c %s %s %s :%s",
- auth->cid, auth->data[id].provider->letter,
+ auth->cid, id != UINT32_MAX ? auth->data[id].provider->letter : '*',
auth->username, auth->hostname,
data == NULL ? "*" : data, buf);
cancel_providers(auth);
}
-/* Accept a client and cancel outstanding providers if any
- * WARNING: do not use auth instance after calling! */
+/* Accept a client and cancel outstanding providers if any */
void
-accept_client(struct auth_client *auth, uint32_t id)
+accept_client(struct auth_client *auth)
{
- unsigned int refcount = auth->refcount;
-
rb_helper_write(authd_helper, "A %x %s %s", auth->cid, auth->username, auth->hostname);
-
- if(id != UINT32_MAX)
- set_provider_done(auth, id);
-
cancel_providers(auth);
}
static void
start_auth(const char *cid, const char *l_ip, const char *l_port, const char *c_ip, const char *c_port)
{
- struct auth_client *auth = rb_malloc(sizeof(struct auth_client));
- long lcid = strtol(cid, NULL, 16);
+ struct auth_client *auth;
+ unsigned long long lcid = strtoull(cid, NULL, 16);
rb_dlink_node *ptr;
- if(lcid >= UINT32_MAX)
+ if(lcid == 0 || lcid > UINT32_MAX)
return;
+ auth = rb_malloc(sizeof(struct auth_client));
+ auth_client_ref(auth);
auth->cid = (uint32_t)lcid;
if(rb_dictionary_find(auth_clients, RB_UINT_TO_POINTER(auth->cid)) == NULL)
rb_dictionary_add(auth_clients, RB_UINT_TO_POINTER(auth->cid), auth);
else
{
- warn_opers(L_CRIT, "provider: duplicate client added via start_auth: %x", auth->cid);
+ warn_opers(L_CRIT, "provider: duplicate client added via start_auth: %s", cid);
exit(EX_PROVIDER_ERROR);
}
rb_strlcpy(auth->hostname, "*", sizeof(auth->hostname));
rb_strlcpy(auth->username, "*", sizeof(auth->username));
- /* FIXME this is unsafe, the list being allocated needs to
- * support the maximum PID allocated, not just the current
- * length of auth_providers */
- auth->data = rb_malloc(rb_dlink_list_length(&auth_providers) *
- sizeof(struct auth_client_data));
+ auth->data = rb_malloc(allocated_pids * sizeof(struct auth_client_data));
auth->providers_starting = true;
RB_DLINK_FOREACH(ptr, auth_providers.head)
/* Execute providers */
if(!provider->start(auth))
/* Rejected immediately */
- return;
+ goto done;
if(auth->providers_cancelled)
break;
auth->providers_starting = false;
/* If no providers are running, accept the client */
- if(auth->refcount == 0)
- accept_client(auth, UINT32_MAX);
+ if(auth->providers_active == 0)
+ accept_client(auth);
+
+done:
+ auth_client_unref(auth);
}
/* Callback for the initiation */
handle_cancel_connection(int parc, char *parv[])
{
struct auth_client *auth;
- long lcid;
+ unsigned long long lcid;
if(parc < 2)
{
exit(EX_PROVIDER_ERROR);
}
- if((lcid = strtol(parv[1], NULL, 16)) > UINT32_MAX)
+ lcid = strtoull(parv[1], NULL, 16);
+ if(lcid == 0 || lcid > UINT32_MAX)
{
- warn_opers(L_CRIT, "provider: got a request to cancel a connection that can't exist: %lx", lcid);
+ warn_opers(L_CRIT, "provider: got a request to cancel a connection that can't exist: %s", parv[1]);
exit(EX_PROVIDER_ERROR);
}
return;
}
+ auth_client_ref(auth);
cancel_providers(auth);
+ auth_client_unref(auth);
}
static void
{
rb_dlink_node *ptr;
+ auth_client_ref(auth);
+
RB_DLINK_FOREACH(ptr, auth_providers.head)
{
struct auth_provider *provider = ptr->data;
provider->timeout(auth);
}
}
+
+ auth_client_unref(auth);
}
}
projects / solanum.git / blobdiff