Merge pull request #268 from OWASP/development

Ali Razmjoo · web-flow · commit de441a9a4245 · 2021-04-20T20:33:43.000+02:00
Development
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.5.9, 3.6.11, 3.7.8, 3.8.5]
+        python-version: [3.9.4, 3.8.9]
 
     steps:
       - uses: actions/checkout@v2
@@ -77,11 +77,8 @@ jobs:
       - name: Check API server logs
         run: docker-compose logs ohp
 
-      - name: Kill API Server
-        run: docker-compose down
-      
-      - name: Start mongodb
-        run: docker run -p 27017-27019:27017-27019 -d mongo
-
       - name: Run modules test
         run: sudo python3 ohp.py -m all --test --store-pcap
+
+      - name: Kill API Server
+        run: docker-compose down
diff --git a/core/load.py b/core/load.py
@@ -464,9 +464,9 @@ def honeypot_configuration_builder(selected_modules):
     return honeypot_configuration
 
 
-def port_is_reserved(real_machine_port):
+def port_is_free(real_machine_port):
     """
-    check if port is reserved
+    check if port is free
 
     Args:
         real_machine_port: port number
@@ -478,14 +478,14 @@ def port_is_reserved(real_machine_port):
         tcp = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         tcp.bind(
             (
-                network_configuration()["real_machine_ip_address"],
+                "0.0.0.0",
                 real_machine_port
             )
         )
         tcp.close()
-        return False
-    except Exception:
         return True
+    except Exception:
+        return False
 
 
 def reserve_tcp_port(real_machine_port, module_name, configuration):
@@ -502,16 +502,15 @@ def reserve_tcp_port(real_machine_port, module_name, configuration):
     """
     while True:
         try:
-            if not port_is_reserved(real_machine_port):
+            if port_is_free(real_machine_port):
                 # unique_port = True
                 configuration[module_name]["real_machine_port_number"] = real_machine_port
                 duplicated_ports = []
                 for selected_module in configuration:
                     duplicated_ports.append(
                         configuration[selected_module]["real_machine_port_number"])
                 if duplicated_ports.count(real_machine_port) == 1:
-                    info("port {0} selected for {1}".format(
-                        real_machine_port, module_name))
+                    info("port {0} selected for {1}".format(real_machine_port, module_name))
                     return real_machine_port
         except Exception:
             pass
diff --git a/modules/ftp/strong_password/Dockerfile b/modules/ftp/strong_password/Dockerfile
@@ -1,5 +1,5 @@
 # using phusion/baseimage as base image
-FROM ubuntu:20.04
+FROM ubuntu:latest
 
 # use baseimage-docker's init system.
 CMD ["/sbin/my_init"]
diff --git a/modules/ftp/strong_password/files/requirements-apt-get.txt b/modules/ftp/strong_password/files/requirements-apt-get.txt
@@ -1,2 +1,2 @@
-python3=3.8.2-0ubuntu2
-python3-pip=20.0.2-5ubuntu1.1
+python3
+python3-pip
diff --git a/modules/ftp/weak_password/Dockerfile b/modules/ftp/weak_password/Dockerfile
@@ -1,5 +1,5 @@
 # using phusion/baseimage as base image
-FROM phusion/baseimage:0.9.19
+FROM phusion/baseimage:master
 
 # use baseimage-docker's init system.
 CMD ["/sbin/my_init"]
diff --git a/modules/ftp/weak_password/files/requirements-apt-get.txt b/modules/ftp/weak_password/files/requirements-apt-get.txt
@@ -1,3 +1,3 @@
-vsftpd=3.0.3-3ubuntu2 
-libpam-pwdfile=1.0-1 
-apache2-utils=2.4.18-2ubuntu3.17
+vsftpd
+libpam-pwdfile
+apache2-utils
diff --git a/modules/http/basic_auth_strong_password/Dockerfile b/modules/http/basic_auth_strong_password/Dockerfile
@@ -1,5 +1,5 @@
 # using phusion/baseimage as base image
-FROM phusion/baseimage:0.9.19
+FROM phusion/baseimage:master
 
 # update and install apache + python
 
@@ -16,4 +16,4 @@ COPY files/.htaccess /var/www/html/.htaccess
 COPY files/apache2.conf /etc/apache2/apache2.conf
 
 # start the service + wait for container
-ENTRYPOINT service apache2 restart && tail
+ENTRYPOINT service apache2 restart && tail
diff --git a/modules/http/basic_auth_strong_password/files/requirements-apt-get.txt b/modules/http/basic_auth_strong_password/files/requirements-apt-get.txt
@@ -1,2 +1,2 @@
-apache2=2.4.18-2ubuntu3.17
-apache2-utils=2.4.18-2ubuntu3.17
+apache2
+apache2-utils
diff --git a/modules/http/basic_auth_weak_password/Dockerfile b/modules/http/basic_auth_weak_password/Dockerfile
@@ -1,5 +1,5 @@
 # using phusion/baseimage as base image
