tweaking, hardening

docker/dionaea/Dockerfile

@@ -15,6 +15,7 @@ RUN apt-get update -y && \
       check \
       cython3 \
       git \
+      libcap2-bin \
       libcurl4-openssl-dev \
       libemu-dev \
       libev-dev \
@@ -54,6 +55,7 @@ RUN apt-get update -y && \
 # Setup user and groups
     addgroup --gid 2000 dionaea && \
     adduser --system --no-create-home --shell /bin/bash --uid 2000 --disabled-password --disabled-login --gid 2000 dionaea && \
+    setcap cap_net_bind_service=+ep /opt/dionaea/bin/dionaea && \
 
 # Supply configs and set permissions
     chown -R dionaea:dionaea /opt/dionaea/var && \
@@ -105,4 +107,5 @@ RUN apt-get update -y && \
     rm -rf /root/* /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Start dionaea
+USER dionaea:dionaea
 CMD ["/opt/dionaea/bin/dionaea", "-u", "dionaea", "-g", "dionaea", "-c", "/opt/dionaea/etc/dionaea/dionaea.cfg"]

docker/dionaea/dist/etc/services/http.yaml

@@ -2,7 +2,7 @@
   config:
     root: "/opt/dionaea/var/dionaea/roots/www"
     ports:
-      - 80
+      - 8081
     ssl_ports:
       - 443
     max_request_size: 32768 # maximum size in kbytes of the request (32MB)

docker/dionaea/docker-compose.yml

@@ -2,8 +2,8 @@
 # For docker-compose ...
 version: '2.2'
 
-networks:
+#networks:
-  dionaea_local:
+#  dionaea_local:
 
 services:
 
@@ -13,16 +13,15 @@ services:
     container_name: dionaea
     stdin_open: true
     restart: always
-    networks:
+    network_mode: "host"
-     - dionaea_local
+    #    networks:
-    cap_add:
+    #     - dionaea_local
-     - NET_BIND_SERVICE
     ports:
      - "20:20"
      - "21:21"
      - "42:42"
      - "69:69/udp"
-     - "8081:80"
+     - "8081:8081"
      - "135:135"
      - "443:443"
      - "445:445"
@@ -35,6 +34,7 @@ services:
      - "5061:5061"
      - "27017:27017"
     image: "dtagdevsec/dionaea:1804"
+    read_only: true
     volumes:
      - /data/dionaea/roots/ftp:/opt/dionaea/var/dionaea/roots/ftp
      - /data/dionaea/roots/tftp:/opt/dionaea/var/dionaea/roots/tftp

docker/elasticpot/Dockerfile

@@ -24,11 +24,11 @@ RUN apk -U upgrade && \
     mkdir /opt/ElasticpotPY/log && \
 
 # Clean up
-    apk del git && \
+    apk del --purge git && \
     rm -rf /root/* && \
     rm -rf /var/cache/apk/*
 
 # Start elasticpot
-USER elasticpot
+USER elasticpot:elasticpot
 WORKDIR /opt/ElasticpotPY/
 CMD ["/usr/bin/python3","main.py"]

docker/elasticpot/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '2.1'
+version: '2.2'
 
 networks:
   elasticpot_local:
@@ -15,5 +15,6 @@ services:
     ports:
      - "9200:9200"
     image: "dtagdevsec/elasticpot:1804"
+    read_only: true
     volumes:
      - /data/elasticpot/log:/opt/ElasticpotPY/log

docker/elk/docker-compose.yml

@@ -0,0 +1,65 @@
+# T-Pot (Standard)
+# For docker-compose ...
+version: '2.2'
+
+services:
+
+# ELK services
+## Elasticsearch service
+  elasticsearch:
+    container_name: elasticsearch
+    restart: always
+    environment:
+     - bootstrap.memory_lock=true
+     - "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
+    cap_add:
+     - IPC_LOCK
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+      nofile:
+        soft: 65536
+        hard: 65536
+    mem_limit: 2g
+    ports:
+     - "127.0.0.1:64298:9200"
+    image: "dtagdevsec/elasticsearch:1804"
+    volumes:
+     - /data:/data
+
+## Kibana service
+  kibana:
+    container_name: kibana
+    restart: always
+    depends_on:
+      elasticsearch:
+        condition: service_healthy
+    ports:
+     - "127.0.0.1:64296:5601"
+    image: "dtagdevsec/kibana:1804"
+
+## Logstash service
+  logstash:
+    container_name: logstash
+    restart: always
+    depends_on:
+      elasticsearch:
+        condition: service_healthy
+    env_file:
+     - /opt/tpot/etc/compose/elk_environment
+    image: "dtagdevsec/logstash:1804"
+    volumes:
+     - /data:/data
+     - /var/log:/data/host/log
+
+## Elasticsearch-head service
+  head:
+    container_name: head
+    restart: always
+    depends_on:
+      elasticsearch:
+        condition: service_healthy
+    ports:
+     - "127.0.0.1:64302:9100"
+    image: "dtagdevsec/head:1804"

docker/elk/elasticsearch/Dockerfile

@@ -28,12 +28,12 @@ RUN apk -U upgrade && \
     chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/ && \
 
 # Clean up
-    apk del wget && \
+    apk del --purge wget && \
     rm -rf /root/*
 
 # Healthcheck
 HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9200/_cat/health'
 
 # Start ELK
-USER elasticsearch
+USER elasticsearch:elasticsearch
 CMD ["/usr/share/elasticsearch/bin/elasticsearch"]

docker/elk/elasticsearch/docker-compose.yml

@@ -0,0 +1,30 @@
+# T-Pot (Standard)
+# For docker-compose ...
+version: '2.2'
+
+services:
+
+# ELK services
+## Elasticsearch service
+  elasticsearch:
+    build: .
+    container_name: elasticsearch
+    restart: always
+    environment:
+     - bootstrap.memory_lock=true
+     - "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
+    cap_add:
+     - IPC_LOCK
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+      nofile:
+        soft: 65536
+        hard: 65536
+    mem_limit: 2g
+    ports:
+     - "127.0.0.1:64298:9200"
+    image: "dtagdevsec/elasticsearch:1804"
+    volumes:
+     - /data:/data

docker/elk/head/Dockerfile

@@ -22,12 +22,12 @@ RUN apk -U upgrade && \
     chown -R head:head /usr/src/app/ && \
 
 # Clean up
-    apk del git
+    apk del --purge git
 
 # Healthcheck
 HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9100'
 
 # Start elasticsearch-head
-USER head
+USER head:head
 WORKDIR /usr/src/app
 CMD ["node_modules/http-server/bin/http-server", "_site", "-p", "9100"]

docker/elk/head/docker-compose.yml

@@ -0,0 +1,18 @@
+# T-Pot (Standard)
+# For docker-compose ...
+version: '2.2'
+
+services:
+
+## Elasticsearch-head service
+  head:
+    build: .
+    container_name: head
+    restart: always
+    #    depends_on:
+    #      elasticsearch:
+    #        condition: service_healthy
+    ports:
+     - "127.0.0.1:64302:9100"
+    image: "dtagdevsec/head:1804"
+    read_only: true

docker/elk/kibana/Dockerfile

@@ -44,12 +44,12 @@ RUN apk -U upgrade && \
     chown -R kibana:kibana /usr/share/kibana/ && \
 
 # Clean up
-    apk del wget && \
+    apk del --purge wget && \
     rm -rf /root/*
 
 # Healthcheck
 HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:5601'
 
 # Start kibana
-USER kibana
+USER kibana:kibana
 CMD ["/usr/share/kibana/bin/kibana"]

docker/elk/kibana/docker-compose.yml

@@ -0,0 +1,17 @@
+# T-Pot (Standard)
+# For docker-compose ...
+version: '2.2'
+
+services:
+
+## Kibana service
+  kibana:
+    build: .
+    container_name: kibana
+    restart: always
+#    depends_on:
+#      elasticsearch:
+#        condition: service_healthy
+    ports:
+     - "127.0.0.1:64296:5601"
+    image: "dtagdevsec/kibana:1804"

docker/elk/logstash/Dockerfile

@@ -33,12 +33,20 @@ RUN apk -U upgrade && \
     cp logstash.conf /etc/logstash/conf.d/ && \
     cp elasticsearch-template-es5x.json /usr/share/logstash/vendor/bundle/jruby/1.9/gems/logstash-output-elasticsearch-7.4.2-java/lib/logstash/outputs/elasticsearch/ && \
 
+# Setup user, groups and configs
+    addgroup -g 2000 logstash && \
+    adduser -S -H -s /bin/bash -u 2000 -D -g 2000 logstash && \
+    chown -R logstash:logstash /usr/share/logstash && \
+    chown -R logstash:logstash /etc/listbot && \
+    chmod 755 /usr/bin/update.sh && \
+
 # Clean up
-    apk del wget && \
+    apk del --purge wget && \
     rm -rf /root/*
 
 # Healthcheck
 HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:9600'
 
 # Start logstash
+USER logstash:logstash
 CMD update.sh && /usr/share/logstash/bin/logstash -f /etc/logstash/conf.d/logstash.conf

docker/elk/logstash/docker-compose.yml

@@ -0,0 +1,20 @@
+# T-Pot (Standard)
+# For docker-compose ...
+version: '2.2'
+
+services:
+
+## Logstash service
+  logstash:
+    build: .
+    container_name: logstash
+    restart: always
+#    depends_on:
+#      elasticsearch:
+#        condition: service_healthy
+    env_file:
+     - /opt/tpot/etc/compose/elk_environment
+    image: "dtagdevsec/logstash:1804"
+    volumes:
+     - /data:/data
+     - /var/log:/data/host/log

docker/ews/Dockerfile

@@ -30,6 +30,7 @@ RUN apk -U upgrade && \
 # Setup user and groups
     addgroup -g 2000 ews && \
     adduser -S -H -u 2000 -D -g 2000 ews && \
+    chown -R ews:ews /opt/ewsposter && \
 
 # Supply configs
     mv /root/dist/ews.cfg /opt/ewsposter/ && \
@@ -45,4 +46,5 @@ RUN apk -U upgrade && \
     rm -rf /var/cache/apk/*
 
 # Run ewsposter
+USER ews:ews
 CMD sleep 10 && /usr/bin/python /opt/ewsposter/ews.py -l 60

docker/ews/docker-compose.yml

@@ -0,0 +1,23 @@
+# T-Pot (Standard)
+# For docker-compose ...
+version: '2.2'
+
+networks:
+  ewsposter_local:
+
+services:
+
+# Ewsposter service
+  ewsposter:
+    build: .
+    container_name: ewsposter
+    restart: always
+    networks:
+     - ewsposter_local
+    env_file:
+     - /opt/tpot/etc/compose/elk_environment
+    image: "dtagdevsec/ewsposter:1804"
+    volumes:
+     - /data:/data
+     - /data/ews/conf/ews.ip:/opt/ewsposter/ews.ip
+

etc/compose/collect.yml

@@ -69,6 +69,7 @@ services:
     ports:
      - "127.0.0.1:64302:9100"
     image: "dtagdevsec/head:1804"
+    read_only: true
 
 # Ewsposter service
   ewsposter:

etc/compose/tpot.yml

@@ -5,7 +5,7 @@ version: '2.2'
 networks:
   ciscoasa_local:
   cowrie_local:
-  dionaea_local:
+#  dionaea_local:
   elasticpot_local:
   ewsposter_local:
   glastopf_local:
@@ -51,16 +51,15 @@ services:
     container_name: dionaea
     stdin_open: true
     restart: always
-    networks:
+    network_mode: "host"
-     - dionaea_local
+#    networks:
-    cap_add:
+#     - dionaea_local
-     - NET_BIND_SERVICE
     ports:
      - "20:20"
      - "21:21"
      - "42:42"
      - "69:69/udp"
-     - "8081:80"
+     - "8081:8081"
      - "135:135"
      - "443:443"
      - "445:445"
@@ -73,6 +72,7 @@ services:
      - "5061:5061"
      - "27017:27017"
     image: "dtagdevsec/dionaea:1804"
+    read_only: true
     volumes:
      - /data/dionaea/roots/ftp:/opt/dionaea/var/dionaea/roots/ftp
      - /data/dionaea/roots/tftp:/opt/dionaea/var/dionaea/roots/tftp
@@ -92,6 +92,7 @@ services:
     ports:
      - "9200:9200"
     image: "dtagdevsec/elasticpot:1804"
+    read_only: true
     volumes:
      - /data/elasticpot/log:/opt/ElasticpotPY/log
 
@@ -154,6 +155,7 @@ services:
     ports:
      - "127.0.0.1:64302:9100"
     image: "dtagdevsec/head:1804"
+    read_only: true
 
 # Ewsposter service
   ewsposter: