Skip to content
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

Add TLS logs in results when using the banner module with the --tls flag #336

Closed
wants to merge 1 commit into from
Closed

Add TLS logs in results when using the banner module with the --tls flag #336

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
15 changes: 10 additions & 5 deletions modules/banner/scanner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ type Scanner struct {
type Results struct {
Banner string `json:"banner,omitempty"`
Length int `json:"length,omitempty"`

TLSLog *zgrab2.TLSLog `json:"tls,omitempty"`
}

// RegisterModule is called by modules/banner.go to register the scanner.
Expand Down Expand Up @@ -134,6 +136,7 @@ func (scanner *Scanner) Scan(target zgrab2.ScanTarget) (zgrab2.ScanStatus, inter
var (
conn net.Conn
tlsConn *zgrab2.TLSConnection
results Results
err error
readerr error
)
Expand All @@ -151,6 +154,7 @@ func (scanner *Scanner) Scan(target zgrab2.ScanTarget) (zgrab2.ScanStatus, inter
if err = tlsConn.Handshake(); err != nil {
continue
}
results.TLSLog = tlsConn.GetLog()
conn = tlsConn
}

Expand All @@ -176,16 +180,17 @@ func (scanner *Scanner) Scan(target zgrab2.ScanTarget) (zgrab2.ScanStatus, inter
break
}
if err != nil {
return zgrab2.TryGetScanStatus(err), nil, err
return zgrab2.TryGetScanStatus(err), &results, err
}
if readerr != io.EOF && readerr != nil {
return zgrab2.TryGetScanStatus(readerr), nil, readerr
return zgrab2.TryGetScanStatus(readerr), &results, readerr
}
var results Results

results.Length = len(ret)
if scanner.config.Hex {
results = Results{Banner: hex.EncodeToString(ret), Length: len(ret)}
results.Banner = hex.EncodeToString(ret)
} else {
results = Results{Banner: string(ret), Length: len(ret)}
results.Banner = string(ret)
}
if scanner.regex.Match(ret) {
return zgrab2.SCAN_SUCCESS, &results, nil
Expand Down