From 1b0d11177b519f6d3805ccaab5f953472fece186 Mon Sep 17 00:00:00 2001
From: Marco Ochse <t3chn0m4g3@gmail.com>
Date: Mon, 28 May 2018 16:42:39 +0000
Subject: [PATCH] prepare for snare, tanner

---
 docker/glutton/Dockerfile.multi | 59 +++++++++++++++++++++++++++++++++
 docker/glutton/Dockerfile.old   | 52 +++++++++++++++++++++++++++++
 etc/logrotate/logrotate.conf    |  1 +
 iso/installer/install.sh        |  1 +
 4 files changed, 113 insertions(+)
 create mode 100644 docker/glutton/Dockerfile.multi
 create mode 100644 docker/glutton/Dockerfile.old

diff --git a/docker/glutton/Dockerfile.multi b/docker/glutton/Dockerfile.multi
new file mode 100644
index 00000000..ab46ab0b
--- /dev/null
+++ b/docker/glutton/Dockerfile.multi
@@ -0,0 +1,59 @@
+### Builder
+FROM alpine
+
+# Include dist
+ADD dist/ /root/dist/
+  
+# Setup apk
+RUN apk -U --no-cache add \
+                   build-base \
+                   git \
+                   go \
+                   g++ \
+                   iptables-dev \
+                   libnetfilter_queue-dev \
+                   libcap \
+                   libpcap-dev && \
+
+# Setup go, build glutton
+    export GOPATH=/opt/go/ && \
+    mkdir -p /opt/go/ && \
+    go get -d github.com/mushorg/glutton && \
+    go get -u github.com/golang/dep/cmd/dep && \
+    mv /root/dist/system.go /opt/go/src/github.com/mushorg/glutton/ && \
+    cd /opt/go/src/github.com/mushorg/glutton/ && \
+    /opt/go/bin/dep ensure && \
+    make build && \
+    cd / && \
+    mkdir glutton && \
+    mv /opt/go/src/github.com/mushorg/glutton/bin /glutton && \
+    mv /opt/go/src/github.com/mushorg/glutton/config /glutton && \
+    mv /opt/go/src/github.com/mushorg/glutton/rules /glutton && \
+    mv /root/dist/rules.yaml /glutton/rules/
+
+### Final Image
+FROM alpine
+
+COPY --from=0 /glutton /opt/glutton/
+
+# Add deps
+RUN apk -U --no-cache add iptables-dev \
+                          libcap && \
+
+# Setup user, groups and configs
+    ls -R /opt/glutton && \
+    addgroup -g 2000 glutton && \
+    adduser -S -s /bin/ash -u 2000 -D -g 2000 glutton && \
+    mkdir -p /var/log/glutton && \
+
+# Setup glutton
+    setcap cap_net_admin,cap_net_raw=+ep /opt/glutton/bin/server && \
+    setcap cap_net_admin,cap_net_raw=+ep /sbin/xtables-multi && \
+
+    rm -rf /var/cache/apk/*
+
+
+# Start glutton 
+WORKDIR /opt/glutton
+USER glutton:glutton
+CMD exec bin/server -i $(/sbin/ip address | grep '^2: ' | awk '{ print $2 }' | tr -d [:punct:]) -l /var/log/glutton/glutton.log
diff --git a/docker/glutton/Dockerfile.old b/docker/glutton/Dockerfile.old
new file mode 100644
index 00000000..0507d55e
--- /dev/null
+++ b/docker/glutton/Dockerfile.old
@@ -0,0 +1,52 @@
+FROM alpine
+
+# Include dist
+ADD dist/ /root/dist/
+  
+# Setup apk
+RUN apk -U --no-cache add \
+                   build-base \
+                   git \
+                   go \
+                   g++ \
+                   iptables-dev \
+                   libnetfilter_queue-dev \
+                   libcap \
+                   libpcap-dev && \
+
+# Setup go, glutton
+    export GOPATH=/opt/go/ && \
+    mkdir -p /opt/go/ && \
+    go get -d github.com/mushorg/glutton && \
+    go get -u github.com/golang/dep/cmd/dep && \
+    mv /root/dist/system.go /opt/go/src/github.com/mushorg/glutton/ && \
+    cd /opt/go/src/github.com/mushorg/glutton/ && \
+    /opt/go/bin/dep ensure && \
+    make build && \
+    cd / && \
+    mkdir -p /opt/glutton && \
+    mv /opt/go/src/github.com/mushorg/glutton/bin /opt/glutton/ && \
+    mv /opt/go/src/github.com/mushorg/glutton/config /opt/glutton/ && \
+    mv /opt/go/src/github.com/mushorg/glutton/rules /opt/glutton/ && \
+    setcap cap_net_admin,cap_net_raw=+ep /opt/glutton/bin/server && \
+    setcap cap_net_admin,cap_net_raw=+ep /sbin/xtables-multi && \
+
+# Setup user, groups and configs
+    addgroup -g 2000 glutton && \
+    adduser -S -s /bin/ash -u 2000 -D -g 2000 glutton && \
+    mkdir -p /var/log/glutton && \
+    mv /root/dist/rules.yaml /opt/glutton/rules/ && \
+
+# Clean up
+    apk del --purge build-base \
+                    git \
+                    go \
+                    g++ && \
+    rm -rf /var/cache/apk/* \
+           /opt/go \
+           /root/dist
+
+# Start glutton 
+WORKDIR /opt/glutton
+USER glutton:glutton
+CMD exec bin/server -i $(/sbin/ip address | grep '^2: ' | awk '{ print $2 }' | tr -d [:punct:]) -l /var/log/glutton/glutton.log
diff --git a/etc/logrotate/logrotate.conf b/etc/logrotate/logrotate.conf
index 02046457..28cfb27c 100644
--- a/etc/logrotate/logrotate.conf
+++ b/etc/logrotate/logrotate.conf
@@ -31,6 +31,7 @@
 /data/rdpy/log/rdpy.log
 /data/suricata/log/*.log
 /data/suricata/log/*.json
+/data/tanner/log/*.json
 /data/vnclowpot/log/vnclowpot.log
 {
 	su tpot tpot
diff --git a/iso/installer/install.sh b/iso/installer/install.sh
index cc85929b..3792e37a 100755
--- a/iso/installer/install.sh
+++ b/iso/installer/install.sh
@@ -455,6 +455,7 @@ mkdir -p /data/ciscoasa/log \
          /data/rdpy/log \
          /data/spiderfoot \
          /data/suricata/log /home/tsec/.ssh/ \
+	 /data/tanner/log \
          /data/p0f/log \
          /data/vnclowpot/log 2>&1 | dialog --title "[ Creating some files and folders ]" $myPROGRESSBOXCONF
 touch /data/spiderfoot/spiderfoot.db 2>&1 | dialog --title "[ Creating some files and folders ]" $myPROGRESSBOXCONF