Merge branch 'master' into apsw-with-sqlalchemy

Signed-off-by: Achintya Jai <153343775+pUrGe12@users.noreply.github.com>

Author: pUrGe12

.github/workflows/ci_cd.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -47,15 +47,15 @@ jobs:
           - python
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
         with:
           category: /language:${{ matrix.language }}
 
@@ -67,7 +67,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -90,7 +90,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -107,7 +107,7 @@ jobs:
           poetry build --no-interaction
 
       - name: Upload package artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: dist
           path: dist
@@ -123,15 +123,15 @@ jobs:
           - ubuntu-24.04
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
           python-version: '3.11'
 
       - name: Get package artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v7
         with:
           name: dist
           path: dist
@@ -154,7 +154,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Build Docker image
         run: docker build . -t nettacker
@@ -231,7 +231,7 @@ jobs:
           sudo apt-get install docker-ce=5:${{ matrix.docker-version }} docker-ce-cli=5:${{ matrix.docker-version }}
 
       - name: Check out repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Print Docker version
         run: docker -v
@@ -251,7 +251,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -282,7 +282,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -319,7 +319,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Get package artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v7
         with:
           name: dist
           path: dist
@@ -345,7 +345,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Get package artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v7
         with:
           name: dist
           path: dist

nettacker/core/module.py

@@ -118,26 +118,25 @@ def generate_loops(self):
         self.module_content["payloads"] = expand_module_steps(self.module_content["payloads"])
 
     def sort_loops(self):
-        steps = []
         for index in range(len(self.module_content["payloads"])):
-            for step in copy.deepcopy(self.module_content["payloads"][index]["steps"]):
-                if "dependent_on_temp_event" not in step[0]["response"]:
-                    steps.append(step)
+            steps_without_dependencies = []
+            steps_with_temp_dependencies = []
+            steps_with_normal_dependencies = []
 
             for step in copy.deepcopy(self.module_content["payloads"][index]["steps"]):
-                if (
-                    "dependent_on_temp_event" in step[0]["response"]
-                    and "save_to_temp_events_only" in step[0]["response"]
-                ):
-                    steps.append(step)
+                resp = step[0]["response"]
+                if "dependent_on_temp_event" not in resp:
+                    steps_without_dependencies.append(step)
+                elif "save_to_temp_events_only" in resp:
+                    steps_with_temp_dependencies.append(step)
+                else:
+                    steps_with_normal_dependencies.append(step)
 
-            for step in copy.deepcopy(self.module_content["payloads"][index]["steps"]):
-                if (
-                    "dependent_on_temp_event" in step[0]["response"]
-                    and "save_to_temp_events_only" not in step[0]["response"]
-                ):
-                    steps.append(step)
-            self.module_content["payloads"][index]["steps"] = steps
+            self.module_content["payloads"][index]["steps"] = (
+                steps_without_dependencies
+                + steps_with_temp_dependencies
+                + steps_with_normal_dependencies
+            )
 
     def start(self):
         active_threads = []

nettacker/modules/scan/port.yaml

@@ -1092,4 +1092,8 @@ payloads:
 
               amqp:
                 regex: "AMQP"
-                reverse: false
+                reverse: false
+                
+              smb:
+                regex: "SMB\\d+|Microsoft Windows Network|Server\\sMessage\\sBlock\\sProtocol|\\d{{1,3}}\\.\\d{{1,3}}\\.\\d{{1,3}}\\.\\d{{1,3}}.*?SMB.*?|Session\\sError|Not\\simplemented|Protocol\\sViolation|\\d+\\sbytes\\sreceived|SMB\\sConnection\\sterminated|Session\\sestablished\\susing\\sSMB\\d+|NTLMv2|Negotiate Protocol|SMB2\\sProtocol\\sNegotiation|Session\\sSetup\\sSMB|Tree\\sConnect"
+                reverse: false

nettacker/modules/vuln/ssl_certificate_weak_signature.yaml

@@ -6,7 +6,7 @@ info:
   reference:
     - https://www.ssl.com/article/ssl-tls-self-signed-certificates/
   profiles:
-    - scan
+    - vuln
     - ssl
 
 payloads:

nettacker/modules/vuln/ssl_expired_certificate.yaml

@@ -6,7 +6,7 @@ info:
   reference:
     - https://www.beyondsecurity.com/resources/vulnerabilities/ssl-certificate-expiry
   profiles:
-    - scan
+    - vuln
     - ssl
 
 payloads:

nettacker/modules/vuln/ssl_self_signed_certificate.yaml

@@ -6,7 +6,7 @@ info:
   reference:
     - https://www.ssl.com/article/ssl-tls-self-signed-certificates/
   profiles:
-    - scan
+    - vuln
     - ssl
 
 payloads:

nettacker/modules/vuln/ssl_weak_cipher.yaml

@@ -7,7 +7,7 @@ info:
     - https://www.manageengine.com/privileged-access-management/help/ssl_vulnerability.html
     - https://www.acunetix.com/vulnerabilities/web/tls-ssl-weak-cipher-suites/
   profiles:
-    - scan
+    - vuln
     - ssl
 
 payloads:

nettacker/modules/vuln/ssl_weak_version.yaml

@@ -7,7 +7,7 @@ info:
     - https://www.manageengine.com/privileged-access-management/help/ssl_vulnerability.html
     - https://www.cloudflare.com/learning/ssl/why-use-tls-1.3/
   profiles:
-    - scan
+    - vuln
     - ssl
 
 payloads: