kayos
/
zgrab2
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Adds --hex option to `banner` module (#325) 

Conversion of binary responses to UTF8 occasionally yields U+FFFD [replacement characters](https://en.wikipedia.org/wiki/Specials_(Unicode_block))
(see #197, #263). As a result it is not possible to restore the original response.

This introduces the `--hex` option to the `banner` module. When enabled,
the `banner` value will contain server response in hex.

Refs #197, #263

https://github.com/zmap/zgrab2/pull/325
This commit is contained in:
svbatalov 2021-08-30 04:00:18 +05:00 committed by GitHub
parent a70b93322f
commit 11611670fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/banner/scanner.go
View File

@ -12,6 +12,7 @@ import (
"net"
"regexp"
"strconv"
"encoding/hex"
"github.com/zmap/zgrab2"
)
@ -24,6 +25,7 @@ type Flags struct {
Pattern string `long:"pattern" description:"Pattern to match, must be valid regexp."`
UseTLS bool `long:"tls" description:"Sends probe with TLS connection. Loads TLS module command options. "`
MaxTries int `long:"max-tries" default:"1" description:"Number of tries for timeouts and connection errors before giving up. Includes making TLS connection if enabled."`
Hex bool `long:"hex" description:"Store banner value in hex. "`
zgrab2.TLSFlags
}
@ -179,7 +181,12 @@ func (scanner *Scanner) Scan(target zgrab2.ScanTarget) (zgrab2.ScanStatus, inter
if readerr != io.EOF && readerr != nil {
return zgrab2.TryGetScanStatus(readerr), nil, readerr
}
results := Results{Banner: string(ret), Length: len(ret)}
var results Results
if scanner.config.Hex {
results = Results{Banner: hex.EncodeToString(ret), Length: len(ret)}
} else {
results = Results{Banner: string(ret), Length: len(ret)}
}
if scanner.regex.Match(ret) {
return zgrab2.SCAN_SUCCESS, &results, nil
}