pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-07 06:23:13 +02:00
Code Activity

Central Blocklist: include web/websocket handshake data

Browse Source
This commit is contained in:
Bram Matthys
2025-01-12 12:31:35 +01:00
parent 0887a5a4bd
commit 80ac9eb888
1 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/central-blocklist.c
+31 -1
View File
@@ -8,7 +8,7 @@
ModuleHeader MOD_HEADER
= {
"central-blocklist",
"1.0.7",
"1.0.8",
"Check users at central blocklist",
"UnrealIRCd Team",
"unrealircd-6",
@@ -22,6 +22,9 @@ Module *cbl_module = NULL;
#define CBL_TRANSFER_TIMEOUT 10
#define SPAMREPORT_NUM_REMEMBERED_CMDS 10
#define WEB(client) ((WebRequest *)moddata_client(client, webserver_md).ptr)
#define WSU(client) ((WebSocketUser *)moddata_client(client, websocket_md).ptr)
typedef struct CBLUser CBLUser;
struct CBLUser
{
@@ -70,6 +73,8 @@ struct reqstruct {
static struct reqstruct req;
CBLTransfer *cbltransfers = NULL;
ModDataInfo *webserver_md = NULL; /* (external module, looked up) */
ModDataInfo *websocket_md = NULL; /* (external module, looked up) */
/* Forward declarations */
int _central_spamreport(Client *client, Client *by, const char *url);
@@ -244,6 +249,9 @@ MOD_LOAD()
do_command_overrides(modinfo);
webserver_md = findmoddata_byname("web", MODDATATYPE_CLIENT);
websocket_md = findmoddata_byname("websocket", MODDATATYPE_CLIENT);
/* Enable gathering of "last 10 lines" for SPAMREPORT, only if SPAMREPORT is enabled: */
if (central_spamreport_enabled())
{
@@ -617,6 +625,28 @@ void cbl_add_client_info(Client *client)
json_object_set_new(user, "reputation", json_integer(GetReputation(client)));
}
if (webserver_md && WEB(client))
{
json_t *web = json_object();
json_t *headers = json_object();
NameValuePrioList *nv;
json_object_set_new(child, "web", web);
json_object_set_new(web, "headers", headers);
for (nv = WEB(client)->headers; nv; nv = nv->next)
json_object_set_new(headers, nv->name, json_string_unreal(nv->value));
}
if (websocket_md && WSU(client))
{
json_t *websocket = json_object();
json_object_set_new(child, "websocket", websocket);
if (WSU(client)->type == WEBSOCKET_TYPE_TEXT)
json_object_set_new(websocket, "protocol", json_string_unreal("text"));
else if (WSU(client)->type == WEBSOCKET_TYPE_BINARY)
json_object_set_new(websocket, "protocol", json_string_unreal("binary"));
}
if ((str = moddata_client_get(client, "tls_cipher")))
{
json_t *tls = json_object();