-FROM phusion/baseimage:0.9.19
+FROM phusion/baseimage:master
 
 # update and install apache + python
 COPY files/requirements-apt-get.txt requirements-apt-get.txt
@@ -17,4 +17,4 @@ COPY files/.htaccess /var/www/html/.htaccess
 RUN sed -i 's/AllowOverride None/AllowOverride All/g' /etc/apache2/apache2.conf
 
 # start the service + wait for container
-ENTRYPOINT service apache2 restart && tail
+ENTRYPOINT service apache2 restart && tail
diff --git a/modules/http/basic_auth_weak_password/files/requirements-apt-get.txt b/modules/http/basic_auth_weak_password/files/requirements-apt-get.txt
@@ -1,2 +1,2 @@
-apache2=2.4.18-2ubuntu3.17
-apache2-utils=2.4.18-2ubuntu3.17
+apache2
+apache2-utils
diff --git a/modules/ics/veeder_root_guardian_ast/Dockerfile b/modules/ics/veeder_root_guardian_ast/Dockerfile
@@ -1,5 +1,5 @@
 # using phusion/baseimage as base image
-FROM phusion/baseimage:0.9.19
+FROM phusion/baseimage:master
 
 # update and install apache + python
 COPY files/requirements-apt-get.txt requirements-apt-get.txt
@@ -9,4 +9,4 @@ RUN apt-get update && xargs apt-get install -y < requirements-apt-get.txt
 COPY files/veeder_root_guardian_ast_service.py /root/veeder_root_guardian_ast_service.py
 
 # run service
-ENTRYPOINT cd /root; virtual_machine_port_number={virtual_machine_port_number} company_name_address="{company_name_address}" nohup python veeder_root_guardian_ast_service.py &> log.txt & tail
+ENTRYPOINT cd /root; virtual_machine_port_number={virtual_machine_port_number} company_name_address="{company_name_address}" nohup python veeder_root_guardian_ast_service.py &> log.txt & tail
diff --git a/modules/ics/veeder_root_guardian_ast/files/requirements-apt-get.txt b/modules/ics/veeder_root_guardian_ast/files/requirements-apt-get.txt
@@ -1 +1 @@
-python3=3.5.1-3
+python3
diff --git a/modules/smtp/strong_password/Dockerfile b/modules/smtp/strong_password/Dockerfile
@@ -1,5 +1,5 @@
 # using phusion/baseimage as base image
-FROM phusion/baseimage:0.9.19
+FROM phusion/baseimage:master
 
 # update and install openssh + python
 COPY files/requirements-apt-get.txt requirements-apt-get.txt
diff --git a/modules/smtp/strong_password/files/requirements-apt-get.txt b/modules/smtp/strong_password/files/requirements-apt-get.txt
@@ -1 +1 @@
-python3=3.5.1-3
+python3
diff --git a/modules/ssh/strong_password/Dockerfile b/modules/ssh/strong_password/Dockerfile
@@ -1,5 +1,5 @@
 # using phusion/baseimage as base image
-FROM ubuntu:20.04
+FROM ubuntu:latest
 
 # update and install openssh + python
 COPY files/requirements-apt-get.txt files/requirements-pip3.txt ./
diff --git a/modules/ssh/strong_password/files/requirements-apt-get.txt b/modules/ssh/strong_password/files/requirements-apt-get.txt
@@ -1,7 +1,7 @@
-python3=3.8.2-0ubuntu2
-python3-pip=20.0.2-5ubuntu1.1
-libffi-dev=3.3-4
-python3-dev=3.8.2-0ubuntu2
-libssl-dev=1.1.1f-1ubuntu2.3
-build-essential=12.8ubuntu1.1
-openssh-client=1:8.2p1-4ubuntu0.2
+python3
+python3-pip
+libffi-dev
+python3-dev
+libssl-dev
+build-essential
+openssh-client
diff --git a/modules/ssh/weak_password/Dockerfile b/modules/ssh/weak_password/Dockerfile
@@ -1,5 +1,5 @@
 # using phusion/baseimage as base image
-FROM phusion/baseimage:0.9.19
+FROM phusion/baseimage:master
 
 # update and install openssh + python
 COPY files/requirements-apt-get.txt requirements-apt-get.txt
diff --git a/modules/ssh/weak_password/files/requirements-apt-get.txt b/modules/ssh/weak_password/files/requirements-apt-get.txt
@@ -1 +1 @@
-openssh-server=1:7.2p2-4ubuntu2.10
+openssh-server
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,6 +1,6 @@
-pytest==6.2.2
+pytest==6.2.3
 codecov==2.1.11
 requests==2.25.1
-flake8==3.9.0
+flake8==3.9.1
 wheel==0.36.2
 requests==2.25.1
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-setuptools==54.2.0
+setuptools==56.0.0
 pymongo==3.11.3
 netaddr==0.8.0
 flask==1.1.2
