sasl: reformat the other messages consistently

[solanum.git] / modules / m_sasl.c

diff --git a/modules/m_sasl.c b/modules/m_sasl.c
index 852a88e03d5b90a3dfa76794bc6adf1f31255436..38c7baeb3a27348c2f8314d4e8189aaf38df35a6 100644 (file)
--- a/modules/m_sasl.c
+++ b/modules/m_sasl.c
@@ -49,6 +49,9 @@ static int me_sasl(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 *);
+
 struct Message authenticate_msgtab = {
        "AUTHENTICATE", 0, 0, 0, MFLG_SLOW,
        {{m_authenticate, 2}, {m_authenticate, 2}, mg_ignore, mg_ignore, mg_ignore, {m_authenticate, 2}}
@@ -64,6 +67,8 @@ 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 }
 };
 
@@ -80,12 +85,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");
@@ -99,10 +98,10 @@ m_authenticate(struct Client *client_p, struct Client *source_p,
                return 0;
        }
 
-       if(source_p->preClient->sasl_complete)
+       if(source_p->localClient->sasl_complete)
        {
-               sendto_one(source_p, form_str(ERR_SASLALREADY), me.name, EmptyString(source_p->name) ? "*" : source_p->name);
-               return 0;
+               *source_p->localClient->sasl_agent = '\0';
+               source_p->localClient->sasl_complete = 0;
        }
 
        if(strlen(parv[1]) > 400)
@@ -118,27 +117,31 @@ m_authenticate(struct Client *client_p, struct Client *source_p,
                add_to_id_hash(source_p->id, source_p);
        }
 
-       if(*source_p->preClient->sasl_agent)
-               agent_p = find_id(source_p->preClient->sasl_agent);
+       if(*source_p->localClient->sasl_agent)
+               agent_p = find_id(source_p->localClient->sasl_agent);
 
        if(agent_p == NULL)
        {
+               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->preClient->sasl_agent, saslserv_p->id, IDLEN);
+               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->preClient->sasl_out++;
+       source_p->localClient->sasl_out++;
 
        return 0;
 }
@@ -158,9 +161,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;
 
@@ -174,10 +174,10 @@ me_sasl(struct Client *client_p, struct Client *source_p,
                return 0;
 
        /* Reject if someone has already answered. */
-       if(*target_p->preClient->sasl_agent && strncmp(parv[1], target_p->preClient->sasl_agent, IDLEN))
+       if(*target_p->localClient->sasl_agent && strncmp(parv[1], target_p->localClient->sasl_agent, IDLEN))
                return 0;
-       else if(!*target_p->preClient->sasl_agent)
-               rb_strlcpy(target_p->preClient->sasl_agent, parv[1], IDLEN);
+       else if(!*target_p->localClient->sasl_agent)
+               rb_strlcpy(target_p->localClient->sasl_agent, parv[1], IDLEN);
 
        if(*parv[3] == 'C')
                sendto_one(target_p, "AUTHENTICATE %s", parv[4]);
@@ -187,10 +187,10 @@ me_sasl(struct Client *client_p, struct Client *source_p,
                        sendto_one(target_p, form_str(ERR_SASLFAIL), me.name, EmptyString(target_p->name) ? "*" : target_p->name);
                else if(*parv[4] == 'S') {
                        sendto_one(target_p, form_str(RPL_SASLSUCCESS), me.name, EmptyString(target_p->name) ? "*" : target_p->name);
-                       target_p->preClient->sasl_complete = 1;
+                       target_p->localClient->sasl_complete = 1;
                        ServerStats.is_ssuc++;
                }
-               *target_p->preClient->sasl_agent = '\0'; /* Blank the stored agent so someone else can answer */
+               *target_p->localClient->sasl_agent = '\0'; /* Blank the stored agent so someone else can answer */
        }
        else if(*parv[3] == 'M')
                sendto_one(target_p, form_str(RPL_SASLMECHS), me.name, EmptyString(target_p->name) ? "*" : target_p->name, parv[4]);
@@ -204,18 +204,18 @@ me_sasl(struct Client *client_p, struct Client *source_p,
 static void
 abort_sasl(struct Client *data)
 {
-       if(data->preClient->sasl_out == 0 || data->preClient->sasl_complete)
+       if(data->localClient->sasl_out == 0 || data->localClient->sasl_complete)
                return;
 
-       data->preClient->sasl_out = data->preClient->sasl_complete = 0;
+       data->localClient->sasl_out = data->localClient->sasl_complete = 0;
        ServerStats.is_sbad++;
 
        if(!IsClosing(data))
                sendto_one(data, form_str(ERR_SASLABORTED), me.name, EmptyString(data->name) ? "*" : data->name);
 
-       if(*data->preClient->sasl_agent)
+       if(*data->localClient->sasl_agent)
        {
-               struct Client *agent_p = find_id(data->preClient->sasl_agent);
+               struct Client *agent_p = find_id(data->localClient->sasl_agent);
                if(agent_p)
                {
                        sendto_one(agent_p, ":%s ENCAP %s SASL %s %s D A", me.id, agent_p->servptr->name,
@@ -231,7 +231,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);
+}