Skip to content

Error handling improvements #1715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ethanljf merged 1 commit into from
Feb 23, 2021
Merged

Error handling improvements #1715

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions services/scanners/results/result_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ def process_https(results, domain_key, db):
else:
https_status = "pass"

if domain.get("status", None) == None:
domain.update({"status": {"https": "unknown", "ssl": "unknown", "dmarc": "unknown", "dkim": "unknown", "spf": "unknown"}})
domain["status"]["https"] = https_status
db.collection("domains").update(domain)

Expand Down Expand Up @@ -224,11 +226,13 @@ def process_ssl(results, guidance, domain_key, db):
{"_from": domain["_id"], "_to": sslEntry["_id"]}
)

if len(negative_tags) > 0:
if len(negative_tags) > 0 or "ssl5" not in positive_tags:
ssl_status = "fail"
elif "ssl5" in tags:
else:
ssl_status = "pass"

if domain.get("status", None) == None:
domain.update({"status": {"https": "unknown", "ssl": "unknown", "dmarc": "unknown", "dkim": "unknown", "spf": "unknown"}})
domain["status"]["ssl"] = ssl_status
db.collection("domains").update(domain)

Expand Down Expand Up @@ -393,7 +397,7 @@ def process_dns(results, domain_key, db):
elif sp_tag == "reject":
tags["dmarc"].append("dmarc19")

if results["spf"].get("missing", None) is not None:
if (results["spf"].get("missing", None) is not None) or (results["spf"].get("record", "null") == "null"):
tags["spf"].append("spf2")
else:
if results["spf"]["valid"]:
Expand Down Expand Up @@ -678,6 +682,9 @@ def process_dns(results, domain_key, db):
else:
dkim_status = "pass"

if domain.get("status", None) == None:
domain.update({"status": {"https": "unknown", "ssl": "unknown", "dmarc": "unknown", "dkim": "unknown", "spf": "unknown"}})

for key, val in {
"dkim": dkim_status,
"dmarc": dmarc_status,
Expand Down