Find, verify, and analyze leaked credentials
Go credentialsdevsecopsdynamic-analysisprecommitscanningsecretsecret-managementsecretssecuritysecurity-toolstrufflehogverification
Prevent indefinite hang for sql server detector (#4174)
Kashif Khan25205730062c
diff --git a/pkg/detectors/sqlserver/sqlserver.go b/pkg/detectors/sqlserver/sqlserver.goindex 5f59f193f..9f07c6ea1 100644--- a/pkg/detectors/sqlserver/sqlserver.go+++ b/pkg/detectors/sqlserver/sqlserver.go@@ -3,6 +3,8 @@ package sqlserverimport ("context""database/sql"+ "net"+ "strconv""time"regexp "github.com/wasilibs/go-re2"@@ -52,7 +54,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- isVerified, err := ping(paramsUnsafe)+ isVerified, err := ping(ctx, paramsUnsafe)s1.Verified = isVerified@@ -71,7 +73,20 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}-var ping = func(config msdsn.Config) (bool, error) {+var ping = func(ctx context.Context, config msdsn.Config) (bool, error) {+ // TCP connectivity check to prevent indefinite hangs+ address := net.JoinHostPort(config.Host, strconv.Itoa(int(config.Port)))++ dialer := &net.Dialer{+ Timeout: 3 * time.Second,+ }++ tcpConn, err := dialer.DialContext(ctx, "tcp", address) // respects context timeout+ if err != nil {+ return false, err+ }+ defer tcpConn.Close()+cleanConfig := msdsn.Config{}cleanConfig.Host = config.HostcleanConfig.Port = config.Port@@ -97,7 +112,7 @@ var ping = func(config msdsn.Config) (bool, error) {_ = conn.Close()}()- err = conn.Ping()+ err = conn.PingContext(ctx) // this doesn't seem to respect the context timeoutif err != nil {return false, err}diff --git a/pkg/detectors/sqlserver/sqlserver_integration_test.go b/pkg/detectors/sqlserver/sqlserver_integration_test.goindex 1c75f155e..dacc62b2c 100644--- a/pkg/detectors/sqlserver/sqlserver_integration_test.go+++ b/pkg/detectors/sqlserver/sqlserver_integration_test.go@@ -5,6 +5,7 @@ package sqlserverimport ("context"+ "errors""fmt""net/url""testing"@@ -12,6 +13,7 @@ import ("github.com/brianvoe/gofakeit/v7""github.com/google/go-cmp/cmp""github.com/google/go-cmp/cmp/cmpopts"+ "github.com/microsoft/go-mssqldb/msdsn""github.com/testcontainers/testcontainers-go""github.com/testcontainers/testcontainers-go/modules/mssql"