From 640f8e85fbe757eab9dbbf4f5b8a9ab36facf337 Mon Sep 17 00:00:00 2001 From: Marco Ochse Date: Thu, 29 Mar 2018 20:56:11 +0000 Subject: [PATCH] prepare some fixes, tweaking --- docker/nginx/dist/conf/tpotweb.conf | 4 +++ docker/rdpy/Dockerfile | 6 ++-- docker/spiderfoot/Dockerfile | 42 ++++++++++++++++++++++------ docker/spiderfoot/docker-compose.yml | 5 ++-- etc/compose/collect.yml | 3 +- etc/compose/tpot.yml | 5 ++-- 6 files changed, 49 insertions(+), 16 deletions(-) diff --git a/docker/nginx/dist/conf/tpotweb.conf b/docker/nginx/dist/conf/tpotweb.conf index f11a2efe..67cf9208 100644 --- a/docker/nginx/dist/conf/tpotweb.conf +++ b/docker/nginx/dist/conf/tpotweb.conf @@ -152,4 +152,8 @@ server { location /scanviz { proxy_pass http://127.0.0.1:64303/spiderfoot/scanviz; } + + location /scandelete { + proxy_pass http://127.0.0.1:64303/spiderfoot/scandelete; + } } diff --git a/docker/rdpy/Dockerfile b/docker/rdpy/Dockerfile index 08c247c9..39fe3699 100644 --- a/docker/rdpy/Dockerfile +++ b/docker/rdpy/Dockerfile @@ -16,7 +16,7 @@ RUN apk -U upgrade && \ python-dev \ py-pip \ py-setuptools && \ - apk -U add --repository https://dl-cdn.alpinelinux.org/alpine/edge/testing/ \ + apk -U add --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \ py-qt && \ # Setup user @@ -31,7 +31,7 @@ RUN apk -U upgrade && \ pyopenssl \ qt4reactor \ service_identity \ - rsa pyasn1==0.3.4 && \ + rsa pyasn1 && \ cd rdpy && \ python setup.py install && \ @@ -43,6 +43,7 @@ RUN apk -U upgrade && \ # Clean up rm -rf /root/* && \ apk del --purge build-base \ + git \ libffi-dev \ openssl-dev \ python-dev \ @@ -51,4 +52,5 @@ RUN apk -U upgrade && \ rm -rf /var/cache/apk/* # Start rdpy +USER rdpy:rdpy CMD /usr/bin/python2 -i /usr/bin/rdpy-rdphoneypot.py /home/rdpy/1 /home/rdpy/2 /home/rdpy/3 >> /var/log/rdpy/rdpy.log diff --git a/docker/spiderfoot/Dockerfile b/docker/spiderfoot/Dockerfile index 40917b33..620f179c 100644 --- a/docker/spiderfoot/Dockerfile +++ b/docker/spiderfoot/Dockerfile @@ -1,32 +1,56 @@ FROM alpine -MAINTAINER MO # Get and install dependencies & packages RUN apk -U upgrade && \ - apk add bash build-base curl git libxml2-dev libxslt-dev openssl-dev procps python-dev py-lxml py-netaddr py-mako py-pip py-setuptools py-requests swig && \ - apk -U add --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ \ - py-beautifulsoup4 py-cherrypy && \ - pip install m2crypto && \ + apk add bash \ + build-base \ + curl \ + git \ + libxml2-dev \ + libxslt-dev \ + openssl-dev \ + procps \ + python-dev \ + py-lxml \ + py-netaddr \ + py-mako \ + py-pip \ + py-setuptools \ + py-requests \ + swig && \ + pip install cherrypy \ + bs4 \ + m2crypto && \ # Setup user addgroup -g 2000 spiderfoot && \ adduser -S -s /bin/bash -u 2000 -D -g 2000 spiderfoot && \ # Install spiderfoot - git clone https://github.com/smicallef/spiderfoot -b v2.11.0-final /home/spiderfoot && \ + git clone https://github.com/smicallef/spiderfoot -b v2.12.0-final /home/spiderfoot && \ chown -R spiderfoot:spiderfoot /home/spiderfoot && \ sed -i "s#'__docroot': ''#'__docroot': '\/spiderfoot'#" /home/spiderfoot/sf.py && \ sed -i 's#raise cherrypy.HTTPRedirect("\/")#raise cherrypy.HTTPRedirect("\/spiderfoot")#' /home/spiderfoot/sfwebui.py && \ # Clean up - apk del build-base git libxml2-dev libxslt-dev openssl-dev python-dev py-pip py-setuptools && \ - apk add openssl libxml2 libxslt python && \ + apk del --purge build-base \ + git \ + libxml2-dev \ + libxslt-dev \ + openssl-dev \ + python-dev \ + py-pip \ + py-setuptools && \ + apk add openssl \ + libxml2 \ + libxslt \ + python && \ rm -rf /var/cache/apk/* # Healthcheck HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:8080' # Set user, workdir and start spiderfoot -USER spiderfoot +USER spiderfoot:spiderfoot WORKDIR /home/spiderfoot CMD ["/usr/bin/python", "sf.py", "0.0.0.0:8080"] diff --git a/docker/spiderfoot/docker-compose.yml b/docker/spiderfoot/docker-compose.yml index ba16806d..c9aa2428 100644 --- a/docker/spiderfoot/docker-compose.yml +++ b/docker/spiderfoot/docker-compose.yml @@ -1,6 +1,6 @@ # T-Pot (Standard) # For docker-compose ... -version: '2.1' +version: '2.2' networks: spiderfoot_local: @@ -9,12 +9,13 @@ services: # Spiderfoot service spiderfoot: + build: . container_name: spiderfoot restart: always networks: - spiderfoot_local ports: - "127.0.0.1:64303:8080" - image: "dtagdevsec/spiderfoot:1710" + image: "dtagdevsec/spiderfoot:1804" volumes: - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db diff --git a/etc/compose/collect.yml b/etc/compose/collect.yml index 7593ed95..d4d86b1d 100644 --- a/etc/compose/collect.yml +++ b/etc/compose/collect.yml @@ -162,13 +162,14 @@ services: # Spiderfoot service spiderfoot: + build: . container_name: spiderfoot restart: always networks: - spiderfoot_local ports: - "127.0.0.1:64303:8080" - image: "dtagdevsec/spiderfoot:1710" + image: "dtagdevsec/spiderfoot:1804" volumes: - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db diff --git a/etc/compose/tpot.yml b/etc/compose/tpot.yml index 869a5a19..0648d64d 100644 --- a/etc/compose/tpot.yml +++ b/etc/compose/tpot.yml @@ -257,7 +257,8 @@ services: - rdpy_local ports: - "3389:3389" - image: "dtagdevsec/rdpy:1710" + image: "dtagdevsec/rdpy:1804" + read_only: true volumes: - /data/rdpy/log:/var/log/rdpy @@ -269,7 +270,7 @@ services: - spiderfoot_local ports: - "127.0.0.1:64303:8080" - image: "dtagdevsec/spiderfoot:1710" + image: "dtagdevsec/spiderfoot:1804" volumes: - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db