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

Stop announcing SASL cap changes on services split/join (#263)

Browse source
This commit is contained in:
Eric Mertens 2021-08-15 16:25:46 -07:00 committed by GitHub
parent 540c3a8a05
commit e83449d5be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
modules/m_sasl.c
View file

@ -52,14 +52,8 @@ static void me_mechlist(struct MsgBuf *, struct Client *, struct Client *, int,
static void abort_sasl(struct Client *); static void abort_sasl(struct Client *);
static void abort_sasl_exit(hook_data_client_exit *); static void abort_sasl_exit(hook_data_client_exit *);
static void advertise_sasl_cap(bool);
static void advertise_sasl_new(struct Client *);
static void advertise_sasl_exit(void *);
static void advertise_sasl_config(void *);
static unsigned int CLICAP_SASL = 0; static unsigned int CLICAP_SASL = 0;
static char mechlist_buf[BUFSIZE]; static char mechlist_buf[BUFSIZE];
static bool sasl_agent_present = false;
struct Message authenticate_msgtab = { struct Message authenticate_msgtab = {
"AUTHENTICATE", 0, 0, 0, 0, "AUTHENTICATE", 0, 0, 0, 0,
@ -80,23 +74,9 @@ mapi_clist_av1 sasl_clist[] = {
mapi_hfn_list_av1 sasl_hfnlist[] = { mapi_hfn_list_av1 sasl_hfnlist[] = {
{ "new_local_user", (hookfn) abort_sasl }, { "new_local_user", (hookfn) abort_sasl },
{ "client_exit", (hookfn) abort_sasl_exit }, { "client_exit", (hookfn) abort_sasl_exit },
{ "new_remote_user", (hookfn) advertise_sasl_new },
{ "after_client_exit", (hookfn) advertise_sasl_exit },
{ "conf_read_end", (hookfn) advertise_sasl_config },
{ NULL, NULL } { NULL, NULL }
}; };
static bool
sasl_visible(struct Client *ignored)
{
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 const char * static const char *
sasl_data(struct Client *client_p) sasl_data(struct Client *client_p)
{ {
@ -104,7 +84,6 @@ sasl_data(struct Client *client_p)
} }
static struct ClientCapability capdata_sasl = { static struct ClientCapability capdata_sasl = {
.visible = sasl_visible,
.data = sasl_data, .data = sasl_data,
.flags = CLICAP_FLAGS_STICKY | CLICAP_FLAGS_PRIORITY, .flags = CLICAP_FLAGS_STICKY | CLICAP_FLAGS_PRIORITY,
}; };
@ -118,19 +97,10 @@ static int
_modinit(void) _modinit(void)
{ {
memset(mechlist_buf, 0, sizeof mechlist_buf); memset(mechlist_buf, 0, sizeof mechlist_buf);
sasl_agent_present = false;
advertise_sasl_config(NULL);
return 0; return 0;
} }
static void DECLARE_MODULE_AV2(sasl, _modinit, NULL, sasl_clist, NULL, sasl_hfnlist, sasl_cap_list, NULL, sasl_desc);
_moddeinit(void)
{
advertise_sasl_cap(false);
}
DECLARE_MODULE_AV2(sasl, _modinit, _moddeinit, sasl_clist, NULL, sasl_hfnlist, sasl_cap_list, NULL, sasl_desc);
static void static void
m_authenticate(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, m_authenticate(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
@ -366,45 +336,3 @@ abort_sasl_exit(hook_data_client_exit *data)
if (data->target->localClient) if (data->target->localClient)
abort_sasl(data->target); abort_sasl(data->target);
} }
static void
advertise_sasl_cap(bool available)
{
if (sasl_agent_present != available) {
if (available) {
sendto_local_clients_with_capability(CLICAP_CAP_NOTIFY, ":%s CAP * NEW :sasl", me.name);
} else {
sendto_local_clients_with_capability(CLICAP_CAP_NOTIFY, ":%s CAP * DEL :sasl", me.name);
}
sasl_agent_present = available;
}
}
static void
advertise_sasl_new(struct Client *client_p)
{
if (!ConfigFileEntry.sasl_service)
return;
if (irccmp(client_p->name, ConfigFileEntry.sasl_service))
return;
advertise_sasl_cap(IsService(client_p));
}
static void
advertise_sasl_exit(void *ignored)
{
if (!ConfigFileEntry.sasl_service)
return;
if (sasl_agent_present) {
advertise_sasl_cap(sasl_visible(NULL));
}
}
static void
advertise_sasl_config(void *ignored)
{
advertise_sasl_cap(sasl_visible(NULL));
}