* POSSIBILITY OF SUCH DAMAGE.
*/
-/* So the basic design here is to have "authentication providers" that do
- * things like query ident and blacklists and even open proxies.
+/* The basic design here is to have "authentication providers" that do things
+ * like query ident and blacklists and even open proxies.
*
* Providers are registered in the auth_providers linked list. It is planned to
* use a bitmap to store provider ID's later.
*
- * Providers can either return failure immediately, immediate acceptance, or
- * do work in the background (calling set_provider to signal this).
+ * Providers can either return failure immediately, immediate acceptance, or do
+ * work in the background (calling set_provider to signal this).
*
* Provider-specific data for each client can be kept in an index of the data
* struct member (using the provider's ID).
* should call provider_done. Do NOT call this if you have accepted or rejected
* the client.
*
+ * Eventually, stuff like *:line handling will be moved here, but that means we
+ * have to talk to bandb directly first.
+ *
* --Elizafox, 9 March 2016
*/
rb_dlink_list auth_providers;
/* Clients waiting */
-struct Dictionary *auth_clients;
+rb_dictionary *auth_clients;
/* Load a provider */
void load_provider(struct auth_provider *provider)
{
if(rb_dlink_list_length(&auth_providers) >= MAX_PROVIDERS)
- /* XXX should probably warn here */
+ {
+ warn_opers(L_CRIT, "Exceeded maximum level of authd providers (%d max)", MAX_PROVIDERS);
return;
+ }
provider->init();
rb_dlinkAdd(provider, &provider->node, &auth_providers);
void destroy_providers(void)
{
rb_dlink_node *ptr;
- struct DictionaryIter iter;
+ rb_dictionary_iter iter;
struct auth_client *auth;
struct auth_provider *provider;
/* Cancel outstanding connections */
- DICTIONARY_FOREACH(auth, &iter, auth_clients)
+ RB_DICTIONARY_FOREACH(auth, &iter, auth_clients)
{
/* TBD - is this the right thing? */
reject_client(auth, 0, "Authentication system is down... try reconnecting in a few seconds");
{
provider = ptr->data;
- if(provider->cancel && is_provider(auth, provider->id))
+ if(provider->cancel && is_provider_on(auth, provider->id))
/* Cancel if required */
provider->cancel(auth);
}
rb_dlink_node *ptr;
struct auth_provider *provider;
- unset_provider(auth, id);
+ set_provider_off(auth, id);
+ set_provider_done(auth, id);
if(!auth->providers)
{
{
provider = ptr->data;
- if(provider->completed && is_provider(auth, provider->id))
+ if(provider->completed && is_provider_on(auth, provider->id))
/* Notify pending clients who asked for it */
provider->completed(auth, id);
}
break;
}
- /* TODO send back ident */
- rb_helper_write(authd_helper, "R %x %c :%s", auth->cid, reject, reason);
+ /* We send back username and hostname in case ircd wants to overrule our decision.
+ * In the future this may not be the case.
+ * --Elizafox
+ */
+ rb_helper_write(authd_helper, "R %x %c %s %s :%s", auth->cid, reject, auth->username, auth->hostname, reason);
- unset_provider(auth, id);
+ set_provider_off(auth, id);
cancel_providers(auth);
}
rb_helper_write(authd_helper, "A %x %s %s", auth->cid, auth->username, auth->hostname);
- unset_provider(auth, id);
+ set_provider_off(auth, id);
cancel_providers(auth);
}
/* Send a notice to a client */
-void notice_client(struct auth_client *auth, const char *notice)
+void notice_client(struct auth_client *auth, const char *fmt, ...)
+{
+ char buf[BUFSIZE];
+ va_list args;
+
+ va_start(args, fmt);
+ vsnprintf(buf, sizeof(buf), fmt, args);
+ va_end(args);
+
+ rb_helper_write(authd_helper, "N %x :%s", auth->cid, buf);
+}
+
+/* Send a warning to the IRC daemon for logging, etc. */
+void warn_opers(notice_level_t level, const char *fmt, ...)
{
- rb_helper_write(authd_helper, "N %x :%s", auth->cid, notice);
+ char buf[BUFSIZE];
+ va_list args;
+
+ va_start(args, fmt);
+ vsnprintf(buf, sizeof(buf), fmt, args);
+ va_end(args);
+
+ rb_helper_write(authd_helper, "W %c :%s", level, buf);
}
/* Begin authenticating user */
rb_strlcpy(auth->l_ip, l_ip, sizeof(auth->l_ip));
auth->l_port = (uint16_t)atoi(l_port); /* should be safe */
+ (void) rb_inet_pton_sock(l_ip, (struct sockaddr *)&auth->l_addr);
rb_strlcpy(auth->c_ip, c_ip, sizeof(auth->c_ip));
auth->c_port = (uint16_t)atoi(c_port);
+ (void) rb_inet_pton_sock(c_ip, (struct sockaddr *)&auth->c_addr);
+
+#ifdef RB_IPV6
+ if(GET_SS_FAMILY(&auth->l_addr) == AF_INET6)
+ ((struct sockaddr_in6 *)&auth->l_addr)->sin6_port = htons(auth->l_port);
+ else
+#endif
+ ((struct sockaddr_in *)&auth->l_addr)->sin_port = htons(auth->l_port);
+
+#ifdef RB_IPV6
+ if(GET_SS_FAMILY(&auth->c_addr) == AF_INET6)
+ ((struct sockaddr_in6 *)&auth->c_addr)->sin6_port = htons(auth->c_port);
+ else
+#endif
+ ((struct sockaddr_in *)&auth->c_addr)->sin_port = htons(auth->c_port);
rb_dictionary_add(auth_clients, RB_UINT_TO_POINTER(auth->cid), auth);
void handle_new_connection(int parc, char *parv[])
{
if(parc < 7)
+ {
+ warn_opers(L_CRIT, "BUG: received too few params for new connection (7 expected, got %d)", parc);
return;
+ }
start_auth(parv[1], parv[2], parv[3], parv[4], parv[5]);
}
projects / solanum.git / blobdiff