Log events back in the UI

src/common/utils/logger.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 from logging import (
     CRITICAL,
     DEBUG,
@@ -9,10 +10,38 @@ from logging import (
     addLevelName,
     basicConfig,
     getLogger,
+    setLoggerClass,
 )
 from os import getenv
 from typing import Optional, Union
 
+
+class BWLogger(Logger):
+    def __init__(self, name, level=INFO):
+        self.name = name
+        return super(BWLogger, self).__init__(name, level)
+
+    def _log(
+        self,
+        level,
+        msg,
+        args,
+        exc_info=None,
+        extra=None,
+        stack_info=False,
+        stacklevel=1,
+    ):
+        if self.name == "UI":
+            with open("/var/log/nginx/ui.log", "a") as f:
+                f.write(f"[{datetime.now().replace(microsecond=0)}] {msg}\n")
+
+        return super(BWLogger, self)._log(
+            level, msg, args, exc_info, extra, stack_info, stacklevel
+        )
+
+
+setLoggerClass(BWLogger)
+
 default_level = _nameToLevel.get(getenv("LOG_LEVEL", "INFO").upper(), INFO)
 basicConfig(
     format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",

src/ui/Dockerfile

@@ -29,7 +29,7 @@ COPY src/ui /usr/share/bunkerweb/ui
 COPY src/VERSION /usr/share/bunkerweb/VERSION
 
 # Add ui user
-RUN apk add --no-cache bash file && \
+RUN apk add --no-cache bash && \
     addgroup -g 101 ui && \
     adduser -h /var/cache/nginx -g ui -s /bin/sh -G ui -D -H -u 101 ui && \
     echo "Docker" > /usr/share/bunkerweb/INTEGRATION && \
@@ -37,14 +37,15 @@ RUN apk add --no-cache bash file && \
     mkdir -p /etc/bunkerweb && \
     mkdir -p /data/cache && ln -s /data/cache /var/cache/bunkerweb && \
     mkdir -p /data/lib && ln -s /data/lib /var/lib/bunkerweb && \
+    mkdir -p /var/log/nginx/ && touch /var/log/nginx/ui.log && \
     for dir in $(echo "configs plugins") ; do mkdir -p "/data/${dir}" && ln -s "/data/${dir}" "/etc/bunkerweb/${dir}" ; done && \
     for dir in $(echo "configs/http configs/stream configs/server-http configs/server-stream configs/default-server-http configs/default-server-stream configs/modsec configs/modsec-crs") ; do mkdir "/data/${dir}" ; done && \
     chown -R root:ui /data && \
     chmod -R 770 /data && \
-    chown -R root:ui /usr/share/bunkerweb /var/cache/bunkerweb /var/lib/bunkerweb /etc/bunkerweb /var/tmp/bunkerweb && \
+    chown -R root:ui /usr/share/bunkerweb /var/cache/bunkerweb /var/lib/bunkerweb /etc/bunkerweb /var/tmp/bunkerweb /var/log/nginx && \
     for dir in $(echo "/usr/share/bunkerweb /etc/bunkerweb") ; do find ${dir} -type f -exec chmod 0740 {} \; ; done && \
     for dir in $(echo "/usr/share/bunkerweb /etc/bunkerweb") ; do find ${dir} -type d -exec chmod 0750 {} \; ; done && \
-    chmod 770 /var/cache/bunkerweb /var/lib/bunkerweb /var/tmp/bunkerweb && \
+    chmod 770 /var/cache/bunkerweb /var/lib/bunkerweb /var/tmp/bunkerweb /var/log/nginx/ui.log && \
     chmod 750 /usr/share/bunkerweb/gen/*.py /usr/share/bunkerweb/deps/python/bin/* && \
     chmod 660 /usr/share/bunkerweb/INTEGRATION