From 422123139dd086e154c77177f855cb241302191c Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Thu, 14 Nov 2024 16:23:06 +0100
Subject: [PATCH] update adbhoney for py 3.12

---
 README.md                      |  2 +-
 docker/adbhoney/Dockerfile     | 29 ++++++++++---------------
 docker/adbhoney/Dockerfile.old | 39 ++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 19 deletions(-)
 create mode 100644 docker/adbhoney/Dockerfile.old

diff --git a/README.md b/README.md
index 3f867f36..b879b231 100644
--- a/README.md
+++ b/README.md
@@ -896,7 +896,7 @@ Without open source and the development community we are proud to be a part of,
 <br><br>
 
 ## **And of course ***YOU*** for joining the community!**
-<br><br>
+<br>
 
 # Testimonials
 One of the greatest feedback we have gotten so far is by one of the Conpot developers:<br>
diff --git a/docker/adbhoney/Dockerfile b/docker/adbhoney/Dockerfile
index 5d09e5b4..05fb55a9 100644
--- a/docker/adbhoney/Dockerfile
+++ b/docker/adbhoney/Dockerfile
@@ -1,39 +1,32 @@
-FROM alpine:3.19
+FROM alpine:3.20 AS builder
 #
 # Include dist
 COPY dist/ /root/dist/
 #
 # Install packages
-RUN	apk --no-cache -U add \
+RUN	echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
+	apk --no-cache -U add \
+		build-base \
 		git \
 		procps \
 		py3-psutil \
 		py3-requests \
+		py3-pyinstaller@testing \
 		python3 && \
 #
 # Install adbhoney from git
-    git clone https://github.com/huuck/ADBHoney /opt/adbhoney && \
+    git clone https://github.com/t3chn0m4g3/ADBHoney -b pyinstaller /opt/adbhoney && \
     cd /opt/adbhoney && \
-#    git checkout 2417a7a982f4fd527b3a048048df9a23178767ad && \
-    git checkout 42afd98611724ca3d694a48b694c957e8d953db4 && \
     cp /root/dist/adbhoney.cfg /opt/adbhoney && \
-    cp /root/dist/cpu_check.py / && \
     sed -i 's/dst_ip/dest_ip/' /opt/adbhoney/adbhoney/core.py && \
     sed -i 's/dst_port/dest_port/' /opt/adbhoney/adbhoney/core.py && \
+    pyinstaller adbhoney.spec
 #
-# Setup user, groups and configs
-    addgroup -g 2000 adbhoney && \
-    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 adbhoney && \
-    chown -R adbhoney:adbhoney /opt/adbhoney && \
-#
-# Clean up
-    apk del --purge git && \
-    rm -rf /root/* /opt/adbhoney/.git /var/cache/apk/*
+FROM alpine:3.20
+COPY --from=builder /opt/adbhoney/dist/adbhoney/ /opt/adbhoney/
 #
 # Set workdir and start adbhoney
 STOPSIGNAL SIGINT
-# Adbhoney sometimes hangs at 100% CPU usage, if detected container will become unhealthy and restarted by tpotinit
-HEALTHCHECK --interval=5m --timeout=30s --retries=3 CMD python3 /cpu_check.py $(pgrep -of run.py) 99
-USER adbhoney:adbhoney
+USER 2000:2000
 WORKDIR /opt/adbhoney/
-CMD ["/usr/bin/python3", "run.py"]
+CMD ["./adbhoney"]
diff --git a/docker/adbhoney/Dockerfile.old b/docker/adbhoney/Dockerfile.old
new file mode 100644
index 00000000..8e5ec90a
--- /dev/null
+++ b/docker/adbhoney/Dockerfile.old
@@ -0,0 +1,39 @@
+FROM alpine:3.20
+#
+# Include dist
+COPY dist/ /root/dist/
+#
+# Install packages
+RUN	apk --no-cache -U add \
+		git \
+		procps \
+		py3-psutil \
+		py3-requests \
+		python3 && \
+#
+# Install adbhoney from git
+    git clone https://github.com/t3chn0m4g3/ADBHoney /opt/adbhoney && \
+#   cd /opt/adbhoney && \
+#    git checkout 2417a7a982f4fd527b3a048048df9a23178767ad && \
+#   git checkout 42afd98611724ca3d694a48b694c957e8d953db4 && \
+    cp /root/dist/adbhoney.cfg /opt/adbhoney && \
+    cp /root/dist/cpu_check.py / && \
+    sed -i 's/dst_ip/dest_ip/' /opt/adbhoney/adbhoney/core.py && \
+    sed -i 's/dst_port/dest_port/' /opt/adbhoney/adbhoney/core.py && \
+#
+# Setup user, groups and configs
+    addgroup -g 2000 adbhoney && \
+    adduser -S -H -s /bin/ash -u 2000 -D -g 2000 adbhoney && \
+    chown -R adbhoney:adbhoney /opt/adbhoney && \
+#
+# Clean up
+    apk del --purge git && \
+    rm -rf /root/* /opt/adbhoney/.git /var/cache/apk/*
+#
+# Set workdir and start adbhoney
+STOPSIGNAL SIGINT
+# Adbhoney sometimes hangs at 100% CPU usage, if detected container will become unhealthy and restarted by tpotinit
+HEALTHCHECK --interval=5m --timeout=30s --retries=3 CMD python3 /cpu_check.py $(pgrep -of run.py) 99
+USER adbhoney:adbhoney
+WORKDIR /opt/adbhoney/
+CMD ["/usr/bin/python3", "run.py"]