From cae95ebe20eb9c0159f98562c360fc45e3be9028 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Wed, 28 Aug 2019 12:46:19 +0000
Subject: [PATCH] bump adbhoney to latest master

---
 docker/adbhoney/Dockerfile        | 20 ++++++++++++--------
 docker/adbhoney/dist/adbhoney.cfg | 19 +++++++++++++++++++
 2 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 docker/adbhoney/dist/adbhoney.cfg

diff --git a/docker/adbhoney/Dockerfile b/docker/adbhoney/Dockerfile
index 500b45fd..de1acf48 100644
--- a/docker/adbhoney/Dockerfile
+++ b/docker/adbhoney/Dockerfile
@@ -1,31 +1,35 @@
 FROM alpine 
-
+#
+# Include dist
+ADD dist/ /root/dist/
+#
 # Install packages
 RUN apk -U --no-cache add \
             git \
             libcap \
             python \
             python-dev && \
-
+#
 # Install adbhoney from git
     git clone --depth=1 https://github.com/huuck/ADBHoney /opt/adbhoney && \
-    sed -i 's/dst_ip/dest_ip/' /opt/adbhoney/main.py && \
-    sed -i 's/dst_port/dest_port/' /opt/adbhoney/main.py && \
-
+    cp /root/dist/adbhoney.cfg /opt/adbhoney && \
+    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 && \
     setcap cap_net_bind_service=+ep /usr/bin/python2.7 && \
-
+#
 # Clean up
     apk del --purge git \
                     python-dev && \
     rm -rf /root/* && \
     rm -rf /var/cache/apk/*
-
+#
 # Set workdir and start adbhoney
 STOPSIGNAL SIGINT
 USER adbhoney:adbhoney
 WORKDIR /opt/adbhoney/
-CMD nohup /usr/bin/python main.py -l log/adbhoney.log -j log/adbhoney.json -d dl/
+CMD nohup /usr/bin/python run.py
diff --git a/docker/adbhoney/dist/adbhoney.cfg b/docker/adbhoney/dist/adbhoney.cfg
new file mode 100644
index 00000000..88bacc1d
--- /dev/null
+++ b/docker/adbhoney/dist/adbhoney.cfg
@@ -0,0 +1,19 @@
+[honeypot]
+hostname = honeypot01
+
+address = 0.0.0.0
+port = 5555
+
+download_dir = dl/
+log_dir = log/
+
+device_id = device::http://ro.product.name =starltexx;ro.product.model=SM-G960F;ro.product.device=starlte;features=cmd,stat_v2,shell_v2
+
+[output_log]
+enabled = true
+log_file = adbhoney.log
+log_level = info
+
+[output_json]
+enabled = true
+log_file = adbhoney.json