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

authd: add provider-specific data to auth_client via a dictionary.

Browse source
This commit is contained in:
Elizabeth Myers 2016-03-19 15:02:11 -05:00
parent 68f90ee247
commit f7b37c1dc1
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
authd/provider.c
View file

@ -21,13 +21,13 @@
/* So the basic design here is to have "authentication providers" that do /* So the basic design here is to have "authentication providers" that do
* things like query ident and blacklists and even open proxies. * things like query ident and blacklists and even open proxies.
* *
* Providers are registered statically in the struct auth_providers array. You will * Providers are registered in the auth_providers linked list. It is planned to
* probably want to add an item to the provider_t enum also. * use a bitmap to store provider ID's later.
* *
* Providers can either return failure immediately, immediate acceptance, or * Providers can either return failure immediately, immediate acceptance, or
* do work in the background (calling set_provider to signal this). * do work in the background (calling set_provider to signal this).
* *
* It is up to providers to keep their own state on clients if they need to. * A dictionary is provided in auth_client for storage of provider-specific data.
* *
* All providers must implement at a minimum a perform_provider function. You * All providers must implement at a minimum a perform_provider function. You
* don't have to implement the others if you don't need them. * don't have to implement the others if you don't need them.
@ -81,10 +81,9 @@ void destroy_providers(void)
{ {
if(auth_clients[i].cid) if(auth_clients[i].cid)
{ {
/* TBD - is this the right thing? /* TBD - is this the right thing? */
* (NOTE - this error message is designed for morons) */ reject_client(&auth_clients[i], 0,
reject_client(&auth_clients[i], 0, true, "Authentication system is down... try reconnecting in a few seconds");
"IRC server reloading... try reconnecting in a few seconds");
} }
} }
@ -138,8 +137,8 @@ void provider_done(struct auth_client *auth, provider_t id)
} }
} }
/* Reject a client, cancel outstanding providers if any if hard set to true */ /* Reject a client */
void reject_client(struct auth_client *auth, provider_t id, bool hard, const char *reason) void reject_client(struct auth_client *auth, provider_t id, const char *reason)
{ {
uint16_t cid = auth->cid; uint16_t cid = auth->cid;
char reject; char reject;
@ -165,7 +164,7 @@ void reject_client(struct auth_client *auth, provider_t id, bool hard, const cha
unset_provider(auth, id); unset_provider(auth, id);
if(hard && auth->providers) if(auth->providers)
{ {
cancel_providers(auth); cancel_providers(auth);
memset(&auth_clients[cid], 0, sizeof(struct auth_client)); memset(&auth_clients[cid], 0, sizeof(struct auth_client));
@ -199,6 +198,7 @@ static void start_auth(const char *cid, const char *l_ip, const char *l_port, co
struct auth_provider *provider; struct auth_provider *provider;
struct auth_client *auth; struct auth_client *auth;
long lcid = strtol(cid, NULL, 16); long lcid = strtol(cid, NULL, 16);
char name[20];
rb_dlink_node *ptr; rb_dlink_node *ptr;
if(lcid >= MAX_CLIENTS) if(lcid >= MAX_CLIENTS)
@ -217,6 +217,9 @@ static void start_auth(const char *cid, const char *l_ip, const char *l_port, co
rb_strlcpy(auth->c_ip, c_ip, sizeof(auth->c_ip)); rb_strlcpy(auth->c_ip, c_ip, sizeof(auth->c_ip));
auth->c_port = (uint16_t)atoi(c_port); auth->c_port = (uint16_t)atoi(c_port);
snprintf("%d provider data", sizeof(name), auth->cid);
auth->data = rb_dictionary_create(name, rb_uint32cmp);
RB_DLINK_FOREACH(ptr, auth_providers.head) RB_DLINK_FOREACH(ptr, auth_providers.head)
{ {
provider = ptr->data; provider = ptr->data;

4
authd/provider.h
View file

@ -50,6 +50,8 @@ struct auth_client
unsigned int providers; /* Providers at work, unsigned int providers; /* Providers at work,
* none left when set to 0 */ * none left when set to 0 */
struct Dictionary *data; /* Provider-specific data */
}; };
typedef bool (*provider_init_t)(void); typedef bool (*provider_init_t)(void);
@ -87,7 +89,7 @@ void cancel_providers(struct auth_client *auth);
void provider_done(struct auth_client *auth, provider_t id); void provider_done(struct auth_client *auth, provider_t id);
void accept_client(struct auth_client *auth, provider_t id); void accept_client(struct auth_client *auth, provider_t id);
void reject_client(struct auth_client *auth, provider_t id, bool hard, const char *reason); void reject_client(struct auth_client *auth, provider_t id, const char *reason);
void notice_client(struct auth_client *auth, const char *notice); void notice_client(struct auth_client *auth, const char *notice);