Don't send results on timeout. On exception, send domain_key (canada-ca#1299)

* Don't send results on timeout. On exception, send domain_key

* Don't send results on timeout. On exception, send domain_key

Author: Ethanljf

services/scanners/dns/dns_scanner.py

@@ -255,9 +255,6 @@ async def scan(scan_request):
         def timeout_handler(signum, frame):
             msg = "Timeout while performing scan"
             logging.error(msg)
-            dispatch_results(
-                {"scan_type": "dns", "uuid": uuid, "results": {}}, server_client
-            )
             return PlainTextResponse(msg)
 
         try:
@@ -310,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, "results": {}}, server_client
+                {"scan_type": "dns", "uuid": uuid, "domain_key": domain_key, "results": {}}, server_client
             )
             return PlainTextResponse(msg)
 

services/scanners/https/https_scanner.py

@@ -155,9 +155,6 @@ async def scan(scan_request):
         def timeout_handler(signum, frame):
             msg = "Timeout while performing scan"
             logging.error(msg)
-            dispatch_results(
-                {"scan_type": "https", "uuid": uuid, "results": {}}, server_client
-            )
             return PlainTextResponse(msg)
 
         try:
@@ -198,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, "results": {}}, server_client
+                {"scan_type": "https", "uuid": uuid, "domain_key": domain_key, "results": {}}, server_client
             )
             return PlainTextResponse(msg)
 

services/scanners/ssl/ssl_scanner.py

@@ -305,9 +305,6 @@ async def scan(scan_request):
         def timeout_handler(signum, frame):
             msg = "Timeout while performing scan"
             logging.error(msg)
-            dispatch_results(
-                {"scan_type": "ssl", "uuid": uuid, "results": {}}, server_client
-            )
             return PlainTextResponse(msg)
 
         try:
@@ -357,7 +354,7 @@ def timeout_handler(signum, frame):
             logging.error(msg)
             logging.error(f"Full traceback: {traceback.format_exc()}")
             dispatch_results(
-                {"scan_type": "ssl", "uuid": uuid, "results": {}}, server_client
+                {"scan_type": "ssl", "uuid": uuid, "domain_key": domain_key, "results": {}}, server_client
             )
             return PlainTextResponse(msg)