Skip to content
This repository has been archived by the owner on Dec 17, 2021. It is now read-only.

Add support for client authentication #286

Merged
merged 31 commits into from
Mar 20, 2019
+171 −48
Merged

Add support for client authentication #286

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c35efea
Added ca-file argument for pshtt and added pshtt output fields for Cl…
echudow Oct 11, 2018
324054b
Fixed bug in ca-file argument.
echudow Oct 11, 2018
0f516cf
Merge remote-tracking branch '18F/master'
jsf9k Nov 13, 2018
99f5eb9
Merge remote-tracking branch '18F/master'
jsf9k Nov 23, 2018
03866d5
Remove some whitespace that offends flake8
jsf9k Nov 23, 2018
8eb43b8
Merge branch 'master' into master
jsf9k Nov 30, 2018
c89e956
Reorder some of the values when they are written to CSV
jsf9k Nov 30, 2018
05b3083
Added specific info to sslyze for weak cipher tasks
echudow Dec 18, 2018
cf81846
Merged changes
echudow Dec 18, 2018
652d6a2
Merged changes
echudow Dec 18, 2018
95aa0f5
Make flake8 happy
jsf9k Dec 18, 2018
333d23e
Merge branch 'master' into master
jsf9k Dec 18, 2018
a8b66d1
Merge branch 'master' into master
jsf9k Dec 28, 2018
d6e1970
Refactored to handle some errors
echudow Jan 21, 2019
133a5fc
Added an HTTPS Live field
echudow Jan 21, 2019
80d27f1
Merge branch 'master' of https://github.com/echudow/domain-scan
echudow Jan 21, 2019
aeb980d
Added public trust with intermediate certs arg
echudow Mar 7, 2019
10458ca
Merge remote-tracking branch '18F/master'
jsf9k Mar 11, 2019
07be179
Make flake8 happy
jsf9k Mar 11, 2019
050e26b
Added ca_file option to help validate and construct higher trust chains
echudow Mar 15, 2019
860392e
trustymail updates
echudow Mar 15, 2019
15bd499
trustymail updates
echudow Mar 15, 2019
4240b17
Make a few whitespace changes to make flake8 happy
jsf9k Mar 17, 2019
369f91b
Fix scanners/trustymail.py file
jsf9k Mar 17, 2019
c676313
Adding extra trustymail command-line arguments back for compatibility
echudow Mar 17, 2019
af596de
Merge branch 'master' of https://github.com/18F/domain-scan
echudow Mar 17, 2019
cf8a291
Put back the action='store_true' statements
jsf9k Mar 18, 2019
0848d11
Adjust tests to pass now that some options have action='store_true'
jsf9k Mar 18, 2019
e513aa7
Don't convert None to False
echudow Mar 18, 2019
b812928
Update to use the latest pshtt and trustymail, which correctly handle…
jsf9k Mar 20, 2019
2019622
Update to use pshtt 0.6.1
jsf9k Mar 20, 2019
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
12 changes: 7 additions & 5 deletions scanners/trustymail.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,14 +308,16 @@ def to_rows(data):

headers = [
"Live",
"MX Record", "Mail Servers", "Mail Server Ports Tested",
"MX Record", "MX Record DNSSEC", "Mail Servers", "Mail Server Ports Tested",
"Domain Supports SMTP", "Domain Supports SMTP Results",
"Domain Supports STARTTLS", "Domain Supports STARTTLS Results",
"SPF Record", "Valid SPF", "SPF Results",
"DMARC Record", "Valid DMARC", "DMARC Results",
"DMARC Record on Base Domain", "Valid DMARC Record on Base Domain",
"DMARC Results on Base Domain", "DMARC Policy", "DMARC Policy Percentage",
"SPF Record", "SPF Record DNSSEC", "Valid SPF", "SPF Results",
"DMARC Record", "DMARC Record DNSSEC", "Valid DMARC", "DMARC Results",
"DMARC Record on Base Domain", "DMARC Record on Base Domain DNSSEC",
"Valid DMARC Record on Base Domain", "DMARC Results on Base Domain",
"DMARC Policy", "DMARC Subdomain Policy", "DMARC Policy Percentage",
"DMARC Aggregate Report URIs", "DMARC Forensic Report URIs",
"DMARC Has Aggregate Report URI", "DMARC Has Forensic Report URI",
"DMARC Reporting Address Acceptance Error",
"Syntax Errors", "Debug Info"
]
8 changes: 4 additions & 4 deletions utils/scan_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ def build_scan_options_parser() -> ArgumentParser:
parser.add_argument("--sslyze-reneg",
help="sslyze: If set, will use the SessionRenegotiationScanner and return session renegotiation info. Defaults to true.")
# trustymail:
parser.add_argument("--starttls", help="".join([
parser.add_argument("--starttls", action='store_true', help="".join([
jsf9k marked this conversation as resolved.
Show resolved Hide resolved
"trustymail: Only check mx records and STARTTLS support. ",
"(Implies --mx.)"
]))
Expand Down Expand Up @@ -486,13 +486,13 @@ def build_scan_options_parser() -> ArgumentParser:
"may results in slower scans due to testing the ",
"same mail servers multiple times."
]))
parser.add_argument("--mx", help="".join([
parser.add_argument("--mx", action='store_true', help="".join([
"trustymail: Only check MX records"
]))
parser.add_argument("--spf", help="".join([
parser.add_argument("--spf", action='store_true', help="".join([
"trustymail: Only check SPF records"
]))
parser.add_argument("--dmarc", help="".join([
parser.add_argument("--dmarc", action='store_true', help="".join([
"trustymail: Only check DMARC records"
]))

Expand Down