Merge branch 'main' into session-id-bit

minvws · Nov 19, 2024 · 6a41073 · 6a41073
2 parents 67b67bb + 106f456
commit 6a41073
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/docs/source/introduction/intro.rst b/docs/source/introduction/intro.rst
@@ -53,7 +53,7 @@ OpenKAT scans for vulnerabilities. If you find any, it is valid that you deal wi
 
 Many organizations have their contact information in ``security.txt`` in the root of their domain, so you get straight to the right people. Not every organization handles it equally professionally, but that's no reason not to want to use that standard yourself.
 
-If you find any vulnerabilities in the software of OpenKAT itself you can report them per e-mail to: security @ rdobeheer.nl (remove the spaces).
+If you find any vulnerabilities in the software of OpenKAT itself you can report them per e-mail to: security @ irealisatie.nl (remove the spaces).
 
 What are the plans for the future?
 ==================================

diff --git a/log.txt b/log.txt
diff --git a/rocky/reports/views/mixins.py b/rocky/reports/views/mixins.py
@@ -129,7 +129,7 @@ def save_report_data(
                 ]
 
                 child_input_data = {
-                    "input_data": {"input_oois": [ooi], "report_types": [report_type_id], "plugins": [child_plugins]}
+                    "input_data": {"input_oois": [ooi], "report_types": [report_type_id], "plugins": child_plugins}
                 }
 
                 raw_id = bytes_client.upload_raw(

diff --git a/rocky/tests/integration/test_report_runner.py b/rocky/tests/integration/test_report_runner.py
@@ -36,6 +36,7 @@ def test_run_report_task(octopoes_api_connector: OctopoesAPIConnector, report_ru
 
     data = json.loads(report_runner.bytes_client.upload_raw.mock_calls[0].kwargs["raw"])
     data["input_data"]["plugins"]["required"] = set(data["input_data"]["plugins"]["required"])  # ordering issues
+
     assert data == {
         "input_data": {
             "input_oois": ["Hostname|test|example.com", "Hostname|test|a.example.com"],
@@ -56,7 +57,7 @@ def test_run_report_task(octopoes_api_connector: OctopoesAPIConnector, report_ru
             "input_data": {
                 "input_oois": ["Hostname|test|example.com"],
                 "report_types": ["dns-report"],
-                "plugins": [{"required": {"dns-sec", "dns-records"}, "optional": ["dns-zone"]}],
+                "plugins": {"required": {"dns-sec", "dns-records"}, "optional": ["dns-zone"]},
             },
         },
         {
@@ -69,19 +70,15 @@ def test_run_report_task(octopoes_api_connector: OctopoesAPIConnector, report_ru
             "input_data": {
                 "input_oois": ["Hostname|test|a.example.com"],
                 "report_types": ["dns-report"],
-                "plugins": [{"required": {"dns-sec", "dns-records"}, "optional": ["dns-zone"]}],
+                "plugins": {"required": {"dns-sec", "dns-records"}, "optional": ["dns-zone"]},
             },
         },
     ]
 
     data_1 = json.loads(report_runner.bytes_client.upload_raw.mock_calls[1].kwargs["raw"])
-    data_1["input_data"]["plugins"][0]["required"] = set(
-        data_1["input_data"]["plugins"][0]["required"]
-    )  # ordering issues
+    data_1["input_data"]["plugins"]["required"] = set(data_1["input_data"]["plugins"]["required"])  # ordering issues
     data_2 = json.loads(report_runner.bytes_client.upload_raw.mock_calls[2].kwargs["raw"])
-    data_2["input_data"]["plugins"][0]["required"] = set(
-        data_2["input_data"]["plugins"][0]["required"]
-    )  # ordering issues
+    data_2["input_data"]["plugins"]["required"] = set(data_2["input_data"]["plugins"]["required"])  # ordering issues
 
     assert data_1 in both_calls
     assert data_2 in both_calls