Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Add configurable connection timeout #20

Merged
merged 2 commits into from
Jan 9, 2024
Merged

Add configurable connection timeout #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d104be
add configurable timeout
sollie Jan 4, 2024
5b92fa3
feat: Add ScanWithTimeout function
TrueSkrillor Jan 9, 2024
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
8 changes: 6 additions & 2 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@ func main() {
"help",
false,
"Prints this usage help to the user.")
timeoutPtr := flag.Int(
"timeout",
5,
"Timeout in seconds for the connection to the server.")
flag.Parse()
color.NoColor = *noColor
if (*connectPtr == "" && *listenPtr == "" && !*versionPtr) || *helpPtr {
Expand All @@ -146,13 +150,13 @@ func main() {
if *connectPtr != "" {
address := formatAddress(*connectPtr, tscanner.ServerScan)
var err error
if report, err = tscanner.Scan(address, tscanner.ServerScan, true); err != nil {
if report, err = tscanner.ScanWithTimeout(address, tscanner.ServerScan, true, *timeoutPtr); err != nil {
panic(err)
}
} else if *listenPtr != "" {
address := formatAddress(*listenPtr, tscanner.ClientScan)
var err error
if report, err = tscanner.Scan(address, tscanner.ClientScan, true); err != nil {
if report, err = tscanner.ScanWithTimeout(address, tscanner.ClientScan, true, *timeoutPtr); err != nil {
panic(err)
}
}
Expand Down
13 changes: 11 additions & 2 deletions tscanner/tscanner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ import (
"encoding/binary"
"encoding/json"
"fmt"
"golang.org/x/exp/slices"
"io"
"net"
"os"
"strings"
"time"

"golang.org/x/exp/slices"
)

// ScanMode describes a scan mode for the scanner.
Expand Down Expand Up @@ -60,10 +62,17 @@ func (report *Report) MarshalJSON() ([]byte, error) {

// Scan performs a vulnerability scan to check whether the remote peer is likely to be vulnerable against prefix truncation.
func Scan(address string, scanMode ScanMode, verbose bool) (*Report, error) {
return ScanWithTimeout(address, scanMode, verbose, 0)
}

// ScanWithTimeout performs a vulnerability scan with configurable timeout to check whether the remote peer
// is likely to be vulnerable against prefix truncation.
func ScanWithTimeout(address string, scanMode ScanMode, verbose bool, timeout int) (*Report, error) {
var conn net.Conn
if scanMode == ServerScan {
var err error
if conn, err = net.Dial("tcp", address); err != nil {
dialer := net.Dialer{Timeout: time.Duration(timeout) * time.Second}
if conn, err = dialer.Dial("tcp", address); err != nil {
return nil, err
}
} else if scanMode == ClientScan {
Expand Down