From dc75b5567a61a67a3201456ba4f1dc98274e14a3 Mon Sep 17 00:00:00 2001 From: pisces-period <49252975+pisces-period@users.noreply.github.com> Date: Thu, 23 Jan 2020 17:42:48 +0100 Subject: [PATCH 1/3] make Dockerfile compatible with any Python version adding a temporary variable to store the current (updated) version of Python, thus fixing the situation where the version is != 3.7 (e.g. Alpine python package at version 3.8.1-r1), causing lines 39-41 to break in the original code (install path is hard-coded at 3.7). --- docker/cowrie/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docker/cowrie/Dockerfile b/docker/cowrie/Dockerfile index d4e56572..0baee577 100644 --- a/docker/cowrie/Dockerfile +++ b/docker/cowrie/Dockerfile @@ -36,9 +36,10 @@ RUN apk -U add \ pip3 install --upgrade -r requirements.txt && \ # # Setup configs - setcap cap_net_bind_service=+ep /usr/bin/python3.7 && \ + export PYTHON_DIR=$(python3 --version | tr '[A-Z]' '[a-z]' | tr -d ' ' | cut -d '.' -f 1,2 ) && \ + setcap cap_net_bind_service=+ep /usr/bin/$PYTHON_DIR && \ cp /root/dist/cowrie.cfg /home/cowrie/cowrie/cowrie.cfg && \ - chown cowrie:cowrie -R /home/cowrie/* /usr/lib/python3.7/site-packages/twisted/plugins && \ + chown cowrie:cowrie -R /home/cowrie/* /usr/lib/$PYTHON_DIR/site-packages/twisted/plugins && \ # # Start Cowrie once to prevent dropin.cache errors upon container start caused by read-only filesystem su - cowrie -c "export PYTHONPATH=/home/cowrie/cowrie:/home/cowrie/cowrie/src && \ @@ -59,7 +60,8 @@ RUN apk -U add \ py3-mysqlclient && \ rm -rf /root/* /tmp/* && \ rm -rf /var/cache/apk/* && \ - rm -rf /home/cowrie/cowrie/cowrie.pid + rm -rf /home/cowrie/cowrie/cowrie.pid && \ + unset PYTHON_DIR # # Start cowrie ENV PYTHONPATH /home/cowrie/cowrie:/home/cowrie/cowrie/src From f2abb1d1bdeafc702bb2f9590c1922532a1bf619 Mon Sep 17 00:00:00 2001 From: Marco Ochse Date: Mon, 3 Feb 2020 17:46:11 +0100 Subject: [PATCH 2/3] release mailoney, elk 7.x into NextGen 19.03.x --- etc/compose/nextgen.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/compose/nextgen.yml b/etc/compose/nextgen.yml index 0bb76907..60b534dd 100644 --- a/etc/compose/nextgen.yml +++ b/etc/compose/nextgen.yml @@ -288,7 +288,7 @@ services: - mailoney_local ports: - "25:25" - image: "dtagdevsec/mailoney:1903" + image: "dtagdevsec/mailoney:2006" read_only: true volumes: - /data/mailoney/log:/opt/mailoney/logs @@ -496,7 +496,7 @@ services: mem_limit: 4g ports: - "127.0.0.1:64298:9200" - image: "dtagdevsec/elasticsearch:1903" + image: "dtagdevsec/elasticsearch:2006" volumes: - /data:/data @@ -509,7 +509,7 @@ services: condition: service_healthy ports: - "127.0.0.1:64296:5601" - image: "dtagdevsec/kibana:1903" + image: "dtagdevsec/kibana:2006" ## Logstash service logstash: @@ -520,7 +520,7 @@ services: condition: service_healthy env_file: - /opt/tpot/etc/compose/elk_environment - image: "dtagdevsec/logstash:1903" + image: "dtagdevsec/logstash:2006" volumes: - /data:/data @@ -533,7 +533,7 @@ services: condition: service_healthy ports: - "127.0.0.1:64302:9100" - image: "dtagdevsec/head:1903" + image: "dtagdevsec/head:2006" read_only: true # Ewsposter service From d889651d632f5f260717276951e98fe47f36ac60 Mon Sep 17 00:00:00 2001 From: skoops Date: Mon, 24 Feb 2020 13:22:00 +0100 Subject: [PATCH 3/3] Update install.sh fix password check by providing cracklib-check for later usage --- iso/installer/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iso/installer/install.sh b/iso/installer/install.sh index cb92db9b..a5e5ab37 100755 --- a/iso/installer/install.sh +++ b/iso/installer/install.sh @@ -13,7 +13,7 @@ myTPOTCOMPOSE="/opt/tpot/etc/tpot.yml" myLSB_STABLE_SUPPORTED="stretch buster" myLSB_TESTING_SUPPORTED="sid" myREMOTESITES="https://hub.docker.com https://github.com https://pypi.python.org https://debian.org" -myPREINSTALLPACKAGES="aria2 apache2-utils curl dialog figlet fuse grc libcrack2 libpq-dev lsb-release netselect-apt net-tools software-properties-common toilet" +myPREINSTALLPACKAGES="aria2 apache2-utils curl cracklib-runtime dialog figlet fuse grc libcrack2 libpq-dev lsb-release netselect-apt net-tools software-properties-common toilet" myINSTALLPACKAGES="aria2 apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker console-setup console-setup-linux curl debconf-utils dialog dnsutils docker.io docker-compose ethtool fail2ban figlet genisoimage git glances grc haveged html2text htop iptables iw jq kbd libcrack2 libltdl7 man mosh multitail netselect-apt net-tools npm ntp openssh-server openssl pass pigz prips software-properties-common syslinux psmisc pv python3-pip toilet unattended-upgrades unzip vim wget wireless-tools wpasupplicant" myINFO="\ ########################################