Find, verify, and analyze leaked credentials
Go credentialsdevsecopsdynamic-analysisprecommitscanningsecretsecret-managementsecretssecuritysecurity-toolstrufflehogverification
fix: make LDAP verification context-aware (#4768)
meredithef63d66d58bb
diff --git a/go.mod b/go.modindex 6a619c798..e1ab264b5 100644--- a/go.mod+++ b/go.mod@@ -46,7 +46,6 @@ require (github.com/getsentry/sentry-go v0.32.0github.com/go-errors/errors v1.5.1github.com/go-git/go-git/v5 v5.13.2- github.com/go-ldap/ldap/v3 v3.4.11github.com/go-logr/logr v1.4.3github.com/go-logr/zapr v1.3.0github.com/go-redis/redis v6.15.9+incompatible@@ -70,6 +69,7 @@ require (github.com/lestrrat-go/jwx/v3 v3.0.12github.com/lib/pq v1.10.9github.com/lrstanley/bubblezone v0.0.0-20250404061050-e13639e27357+ github.com/mariduv/ldap-verify v0.0.2github.com/marusama/semaphore/v2 v2.5.0github.com/mattn/go-isatty v0.0.20github.com/mholt/archives v0.0.0-20241216060121-23e0af8fe73d@@ -130,7 +130,7 @@ require (dario.cat/mergo v1.0.0 // indirectfilippo.io/edwards25519 v1.1.0 // indirectgithub.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect- github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect+ github.com/Azure/go-ntlmssp v0.1.0 // indirectgithub.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirectgithub.com/DataDog/zstd v1.5.5 // indirectgithub.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirectdiff --git a/go.sum b/go.sumindex e990c4984..f833ab7b3 100644--- a/go.sum+++ b/go.sum@@ -57,8 +57,8 @@ github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 h1:D3occgithub.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0/go.mod h1:bTSOgj05NGRuHHhQwAdPnYr9TOdNmKlZTgGLL6nyAdI=github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=-github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=-github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=+github.com/Azure/go-ntlmssp v0.1.0 h1:DjFo6YtWzNqNvQdrwEyr/e4nhU3vRiwenz5QX7sFz+A=+github.com/Azure/go-ntlmssp v0.1.0/go.mod h1:NYqdhxd/8aAct/s4qSYZEerdPuH1liG2/X9DiVTbhpk=github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 h1:kYRSnvJju5gYVyhkij+RTJ/VR6QIUaCfWeaFm2ycsjQ=github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=github.com/BobuSumisu/aho-corasick v1.0.3 h1:uuf+JHwU9CHP2Vx+wAy6jcksJThhJS9ehR8a+4nPE9g=@@ -96,8 +96,6 @@ github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXcgithub.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=-github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI=-github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=@@ -327,8 +325,6 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs=github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=-github.com/go-ldap/ldap/v3 v3.4.11 h1:4k0Yxweg+a3OyBLjdYn5OKglv18JNvfDykSoI8bW0gU=-github.com/go-ldap/ldap/v3 v3.4.11/go.mod h1:bY7t0FLK8OAVpp/vV6sSlpz3EQDGcQwc8pF0ujLgKvM=github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=@@ -450,8 +446,6 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lgithub.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUrx/c8Unxc48=github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw=-github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=-github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=@@ -471,18 +465,6 @@ github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAkgithub.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=-github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8=-github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=-github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo=-github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=-github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg=-github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo=-github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o=-github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=-github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8=-github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs=-github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY=-github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=github.com/jedib0t/go-pretty/v6 v6.6.8 h1:JnnzQeRz2bACBobIaa/r+nqjvws4yEhcmaZ4n1QzsEc=github.com/jedib0t/go-pretty/v6 v6.6.8/go.mod h1:YwC5CE4fJ1HFUDeivSV1r//AmANFHyqczZk+U6BDALU=github.com/jlaffaye/ftp v0.2.0 h1:lXNvW7cBu7R/68bknOX3MrRIIqZ61zELs1P2RAiA3lg=@@ -546,6 +528,8 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=+github.com/mariduv/ldap-verify v0.0.2 h1:NBdDTYyWDr71CONVcizasqL/AA9tQ2RNgLhTgnyfquI=+github.com/mariduv/ldap-verify v0.0.2/go.mod h1:d/7+kkMBGDs9LPZ/7hmduYqtOkRIJcgpa8dL+9CsveE=github.com/marusama/semaphore/v2 v2.5.0 h1:o/1QJD9DBYOWRnDhPwDVAXQn6mQYD0gZaS1Tpx6DJGM=github.com/marusama/semaphore/v2 v2.5.0/go.mod h1:z9nMiNUekt/LTpTUQdpp+4sJeYqUGpwMHfW0Z8V8fnQ=github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=diff --git a/pkg/detectors/ldap/ldap.go b/pkg/detectors/ldap/ldap.goindex fea2c0d3e..d0640f4fa 100644--- a/pkg/detectors/ldap/ldap.go+++ b/pkg/detectors/ldap/ldap.go@@ -3,13 +3,14 @@ package ldapimport ("context""crypto/tls"+ "errors""fmt""net""net/url""strings""time"- "github.com/go-ldap/ldap/v3"+ ldap "github.com/mariduv/ldap-verify"regexp "github.com/wasilibs/go-re2""github.com/trufflesecurity/trufflehog/v3/pkg/detectors"@@ -72,7 +73,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- verificationErr := verifyLDAP(username[1], password[1], ldapURL)+ verificationErr := verifyLDAP(ctx, username[1], password[1], ldapURL)s1.Verified = verificationErr == nilif !isErrDeterminate(verificationErr) {s1.SetVerificationError(verificationErr, password[1])@@ -102,7 +103,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- verificationError := verifyLDAP(username, password, ldapURL)+ verificationError := verifyLDAP(ctx, username, password, ldapURL)s1.Verified = verificationError == nilif !isErrDeterminate(verificationError) {@@ -117,18 +118,18 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}func isErrDeterminate(err error) bool {- switch e := err.(type) {- case *ldap.Error:- switch e.Err.(type) {- case *net.OpError:- return false- }+ var neterr *net.OpError++ if errors.As(err, &neterr) ||+ errors.Is(err, context.DeadlineExceeded) ||+ errors.Is(err, context.Canceled) {+ return false}return true}-func verifyLDAP(username, password string, ldapURL *url.URL) error {+func verifyLDAP(ctx context.Context, username, password string, ldapURL *url.URL) error {// Tests with non-TLS, TLS, and STARTTLSuri := ldapURL.String()@@ -136,13 +137,13 @@ func verifyLDAP(username, password string, ldapURL *url.URL) error {switch ldapURL.Scheme {case "ldap":// Non-TLS dial- l, err := ldap.DialURL(uri)+ l, err := ldap.DialURL(uri, ldap.DialWithContext(ctx))if err != nil {return err}defer l.Close()// Non-TLS verify- err = l.Bind(username, password)+ err = l.BindContext(ctx, username, password)if err == nil {return nil}@@ -153,20 +154,23 @@ func verifyLDAP(username, password string, ldapURL *url.URL) error {return err}// STARTTLS verify- return l.Bind(username, password)+ return l.BindContext(ctx, username, password)case "ldaps":// TLS dial- l, err := ldap.DialURL(uri, ldap.DialWithTLSConfig(&tls.Config{InsecureSkipVerify: true}))+ l, err := ldap.DialURL(+ uri,+ ldap.DialWithContext(ctx),+ ldap.DialWithTLSConfig(&tls.Config{InsecureSkipVerify: true}),+ )if err != nil {return err}defer l.Close()// TLS verify- return l.Bind(username, password)+ return l.BindContext(ctx, username, password)default:return fmt.Errorf("unknown ldap scheme %q", ldapURL.Scheme)}-}func (s Scanner) Type() detectorspb.DetectorType {diff --git a/pkg/detectors/ldap/ldap_test.go b/pkg/detectors/ldap/ldap_test.goindex 25972f314..d2e5a4faa 100644--- a/pkg/detectors/ldap/ldap_test.go+++ b/pkg/detectors/ldap/ldap_test.go@@ -3,9 +3,11 @@ package ldapimport ("context""fmt"+ "net""testing""github.com/google/go-cmp/cmp"+ ldap "github.com/mariduv/ldap-verify""github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/engine/ahocorasick"@@ -84,3 +86,25 @@ func TestLdap_Pattern(t *testing.T) {})}}++func Test_isErrDeterminate(t *testing.T) {+ if isErrDeterminate(fmt.Errorf("anything")) != true {+ t.Errorf("general errors should be determinate")+ }++ if isErrDeterminate(&ldap.Error{Err: fmt.Errorf("anything")}) != true {+ t.Errorf("ldap general errors should be determinate")+ }++ if isErrDeterminate(&ldap.Error{Err: &net.OpError{}}) == true {+ t.Errorf("ldap net.OpError{} should be indeterminate")+ }++ if isErrDeterminate(&ldap.Error{Err: context.DeadlineExceeded}) == true {+ t.Errorf("ldap context deadline should be indeterminate")+ }++ if isErrDeterminate(&ldap.Error{Err: context.Canceled}) == true {+ t.Errorf("ldap context deadline should be indeterminate")+ }+}