Merge branch 'master' into master

jimmy-ly00 · web-flow · commit 2181214c1688 · 2023-10-23T18:33:13.000+01:00
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
 
       - name: Build the code with docker
         run: docker build . -t nettacker
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3.5.3
+      uses: actions/checkout@v4.1.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/publish_docker_image.yml b/.github/workflows/publish_docker_image.yml
@@ -9,18 +9,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 #ignore IDE settings
 *.idea*
 *.vscode*
+*.code-workspace
 
 #setup
 build/*
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11.4-slim
+FROM python:3.11.6-slim
 RUN apt update
 WORKDIR /usr/src/owaspnettacker
 COPY . .
diff --git a/core/load_modules.py b/core/load_modules.py
@@ -236,7 +236,7 @@ def load_all_modules(limit=-1, full_details=False):
     """
     # Search for Modules
     from config import nettacker_paths
-    from core.utility import sort_dictonary
+    from core.utility import sort_dictionary
     if full_details:
         import yaml
     module_names = {}
@@ -260,7 +260,7 @@ def load_all_modules(limit=-1, full_details=False):
         if len(module_names) == limit:
             module_names['...'] = {}
             break
-    module_names = sort_dictonary(module_names)
+    module_names = sort_dictionary(module_names)
     module_names['all'] = {}
 
     return module_names
@@ -273,7 +273,7 @@ def load_all_profiles(limit=-1):
     Returns:
         an array of all profile names
     """
-    from core.utility import sort_dictonary
+    from core.utility import sort_dictionary
     all_modules_with_details = load_all_modules(limit=limit, full_details=True)
     profiles = {}
     if '...' in all_modules_with_details:
@@ -287,11 +287,11 @@ def load_all_profiles(limit=-1):
             else:
                 profiles[tag].append(key)
             if len(profiles) == limit:
-                profiles = sort_dictonary(profiles)
+                profiles = sort_dictionary(profiles)
                 profiles['...'] = []
                 profiles['all'] = []
                 return profiles
-    profiles = sort_dictonary(profiles)
+    profiles = sort_dictionary(profiles)
     profiles['all'] = []
     return profiles
 
diff --git a/core/utility.py b/core/utility.py
@@ -563,7 +563,7 @@ def expand_step(step):
         return [step]
 
 
-def sort_dictonary(dictionary):
+def sort_dictionary(dictionary):
     etc_flag = '...' in dictionary
     if etc_flag:
         del dictionary['...']
diff --git a/lib/messages/hi.yaml b/lib/messages/hi.yaml
diff --git a/lib/payloads/wordlists/wp_plugin_small.txt b/lib/payloads/wordlists/wp_plugin_small.txt
@@ -280,3 +280,5 @@ sucuri-scanner
 ninja-forms
 the-plus-addons-for-elementor-page-builder
 wp-seopress
+media-library-assistant
+forminator
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,2 +1,2 @@
 flake8==6.0.0
-ipython==8.14.0
+ipython==8.16.1
diff --git a/requirements.txt b/requirements.txt
@@ -1,16 +1,16 @@
 argparse==1.4.0
-netaddr==0.8.0
+netaddr==0.9.0
 ipaddr==2.2.0
 requests==2.31.0
-aiohttp==3.8.4
+aiohttp==3.8.5
 asyncio==3.4.3
-paramiko==3.2.0
+paramiko==3.3.1
 texttable==1.6.7
 PySocks==1.7.1 # library_name=socks # module name is not equal to socks name; this is required to be checked on startup
 pyOpenSSL==23.2.0 # library_name=OpenSSL
-flask==2.3.2
+flask==3.0.0
 SQLAlchemy>=1.4.43 # library_name=sqlalchemy
-py3DNS==3.2.1 # library_name=DNS
-numpy==1.24.3
+py3DNS==4.0.0 # library_name=DNS
+numpy==1.26.0
 terminable_thread==0.7.1
-PyYAML==6.0 # library_name=yaml
+PyYAML==6.0.1 # library_name=yaml
diff --git a/tests/core/utility.test.py b/tests/core/utility.test.py
@@ -15,8 +15,8 @@ class UtilityTesting(unittest.TestCase):
     This is the class that tests the utility module functions.
     """
 
-    def test_sort_dictonary(self):
-        """Tests if the function sorts the input dictionary."""   
+    def test_sort_dictionary(self):
+        """Tests if the function sorts the input dictionary."""
         input_dict = {
             'a': 1,
             'c': 3,
@@ -29,7 +29,7 @@ def test_sort_dictonary(self):
             'c': 3,
             'd': 23,
         }
-        self.assertDictEqual(utility.sort_dictonary(input_dict), sorted_dict)
+        self.assertDictEqual(utility.sort_dictionary(input_dict), sorted_dict)
 
     def test_select_maximum_cpu_core(self):
         """Tests if it selects the proper amount of cpu's"""

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM python:3.11.4-slim`
	`1`	`+FROM python:3.11.6-slim`
`2`	`2`	`RUN apt update`
`3`	`3`	`WORKDIR /usr/src/owaspnettacker`
`4`	`4`	`COPY . .`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`flake8==6.0.0`
`2`		`-ipython==8.14.0`
	`2`	`+ipython==8.16.1`