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

Trim SMTP response (#237) 

this avoids to have \r\n in the error message
This commit is contained in:
Julian Kornberger 2020-02-04 01:52:37 +01:00 committed by GitHub
parent c3ef8dcd8b
commit f5b169cbd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/smtp/scanner.go
View File

@ -29,6 +29,7 @@ import (
"errors"
"fmt"
"strconv"
"strings"
log "github.com/sirupsen/logrus"
"github.com/zmap/zgrab2"
@ -265,7 +266,7 @@ func (scanner *Scanner) Scan(target zgrab2.ScanTarget) (zgrab2.ScanStatus, inter
return zgrab2.TryGetScanStatus(err), result, err
}
if code < 200 || code >= 300 {
return zgrab2.SCAN_APPLICATION_ERROR, result, fmt.Errorf("SMTP error code %d returned from STARTTLS command (%s)", code, ret)
return zgrab2.SCAN_APPLICATION_ERROR, result, fmt.Errorf("SMTP error code %d returned from STARTTLS command (%s)", code, strings.TrimSpace(ret))
}
tlsConn, err := scanner.config.TLSFlags.GetTLSConnection(conn.Conn)
if err != nil {