Skip to content

Fix lookup for testsslmail module #34

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

Open
underdarknl wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix lookup for testsslmail module #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
deb13eb
Fix lookup for testsslmail module
underdarknl Mar 13, 2020
7747fe6
Merge branch 'PrivacyScore:master' into master
underdarknl Sep 27, 2021
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
10 changes: 9 additions & 1 deletion privacyscanner/scanmodules/testsslsh/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,15 @@ class TestsslshMailScanModule(TestsslshScanModuleBase):
target_parameters = [Parameter.STARTTLS, 'smtp']

def _get_host(self, result):
return result['mail']['domain'] + ':25'
host = result['mail']['domain']
try:
mailhost = result['dns'][host]['MX'][0]['host'] # might raise a keyerror on domains without an MX record
resolved = result['dns'][mailhost].get('A', None)
if not resolved or len(resolved) == 0: # fallback to ipv6 mailserver
resolved = result['dns'][mailhost].get('AAAA', None)
return resolved[0]['ip'] + ':25'
except KeyError:
return result['mail']['domain'] + ':25'

def _can_run(self, result):
# If the mail host is not reachable, the has_starttls key is
Expand Down