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

Implement oper realhost view via a hidden cap

Browse source
This commit is contained in:
Ed Kellett 2020-10-22 14:46:21 +01:00
parent 0862875dd8
commit 3b4731951f
1 changed files with 58 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
extensions/cap_realhost.c
View file

@ -27,31 +27,35 @@
static char cap_realhost_desc[] = "Provides the solanum.chat/realhost oper-only capability"; static char cap_realhost_desc[] = "Provides the solanum.chat/realhost oper-only capability";
static bool cap_realhost_visible(struct Client *); static bool cap_oper_realhost_visible(struct Client *);
static void cap_realhost_outbound_msgbuf(void *); static void cap_realhost_outbound_msgbuf(void *);
static void cap_realhost_umode_changed(void *); static void cap_realhost_umode_changed(void *);
static void cap_realhost_cap_change(void *);
static unsigned CLICAP_REALHOST; static unsigned CLICAP_REALHOST;
static unsigned CLICAP_OPER_REALHOST;
static struct ClientCapability cap_realhost = { static struct ClientCapability capdata_oper_realhost = {
.visible = cap_realhost_visible, .visible = cap_oper_realhost_visible,
}; };
mapi_cap_list_av2 cap_realhost_caps[] = { mapi_cap_list_av2 cap_realhost_caps[] = {
{ MAPI_CAP_CLIENT, "solanum.chat/realhost", &cap_realhost, &CLICAP_REALHOST }, { MAPI_CAP_CLIENT, "solanum.chat/realhost", NULL, &CLICAP_REALHOST },
{ MAPI_CAP_CLIENT, "?oper_realhost", &capdata_oper_realhost, &CLICAP_OPER_REALHOST },
{ 0, NULL, NULL, NULL }, { 0, NULL, NULL, NULL },
}; };
mapi_hfn_list_av1 cap_realhost_hfnlist[] = { mapi_hfn_list_av1 cap_realhost_hfnlist[] = {
{ "outbound_msgbuf", cap_realhost_outbound_msgbuf, HOOK_NORMAL }, { "outbound_msgbuf", cap_realhost_outbound_msgbuf, HOOK_NORMAL },
{ "umode_changed", cap_realhost_umode_changed, HOOK_MONITOR }, { "umode_changed", cap_realhost_umode_changed, HOOK_MONITOR },
{ "cap_change", cap_realhost_cap_change, HOOK_MONITOR },
{ NULL, NULL, 0 }, { NULL, NULL, 0 },
}; };
static bool static bool
cap_realhost_visible(struct Client *client) cap_oper_realhost_visible(struct Client *client)
{ {
return HasPrivilege(client, "cap:realhost"); return false;
} }
static void static void
@ -60,14 +64,34 @@ cap_realhost_outbound_msgbuf(void *data_)
hook_data *data = data_; hook_data *data = data_;
struct MsgBuf *msgbuf = data->arg1; struct MsgBuf *msgbuf = data->arg1;
if (data->client == NULL) if (data->client == NULL || !IsPerson(data->client))
return; return;
if (!IsIPSpoof(data->client) && !EmptyString(data->client->sockhost) && strcmp(data->client->sockhost, "0")) if (!IsIPSpoof(data->client) && !EmptyString(data->client->sockhost) && strcmp(data->client->sockhost, "0"))
{
if (IsDynSpoof(data->client))
msgbuf_append_tag(msgbuf, "solanum.chat/ip", data->client->sockhost, CLICAP_OPER_REALHOST);
else
msgbuf_append_tag(msgbuf, "solanum.chat/ip", data->client->sockhost, CLICAP_REALHOST); msgbuf_append_tag(msgbuf, "solanum.chat/ip", data->client->sockhost, CLICAP_REALHOST);
}
if (!EmptyString(data->client->orighost)) if (!EmptyString(data->client->orighost))
{
if (IsDynSpoof(data->client))
msgbuf_append_tag(msgbuf, "solanum.chat/realhost", data->client->orighost, CLICAP_OPER_REALHOST);
else
msgbuf_append_tag(msgbuf, "solanum.chat/realhost", data->client->orighost, CLICAP_REALHOST); msgbuf_append_tag(msgbuf, "solanum.chat/realhost", data->client->orighost, CLICAP_REALHOST);
}
}
static inline void
update_clicap_oper_realhost(struct Client *client)
{
client->localClient->caps &= ~CLICAP_OPER_REALHOST;
if (client->localClient->caps & CLICAP_REALHOST && HasPrivilege(client, "auspex:hostname"))
{
client->localClient->caps |= CLICAP_OPER_REALHOST;
}
} }
static void static void
@ -78,8 +102,30 @@ cap_realhost_umode_changed(void *data_)
if (!MyClient(data->client)) if (!MyClient(data->client))
return; return;
if (!cap_realhost_visible(data->client)) update_clicap_oper_realhost(data->client);
data->client->localClient->caps &= ~CLICAP_REALHOST;
} }
DECLARE_MODULE_AV2(cap_realhost, NULL, NULL, NULL, NULL, cap_realhost_hfnlist, cap_realhost_caps, NULL, cap_realhost_desc); static void
cap_realhost_cap_change(void *data_)
{
hook_data_cap_change *data = data_;
update_clicap_oper_realhost(data->client);
}
static int
modinit(void)
{
rb_dlink_node *ptr;
RB_DLINK_FOREACH(ptr, lclient_list.head)
{
struct Client *client = ptr->data;
update_clicap_oper_realhost(client);
}
return 0;
}
DECLARE_MODULE_AV2(cap_realhost, modinit, NULL, NULL, NULL, cap_realhost_hfnlist, cap_realhost_caps, NULL, cap_realhost_desc);