Merge pull request #4 from CybercentreCanada/assemblyline/issues/181

Assemblyline/issues/181

.vscode/settings.json

@@ -1,33 +1,32 @@
 {
-  "editor.codeActionsOnSave": {
-    "source.organizeImports": true
-  },
-  "editor.formatOnSave": true,
-  "editor.rulers": [120],
-  "editor.tabSize": 4,
-  "editor.wordWrap": "wordWrapColumn",
-  "editor.wordWrapColumn": 120,
-  "files.insertFinalNewline": true,
-  "files.trimFinalNewlines": true,
-  "files.trimTrailingWhitespace": true,
-  "isort.args": [
-    "-l",
-    "120",
-    "--profile=black"
-    // "--src=${workspaceFolder}"
-  ],
-  "[python]": {
-    "editor.defaultFormatter": "ms-python.black-formatter"
-  },
-  "black-formatter.args": ["--line-length=120"],
-  "flake8.args": [
-    "--max-line-length=120",
-    //Added the ignore of E203 for now : https://github.com/PyCQA/pycodestyle/issues/373
-    "--ignore=E203,W503"
-  ],
-  "python.testing.pytestArgs": [
-    "tests"
-  ],
-  "python.testing.unittestEnabled": false,
-  "python.testing.pytestEnabled": true
+    "editor.codeActionsOnSave": {
+        "source.organizeImports": true,
+    },
+    "editor.formatOnSave": true,
+    "editor.rulers": [
+        120
+    ],
+    "editor.tabSize": 4,
+    "editor.wordWrap": "wordWrapColumn",
+    "editor.wordWrapColumn": 120,
+    "files.insertFinalNewline": true,
+    "files.trimFinalNewlines": true,
+    "files.trimTrailingWhitespace": true,
+    "isort.args": [
+        "-l",
+        "120",
+        "--profile=black",
+        // "--src=${workspaceFolder}"
+    ],
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter"
+    },
+    "black-formatter.args": [
+        "--line-length=120"
+    ],
+    "flake8.args": [
+        "--max-line-length=120",
+        //Added the ignore of E203 for now : https://github.com/PyCQA/pycodestyle/issues/373
+        "--ignore=E203,W503"
+    ],
 }

requirements.txt

@@ -1 +1 @@
-multidecoder==1.0.0
+multidecoder>=1.0.0,<2

urlcreator.py

@@ -64,7 +64,7 @@ def execute(self, request: ServiceRequest) -> None:
         high_port_table = ResultTableSection("High Port Usage", heuristic=Heuristic(2))
         tool_table = ResultTableSection("Discovery Tool Found in URI Path", heuristic=Heuristic(3))
         max_extracted_section = ResultTextSection("Too many URI files to be created")
-        url_analysis_section = ResultSection("URL Analysis")
+        url_analysis_section = ResultSection("MultiDecoder Analysis")
 
         for tag_value, tag_score in urls:
             # Analyse the URL for the possibility of it being a something we should download