cap server-time: add .000 for microsecs since our clock does not support microsecs

[solanum.git] / modules / m_sasl.c

diff --git a/modules/m_sasl.c b/modules/m_sasl.c
index 3ea463d5f8a172bf41234ac0ee3380135d4be77f..3220ffe9e5b19d27e18fdd6229596365d6a5858c 100644 (file)
--- a/modules/m_sasl.c
+++ b/modules/m_sasl.c
@@ -43,18 +43,23 @@
 #include "s_newconf.h"
 #include "s_conf.h"
 
-static int m_authenticate(struct Client *, struct Client *, int, const char **);
-static int me_sasl(struct Client *, struct Client *, int, const char **);
+static int m_authenticate(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int me_sasl(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 static void abort_sasl(struct Client *);
 static void abort_sasl_exit(hook_data_client_exit *);
 
+static void advertise_sasl(struct Client *);
+static void advertise_sasl_exit(hook_data_client_exit *);
+
+unsigned int CLICAP_SASL = 0;
+
 struct Message authenticate_msgtab = {
-       "AUTHENTICATE", 0, 0, 0, MFLG_SLOW,
+       "AUTHENTICATE", 0, 0, 0, 0,
        {{m_authenticate, 2}, {m_authenticate, 2}, mg_ignore, mg_ignore, mg_ignore, {m_authenticate, 2}}
 };
 struct Message sasl_msgtab = {
-       "SASL", 0, 0, 0, MFLG_SLOW,
+       "SASL", 0, 0, 0, 0,
        {mg_ignore, mg_ignore, mg_ignore, mg_ignore, {me_sasl, 5}, mg_ignore}
 };
 
@@ -64,13 +69,44 @@ mapi_clist_av1 sasl_clist[] = {
 mapi_hfn_list_av1 sasl_hfnlist[] = {
        { "new_local_user",     (hookfn) abort_sasl },
        { "client_exit",        (hookfn) abort_sasl_exit },
+       { "new_remote_user",    (hookfn) advertise_sasl },
+       { "client_exit",        (hookfn) advertise_sasl_exit },
        { NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(sasl, NULL, NULL, sasl_clist, NULL, sasl_hfnlist, "$Revision: 1409 $");
+static int
+sasl_visible(void)
+{
+       struct Client *agent_p = NULL;
+
+       if (ConfigFileEntry.sasl_service)
+               agent_p = find_named_client(ConfigFileEntry.sasl_service);
+
+       return agent_p != NULL && IsService(agent_p);
+}
+
+static struct ClientCapability capdata_sasl = {
+       .visible = sasl_visible,
+       .flags = CLICAP_FLAGS_STICKY,
+};
+
+static int
+_modinit(void)
+{
+       CLICAP_SASL = capability_put(cli_capindex, "sasl", &capdata_sasl);
+       return 0;
+}
+
+static void
+_moddeinit(void)
+{
+       capability_orphan(cli_capindex, "sasl");
+}
+
+DECLARE_MODULE_AV1(sasl, _modinit, _moddeinit, sasl_clist, NULL, sasl_hfnlist, "$Revision: 1409 $");
 
 static int
-m_authenticate(struct Client *client_p, struct Client *source_p,
+m_authenticate(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
        int parc, const char *parv[])
 {
        struct Client *agent_p = NULL;
@@ -80,12 +116,6 @@ m_authenticate(struct Client *client_p, struct Client *source_p,
        if(!IsCapable(source_p, CLICAP_SASL))
                return 0;
 
-       if(IsRegisteredUser(source_p) && !IsCapable(source_p, CLICAP_SASL_REAUTH))
-       {
-               sendto_one(source_p, form_str(ERR_ALREADYREGISTRED), me.name, source_p->name);
-               return 0;
-       }
-
        if (strlen(client_p->id) == 3)
        {
                exit_client(client_p, client_p, client_p, "Mixing client and server protocol");
@@ -101,13 +131,7 @@ m_authenticate(struct Client *client_p, struct Client *source_p,
 
        if(source_p->localClient->sasl_complete)
        {
-               if (!IsCapable(source_p, CLICAP_SASL_REAUTH))
-               {
-                       sendto_one(source_p, form_str(ERR_SASLALREADY), me.name, EmptyString(source_p->name) ? "*" : source_p->name);
-                       return 0;
-               }
-
-               /* we're doing a reauth. */
+               *source_p->localClient->sasl_agent = '\0';
                source_p->localClient->sasl_complete = 0;
        }
 
@@ -129,23 +153,24 @@ m_authenticate(struct Client *client_p, struct Client *source_p,
 
        if(agent_p == NULL)
        {
-               sendto_server(NULL, NULL, CAP_TS6|CAP_ENCAP, NOCAPS, ":%s ENCAP * SASL %s * H %s %s", me.id,
-                                       source_p->id, source_p->host, source_p->sockhost);
+               sendto_one(saslserv_p, ":%s ENCAP %s SASL %s %s H %s %s",
+                                       me.id, saslserv_p->servptr->name, source_p->id, saslserv_p->id,
+                                       source_p->host, source_p->sockhost);
 
                if (!strcmp(parv[1], "EXTERNAL") && source_p->certfp != NULL)
-                       sendto_one(saslserv_p, ":%s ENCAP %s SASL %s %s S %s %s", me.id, saslserv_p->servptr->name,
-                                       source_p->id, saslserv_p->id,
-                                       parv[1], source_p->certfp);
+                       sendto_one(saslserv_p, ":%s ENCAP %s SASL %s %s S %s %s",
+                                               me.id, saslserv_p->servptr->name, source_p->id, saslserv_p->id,
+                                               parv[1], source_p->certfp);
                else
-                       sendto_one(saslserv_p, ":%s ENCAP %s SASL %s %s S %s", me.id, saslserv_p->servptr->name,
-                                       source_p->id, saslserv_p->id,
-                                       parv[1]);
+                       sendto_one(saslserv_p, ":%s ENCAP %s SASL %s %s S %s",
+                                               me.id, saslserv_p->servptr->name, source_p->id, saslserv_p->id,
+                                               parv[1]);
 
                rb_strlcpy(source_p->localClient->sasl_agent, saslserv_p->id, IDLEN);
        }
        else
-               sendto_one(agent_p, ":%s ENCAP %s SASL %s %s C %s", me.id, agent_p->servptr->name,
-                               source_p->id, agent_p->id,
+               sendto_one(agent_p, ":%s ENCAP %s SASL %s %s C %s",
+                               me.id, agent_p->servptr->name, source_p->id, agent_p->id,
                                parv[1]);
        source_p->localClient->sasl_out++;
 
@@ -153,7 +178,7 @@ m_authenticate(struct Client *client_p, struct Client *source_p,
 }
 
 static int
-me_sasl(struct Client *client_p, struct Client *source_p,
+me_sasl(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
        int parc, const char *parv[])
 {
        struct Client *target_p, *agent_p;
@@ -167,9 +192,6 @@ me_sasl(struct Client *client_p, struct Client *source_p,
        if((target_p = find_id(parv[2])) == NULL)
                return 0;
 
-       if(target_p->preClient == NULL)
-               return 0;
-
        if((agent_p = find_id(parv[1])) == NULL)
                return 0;
 
@@ -240,7 +262,30 @@ abort_sasl(struct Client *data)
 static void
 abort_sasl_exit(hook_data_client_exit *data)
 {
-       if (data->target->preClient)
+       if (data->target->localClient)
                abort_sasl(data->target);
 }
 
+static void
+advertise_sasl(struct Client *client_p)
+{
+       if (!ConfigFileEntry.sasl_service)
+               return;
+
+       if (irccmp(client_p->name, ConfigFileEntry.sasl_service))
+               return;
+
+       sendto_local_clients_with_capability(CLICAP_CAP_NOTIFY, ":%s CAP * NEW :sasl", me.name);
+}
+
+static void
+advertise_sasl_exit(hook_data_client_exit *data)
+{
+       if (!ConfigFileEntry.sasl_service)
+               return;
+
+       if (irccmp(data->target->name, ConfigFileEntry.sasl_service))
+               return;
+
+       sendto_local_clients_with_capability(CLICAP_CAP_NOTIFY, ":%s CAP * DEL :sasl", me.name);
+}