Service Update (canada-ca#1542)

* Miscellaneous service updates to ensure reliable functionality. Addition of context-dependant tags and dmarc implementation phase determination

* Simplify insertions

* Refactoring

* DKIM tag generation logic fix

Author: Ethanljf

services/core/core.py

@@ -16,7 +16,7 @@
 DB_PASS = os.getenv("DB_PASS")
 DB_PORT = os.getenv("DB_PORT")
 DB_NAME = os.getenv("DB_NAME")
-DB_HOST = os.getenv("DB_HOST")
+DB_HOST = "10.108.14.82"
 REPO_NAME = os.getenv("REPO_NAME")
 REPO_OWNER = os.getenv("REPO_OWNER")
 GUIDANCE_DIR = os.getenv("GUIDANCE_DIR")
@@ -366,16 +366,18 @@ def update_org_summaries(host=DB_HOST, name=DB_NAME, user=DB_USER, password=DB_P
             else:
                 mail_fail = mail_fail + 1
 
-        org["summaries"]["web"] = {
+        summaries = {}
+        summaries["web"] = {
             "pass": web_pass,
             "fail": web_fail,
             "total": domain_total,
         }
-        org["summaries"]["mail"] = {
+        summaries["mail"] = {
             "pass": mail_pass,
             "fail": mail_fail,
             "total": domain_total,
         }
+        org.update(summaries)
         db.collection("organizations").update(org)
 
     logging.info(f"Organization summary value update completed.")

services/scanners/dns/dns_scanner.py

@@ -307,7 +307,7 @@ def timeout_handler(signum, frame):
             logging.error(msg)
             logging.error(f"Full traceback: {traceback.format_exc()}")
             dispatch_results(
-                {"scan_type": "dns", "uuid": uuid, "domain_key": domain_key, "results": {}}, server_client
+                {"scan_type": "dns", "uuid": uuid, "domain_key": domain_key, "results": {"dmarc": {"missing": True}, "dkim": {"missing": True}, "spf": {"missing": True}}}, server_client
             )
             return PlainTextResponse(msg)
 

services/scanners/https/https_scanner.py

@@ -195,7 +195,7 @@ def timeout_handler(signum, frame):
             logging.error(msg)
             logging.error(f"Full traceback: {traceback.format_exc()}")
             dispatch_results(
-                {"scan_type": "https", "uuid": uuid, "domain_key": domain_key, "results": {}}, server_client
+                {"scan_type": "https", "uuid": uuid, "domain_key": domain_key, "results": {"missing": True}}, server_client
             )
             return PlainTextResponse(msg)
 

services/scanners/results/requirements.txt

@@ -8,4 +8,4 @@ python-arango
 pretend
 uvloop
 httptools
-gql[all]
+gql