webhook: support adding request headers to the message

Signed-off-by: László Várady <laszlo.varady@anno.io>

Author: MrAnno

modules/python-modules/syslogng/modules/webhook/scl/webhook.conf

@@ -33,6 +33,7 @@ block source webhook(
     tls_ca_file("")
     tls_ca_dir("")
     behind_proxy(no)
+    include_request_headers(no)
     ...
 )
 {
@@ -50,6 +51,7 @@ block source webhook(
             "tls_ca_file" => "`tls_ca_file`"
             "tls_ca_dir" => "`tls_ca_dir`"
             "behind_proxy" => `behind_proxy`
+            "include_request_headers" => `include_request_headers`
         )
         `__VARARGS__`
     );

modules/python-modules/syslogng/modules/webhook/source.py

@@ -28,11 +28,14 @@
 import tornado
 import ssl
 import signal
+import json
 from typing import Any
 
 signal.signal(signal.SIGINT, signal.SIG_IGN)
 signal.signal(signal.SIGTERM, signal.SIG_IGN)
-WEBHOOK_QUERY_NV_PREFIX = "webhook.query."
+WEBHOOK_NV_PREFIX = "webhook."
+WEBHOOK_QUERY_NV_PREFIX = WEBHOOK_NV_PREFIX + "query."
+WEBHOOK_HEADERS_KEY = WEBHOOK_NV_PREFIX + "headers"
 
 WEBHOOK_PROXY_SOURCEIP_HEADERS = [
     "x-forwarded-for",
@@ -45,6 +48,7 @@
     "x-forwarded",
 ]
 
+
 class Handler(tornado.web.RequestHandler):
     def initialize(self, source) -> None:
         self.source = source
@@ -69,7 +73,7 @@ def _set_proxied_ip(self, msg: LogMessage) -> None:
             if header and len(header) > 0:
                 # the closest/last IP (the behind_proxy flag implies that the last one can be trusted)
                 msg.set_source_ipaddress(header[-1])
-                msg["webhook.proxy_ip"] = self.request.remote_ip
+                msg[WEBHOOK_NV_PREFIX + "proxy_ip"] = self.request.remote_ip
                 return
 
         msg.set_source_ipaddress(self.request.remote_ip)
@@ -85,6 +89,9 @@ def _construct_msg(self, request, path_arguments) -> LogMessage:
         for key, value in path_arguments.items():
             msg[key] = value
 
+        if self.source.include_request_headers:
+            msg[WEBHOOK_HEADERS_KEY] = json.dumps(list(self.request.headers.get_all()))
+
         if self.source.behind_proxy:
             self._set_proxied_ip(msg)
         else:
@@ -211,6 +218,7 @@ def init_options(self, options: dict[str, Any]) -> bool:
             self.tls_ca_dir = options.get("tls_ca_dir")
 
             self.behind_proxy = bool(options.get("behind_proxy", False))
+            self.include_request_headers = bool(options.get("include_request_headers", False))
             return True
         except KeyError as e:
             self.logger.error(f"Missing option '{e.args[0]}'")