update, tweaking, add

add wordpot incl. json logging with activated plugins
bump snare, tanner, phpox, tanner_redis to latest master and to alpine 3.19

docker/wordpot/Dockerfile

@@ -1,47 +1,48 @@
-FROM alpine:3.17
+FROM alpine:3.19
 #
 # Include dist
 COPY dist/ /root/dist/
 #
 # Install packages
 RUN apk -U --no-cache add \
-             build-base \
-             git \
-	     libcap \
-	     py3-click \
-	     py3-flask \
-	     py3-itsdangerous \
-	     py3-jinja2 \
-	     py3-markupsafe \
-	     py3-pip \
-	     py3-werkzeug \
-             python3 \
-             python3-dev && \
+		build-base \
+		git \
+		libcap \
+		py3-click \
+		py3-flask \
+		py3-itsdangerous \
+		py3-jinja2 \
+		py3-markupsafe \
+		py3-pip \
+		py3-ua-parser \
+		py3-werkzeug \
+		py3-yaml \
+		python3 \
+		python3-dev && \
 #	     
 # Install wordpot from GitHub and setup
     mkdir -p /opt && \
     cd /opt/ && \
-    git clone https://github.com/Will-777/wordpot2 && \
-    cd wordpot2 && \
-    git checkout e93a2e00d84d280b0acd58ba6889b4bee8a6e4d2 && \
-#    cp /root/dist/views.py /opt/wordpot2/wordpot/views.py && \
+    git clone https://github.com/t3chn0m4g3/wordpot && \
+    cd wordpot && \
+    git checkout 8fedeb1b74e1d225da2a7273656bf0afa84a20aa && \
     cp /root/dist/requirements.txt . && \
-    pip3 install -r requirements.txt && \
-    setcap cap_net_bind_service=+ep /usr/bin/python3.10 && \
+    pip3 install --break-system-packages -r requirements.txt && \
+    setcap cap_net_bind_service=+ep $(readlink -f $(type -P python3)) && \
 #
 # Setup user, groups and configs
     addgroup -g 2000 wordpot && \
     adduser -S -H -s /bin/ash -u 2000 -D -g 2000 wordpot && \
-    chown wordpot:wordpot -R /opt/wordpot2 && \
+    chown wordpot:wordpot -R /opt/wordpot && \
 #
 # Clean up
     apk del --purge build-base \
-                    git \
-		    python3-dev && \
-    rm -rf /root/* /var/cache/apk/* /opt/wordpot2/.git
+		git \
+		python3-dev && \
+    rm -rf /root/* /var/cache/apk/* /opt/wordpot/.git
 #
 # Start wordpot
 STOPSIGNAL SIGINT
 USER wordpot:wordpot
-WORKDIR /opt/wordpot2
-CMD ["/usr/bin/python3","wordpot2.py", "--host", "0.0.0.0", "--port", "80", "--title", "Wordpress"]
+WORKDIR /opt/wordpot
+CMD ["/usr/bin/python3","wordpot.py", "--host", "0.0.0.0", "--port", "80", "--title", "Wordpress"]

docker/wordpot/dist/requirements.txt

@@ -1 +1,2 @@
 hpfeeds-threatstream==1.1
+user-agents

docker/wordpot/docker-compose.yml

@@ -17,6 +17,6 @@ services:
     ports:
      - "80:80"
     image: "dtagdevsec/wordpot:alpha"
-    #    read_only: true
-    #    volumes:
-            # - /data/wordpot/log:/opt/ddospot/ddospot/db
+    read_only: true
+    volumes:
+     - $HOME/tpotce/data/wordpot/log:/opt/wordpot/logs/