Find, verify, and analyze leaked credentials
Go credentialsdevsecopsdynamic-analysisprecommitscanningsecretsecret-managementsecretssecuritysecurity-toolstrufflehogverification
add version to extra data + moving existing versioned detectors into subdirectory format (#2471)
āh̳̕mͭͭͨͩ̐e̘ͬ́͋ͬ̊̓͂dd7a33055ad7b
diff --git a/hack/docs/Adding_Detectors_Internal.md b/hack/docs/Adding_Detectors_Internal.mdindex 79db10353..866d0d771 100644--- a/hack/docs/Adding_Detectors_Internal.md+++ b/hack/docs/Adding_Detectors_Internal.md@@ -48,13 +48,18 @@ If you think that something should be included outside of these guidelines, pleaIn some instances, services will update their token format, requiring a new regex to properly detect secrets in addition to supporting the previous token format. Accomodating this can be done without adding a net-new detector. [We provide a `Versioner` interface](https://github.com/trufflesecurity/trufflehog/blob/e18cfd5e0af1469a9f05b8d5732bcc94c39da49c/pkg/detectors/detectors.go#L30) that can be implemented.-1. Create a copy of the package and append `_v2` to the package and file names. Ex: `<packagename>/` -> `<packagename>_v2`, `<packagename>.go` -> `<packagename>_v2.go`+1. Create two new directories `v1` and `v2`. Move the existing detector and tests into `v1`, and add new files to `v2`.+Ex: `<packagename>/<old_files>` -> `<packagename>/v1/<old_files>`, `<packagename>/v2/<new_files>`Note: Be sure to update the tests to reference the new secret values in GSM, or the tests will fail.-2. Implement the `Versioner` interface. [GitHub example implementation.](/pkg/detectors/github_old/github_old.go#L22)+2. Implement the `Versioner` interface. [GitHub example implementation.](/pkg/detectors/github/v1/github_old.go#L23)-3. Proceed from step 3 of [Creating a new Secret Scanner](#creating-a-new-secret-scanner)+3. Add a 'version' field in ExtraData for both existing and new detector versions.++4. Update the existing detector in DefaultDetectors in `/pkg/engine/defaults.go`++5. Proceed from step 3 of [Creating a new Secret Scanner](#creating-a-new-secret-scanner)### Creating a new Secret Scanner@@ -82,7 +87,8 @@ Note: Be sure to update the tests to reference the new secret values in GSM, or4. Found and unverified (indeterminately due to an unexpected API response)5. Not found6. Any false positive cases that you come across- 5. Create a merge request for review. CI tests must be passing.+ 5. Add your new detector to DefaultDetectors in `/pkg/engine/defaults.go`+ 6. Create a merge request for review. CI tests must be passing.## Addendumdiff --git a/hack/docs/Adding_Detectors_external.md b/hack/docs/Adding_Detectors_external.mdindex c97369f71..5f62f8764 100644--- a/hack/docs/Adding_Detectors_external.md+++ b/hack/docs/Adding_Detectors_external.md@@ -44,13 +44,18 @@ If you think that something should be included outside of these guidelines, pleaIn some instances, services will update their token format, requiring a new regex to properly detect secrets in addition to supporting the previous token format. Accomodating this can be done without adding a net-new detector. [We provide a `Versioner` interface](https://github.com/trufflesecurity/trufflehog/blob/e18cfd5e0af1469a9f05b8d5732bcc94c39da49c/pkg/detectors/detectors.go#L30) that can be implemented.-1. Create a copy of the package and append `_v2` to the package and file names. Ex: `<packagename>/` -> `<packagename>_v2`, `<packagename>.go` -> `<packagename>_v2.go`+1. Create two new directories `v1` and `v2`. Move the existing detector and tests into `v1`, and add new files to `v2`.+Ex: `<packagename>/<old_files>` -> `<packagename>/v1/<old_files>`, `<packagename>/v2/<new_files>`Note: Be sure to update the tests to reference the new secret values in GSM, or the tests will fail.-2. Implement the `Versioner` interface. [GitHub example implementation.](/pkg/detectors/github_old/github_old.go#L22)+2. Implement the `Versioner` interface. [GitHub example implementation.](/pkg/detectors/github_old/github_old.go#L23)-3. Proceed from step 3 of [Creating a new Secret Scanner](#creating-a-new-secret-scanner)+3. Add a 'version' field in ExtraData for both existing and new detector versions.++4. Update the existing detector in DefaultDetectors in `/pkg/engine/defaults.go`++5. Proceed from step 3 of [Creating a new Secret Scanner](#creating-a-new-secret-scanner)### Creating a new Secret Detector@@ -77,8 +82,9 @@ Note: Be sure to update the tests to reference the new secret values in GSM, or1. Update the pattern regex and keywords. Try iterating with [regex101.com](http://regex101.com/).2. Update the verifier code to use a non-destructive API call that can determine whether the secret is valid or not.* Make sure you understand [verification indeterminacy](#verification-indeterminacy).- 3. Create a [test for the detector](#testing-the-detector)- 4. Create a pull request for review.+ 3. Create a [test for the detector](#testing-the-detector).+ 4. Add your new detector to DefaultDetectors in `/pkg/engine/defaults.go`.+ 5. Create a pull request for review.### Testing the DetectorTo ensure the quality of your PR, make sure your tests are passing with verified credentials.diff --git a/pkg/detectors/figmapersonalaccesstoken/v1/figmapersonalaccesstoken.go b/pkg/detectors/figmapersonalaccesstoken/v1/figmapersonalaccesstoken.goindex 73ed18385..454b87ee2 100644--- a/pkg/detectors/figmapersonalaccesstoken/v1/figmapersonalaccesstoken.go+++ b/pkg/detectors/figmapersonalaccesstoken/v1/figmapersonalaccesstoken.go@@ -3,10 +3,11 @@ package figmapersonalaccesstokenimport ("context""fmt"- regexp "github.com/wasilibs/go-re2""net/http""strings"+ regexp "github.com/wasilibs/go-re2"+"github.com/trufflesecurity/trufflehog/v3/pkg/common""github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"@@ -49,6 +50,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (results1 := detectors.Result{DetectorType: detectorspb.DetectorType_FigmaPersonalAccessToken,Raw: []byte(resMatch),+ ExtraData: map[string]string{+ "version": fmt.Sprintf("%d", s.Version()),+ },}if verify {diff --git a/pkg/detectors/figmapersonalaccesstoken/v1/figmapersonalaccesstoken_test.go b/pkg/detectors/figmapersonalaccesstoken/v1/figmapersonalaccesstoken_test.goindex 1162ad3b8..aec803ac8 100644--- a/pkg/detectors/figmapersonalaccesstoken/v1/figmapersonalaccesstoken_test.go+++ b/pkg/detectors/figmapersonalaccesstoken/v1/figmapersonalaccesstoken_test.go@@ -51,6 +51,9 @@ func TestFigmaPersonalAccessToken_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_FigmaPersonalAccessToken,Verified: true,+ ExtraData: map[string]string{+ "version": "1",+ },},},wantErr: false,@@ -67,6 +70,9 @@ func TestFigmaPersonalAccessToken_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_FigmaPersonalAccessToken,Verified: false,+ ExtraData: map[string]string{+ "version": "1",+ },},},wantErr: false,@@ -83,6 +89,9 @@ func TestFigmaPersonalAccessToken_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_FigmaPersonalAccessToken,Verified: false,+ ExtraData: map[string]string{+ "version": "1",+ },},},wantErr: false,@@ -100,6 +109,9 @@ func TestFigmaPersonalAccessToken_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_FigmaPersonalAccessToken,Verified: false,+ ExtraData: map[string]string{+ "version": "1",+ },},},wantErr: false,diff --git a/pkg/detectors/figmapersonalaccesstoken/v2/figmapersonalaccesstoken_v2.go b/pkg/detectors/figmapersonalaccesstoken/v2/figmapersonalaccesstoken_v2.goindex b2d40991a..1284d0f53 100644--- a/pkg/detectors/figmapersonalaccesstoken/v2/figmapersonalaccesstoken_v2.go+++ b/pkg/detectors/figmapersonalaccesstoken/v2/figmapersonalaccesstoken_v2.go@@ -3,10 +3,11 @@ package figmapersonalaccesstokenimport ("context""fmt"- regexp "github.com/wasilibs/go-re2""net/http""strings"+ regexp "github.com/wasilibs/go-re2"+"github.com/trufflesecurity/trufflehog/v3/pkg/common""github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"@@ -48,6 +49,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (results1 := detectors.Result{DetectorType: detectorspb.DetectorType_FigmaPersonalAccessToken,Raw: []byte(resMatch),+ ExtraData: map[string]string{+ "version": fmt.Sprintf("%d", s.Version()),+ },}if verify {diff --git a/pkg/detectors/figmapersonalaccesstoken/v2/figmapersonalaccesstoken_v2_test.go b/pkg/detectors/figmapersonalaccesstoken/v2/figmapersonalaccesstoken_v2_test.goindex a3604ce1b..09910400b 100644--- a/pkg/detectors/figmapersonalaccesstoken/v2/figmapersonalaccesstoken_v2_test.go+++ b/pkg/detectors/figmapersonalaccesstoken/v2/figmapersonalaccesstoken_v2_test.go@@ -51,6 +51,9 @@ func TestFigmaPersonalAccessToken_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_FigmaPersonalAccessToken,Verified: true,+ ExtraData: map[string]string{+ "version": "2",+ },},},wantErr: false,@@ -67,6 +70,9 @@ func TestFigmaPersonalAccessToken_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_FigmaPersonalAccessToken,Verified: false,+ ExtraData: map[string]string{+ "version": "2",+ },},},wantErr: false,@@ -83,6 +89,9 @@ func TestFigmaPersonalAccessToken_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_FigmaPersonalAccessToken,Verified: false,+ ExtraData: map[string]string{+ "version": "2",+ },},},wantErr: false,@@ -100,6 +109,9 @@ func TestFigmaPersonalAccessToken_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_FigmaPersonalAccessToken,Verified: false,+ ExtraData: map[string]string{+ "version": "2",+ },},},wantErr: false,diff --git a/pkg/detectors/fullstory/fullstory.go b/pkg/detectors/fullstory/v1/fullstory.gosimilarity index 96%rename from pkg/detectors/fullstory/fullstory.gorename to pkg/detectors/fullstory/v1/fullstory.goindex 9325b7883..fafea2f5d 100644--- a/pkg/detectors/fullstory/fullstory.go+++ b/pkg/detectors/fullstory/v1/fullstory.go@@ -3,10 +3,11 @@ package fullstoryimport ("context""fmt"- regexp "github.com/wasilibs/go-re2""net/http""strings"+ regexp "github.com/wasilibs/go-re2"+"github.com/trufflesecurity/trufflehog/v3/pkg/common""github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"@@ -48,6 +49,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (results1 := detectors.Result{DetectorType: detectorspb.DetectorType_Fullstory,Raw: []byte(resMatch),+ ExtraData: map[string]string{+ "version": fmt.Sprintf("%d", s.Version()),+ },}if verify {diff --git a/pkg/detectors/fullstory/fullstory_test.go b/pkg/detectors/fullstory/v1/fullstory_test.gosimilarity index 95%rename from pkg/detectors/fullstory/fullstory_test.gorename to pkg/detectors/fullstory/v1/fullstory_test.goindex 3fe830567..981591a60 100644--- a/pkg/detectors/fullstory/fullstory_test.go+++ b/pkg/detectors/fullstory/v1/fullstory_test.go@@ -50,6 +50,9 @@ func TestFullstory_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Fullstory,Verified: true,+ ExtraData: map[string]string{+ "version": "1",+ },},},wantErr: false,@@ -66,6 +69,9 @@ func TestFullstory_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Fullstory,Verified: false,+ ExtraData: map[string]string{+ "version": "1",+ },},},wantErr: false,diff --git a/pkg/detectors/fullstory_v2/fullstory_v2.go b/pkg/detectors/fullstory/v2/fullstory_v2.gosimilarity index 95%rename from pkg/detectors/fullstory_v2/fullstory_v2.gorename to pkg/detectors/fullstory/v2/fullstory_v2.goindex 0783a45c2..05c07d12e 100644--- a/pkg/detectors/fullstory_v2/fullstory_v2.go+++ b/pkg/detectors/fullstory/v2/fullstory_v2.go@@ -1,12 +1,13 @@-package fullstory_v2+package fullstoryimport ("context""fmt"- regexp "github.com/wasilibs/go-re2""net/http""strings"+ regexp "github.com/wasilibs/go-re2"+"github.com/trufflesecurity/trufflehog/v3/pkg/common""github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"@@ -48,6 +49,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (results1 := detectors.Result{DetectorType: detectorspb.DetectorType_Fullstory,Raw: []byte(resMatch),+ ExtraData: map[string]string{+ "version": fmt.Sprintf("%d", s.Version()),+ },}if verify {diff --git a/pkg/detectors/fullstory_v2/fullstory_v2_test.go b/pkg/detectors/fullstory/v2/fullstory_v2_test.gosimilarity index 95%rename from pkg/detectors/fullstory_v2/fullstory_v2_test.gorename to pkg/detectors/fullstory/v2/fullstory_v2_test.goindex 083ba2410..6b0f33199 100644--- a/pkg/detectors/fullstory_v2/fullstory_v2_test.go+++ b/pkg/detectors/fullstory/v2/fullstory_v2_test.go@@ -1,7 +1,7 @@//go:build detectors// +build detectors-package fullstory_v2+package fullstoryimport ("context"@@ -50,6 +50,9 @@ func TestFullstory_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Fullstory,Verified: true,+ ExtraData: map[string]string{+ "version": "2",+ },},},wantErr: false,@@ -66,6 +69,9 @@ func TestFullstory_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Fullstory,Verified: false,+ ExtraData: map[string]string{+ "version": "2",+ },},},wantErr: false,diff --git a/pkg/detectors/github_old/github_old.go b/pkg/detectors/github/v1/github_old.gosimilarity index 98%rename from pkg/detectors/github_old/github_old.gorename to pkg/detectors/github/v1/github_old.goindex 26d056801..e235ddcb2 100644--- a/pkg/detectors/github_old/github_old.go+++ b/pkg/detectors/github/v1/github_old.go@@ -1,12 +1,13 @@-package github_old+package githubimport ("context""encoding/json""fmt"- regexp "github.com/wasilibs/go-re2""net/http"+ regexp "github.com/wasilibs/go-re2"+"github.com/trufflesecurity/trufflehog/v3/pkg/common""github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"@@ -74,6 +75,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}s1.ExtraData = map[string]string{"rotation_guide": "https://howtorotate.com/docs/tutorials/github/",+ "version": fmt.Sprintf("%d", s.Version()),}if verify {diff --git a/pkg/detectors/github_old/github_old_test.go b/pkg/detectors/github/v1/github_old_test.gosimilarity index 90%rename from pkg/detectors/github_old/github_old_test.gorename to pkg/detectors/github/v1/github_old_test.goindex f61847956..b1d3470d0 100644--- a/pkg/detectors/github_old/github_old_test.go+++ b/pkg/detectors/github/v1/github_old_test.go@@ -1,7 +1,7 @@//go:build detectors// +build detectors-package github_old+package githubimport ("context"@@ -48,6 +48,10 @@ func TestGitHub_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Github,Verified: true,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/github/",+ "version": "1",+ },},},wantErr: false,@@ -64,6 +68,10 @@ func TestGitHub_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Github,Verified: false,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/github/",+ "version": "1",+ },},},wantErr: false,diff --git a/pkg/detectors/github/github.go b/pkg/detectors/github/v2/github.gosimilarity index 98%rename from pkg/detectors/github/github.gorename to pkg/detectors/github/v2/github.goindex 038cd08c2..5b2d4778d 100644--- a/pkg/detectors/github/github.go+++ b/pkg/detectors/github/v2/github.go@@ -4,9 +4,10 @@ import ("context""encoding/json""fmt"- regexp "github.com/wasilibs/go-re2""net/http"+ regexp "github.com/wasilibs/go-re2"+"github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"@@ -72,6 +73,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultRaw: []byte(token),ExtraData: map[string]string{"rotation_guide": "https://howtorotate.com/docs/tutorials/github/",+ "version": fmt.Sprintf("%d", s.Version()),},}diff --git a/pkg/detectors/github/github_test.go b/pkg/detectors/github/v2/github_test.gosimilarity index 91%rename from pkg/detectors/github/github_test.gorename to pkg/detectors/github/v2/github_test.goindex 488c5e136..fa44fd474 100644--- a/pkg/detectors/github/github_test.go+++ b/pkg/detectors/github/v2/github_test.go@@ -55,14 +55,15 @@ func TestGitHub_FromChunk(t *testing.T) {DetectorType: detectorspb.DetectorType_Github,Verified: true,ExtraData: map[string]string{- "account_type": "User",- "company": "",- "name": "",+ "account_type": "User",+ // "company": "", // not present in test verifiedGhp+ // "name": "", // not present in test verifiedGhp"rotation_guide": "https://howtorotate.com/docs/tutorials/github/","scopes": "notifications",- "site_admin": "false",- "url": "https://github.com/truffle-sandbox",- "username": "truffle-sandbox",+ // "site_admin": "false", // not present in test verifiedGhp+ "url": "https://github.com/truffle-sandbox",+ "username": "truffle-sandbox",+ "version": "2",},},},@@ -82,6 +83,7 @@ func TestGitHub_FromChunk(t *testing.T) {Verified: false,ExtraData: map[string]string{"rotation_guide": "https://howtorotate.com/docs/tutorials/github/",+ "version": "2",},},},@@ -101,6 +103,7 @@ func TestGitHub_FromChunk(t *testing.T) {Verified: false,ExtraData: map[string]string{"rotation_guide": "https://howtorotate.com/docs/tutorials/github/",+ "version": "2",},},},@@ -120,6 +123,7 @@ func TestGitHub_FromChunk(t *testing.T) {Verified: false,ExtraData: map[string]string{"rotation_guide": "https://howtorotate.com/docs/tutorials/github/",+ "version": "2",},},},@@ -139,6 +143,7 @@ func TestGitHub_FromChunk(t *testing.T) {Verified: false,ExtraData: map[string]string{"rotation_guide": "https://howtorotate.com/docs/tutorials/github/",+ "version": "2",},},},@@ -158,6 +163,7 @@ func TestGitHub_FromChunk(t *testing.T) {Verified: false,ExtraData: map[string]string{"rotation_guide": "https://howtorotate.com/docs/tutorials/github/",+ "version": "2",},},},@@ -177,6 +183,7 @@ func TestGitHub_FromChunk(t *testing.T) {Verified: false,ExtraData: map[string]string{"rotation_guide": "https://howtorotate.com/docs/tutorials/github/",+ "version": "2",},},},diff --git a/pkg/detectors/gitlab/gitlab.go b/pkg/detectors/gitlab/v1/gitlab.gosimilarity index 98%rename from pkg/detectors/gitlab/gitlab.gorename to pkg/detectors/gitlab/v1/gitlab.goindex 90f8fa02e..703ef672c 100644--- a/pkg/detectors/gitlab/gitlab.go+++ b/pkg/detectors/gitlab/v1/gitlab.go@@ -4,11 +4,12 @@ import ("context""encoding/json""fmt"- regexp "github.com/wasilibs/go-re2""io""net/http""strings"+ regexp "github.com/wasilibs/go-re2"+"github.com/trufflesecurity/trufflehog/v3/pkg/common""github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"@@ -61,6 +62,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}s1.ExtraData = map[string]string{"rotation_guide": "https://howtorotate.com/docs/tutorials/gitlab/",+ "version": fmt.Sprintf("%d", s.Version()),}if verify {diff --git a/pkg/detectors/gitlab/gitlab_v1_test.go b/pkg/detectors/gitlab/v1/gitlab_v1_test.gosimilarity index 84%rename from pkg/detectors/gitlab/gitlab_v1_test.gorename to pkg/detectors/gitlab/v1/gitlab_v1_test.goindex 05c2f8ffa..e521f45b1 100644--- a/pkg/detectors/gitlab/gitlab_v1_test.go+++ b/pkg/detectors/gitlab/v1/gitlab_v1_test.go@@ -51,6 +51,10 @@ func TestGitlab_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Gitlab,Verified: true,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/gitlab/",+ "version": "1",+ },},},wantErr: false,@@ -67,6 +71,10 @@ func TestGitlab_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Gitlab,Verified: true,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/gitlab/",+ "version": "1",+ },},},wantErr: false,@@ -83,6 +91,10 @@ func TestGitlab_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Gitlab,Verified: false,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/gitlab/",+ "version": "1",+ },},},wantErr: false,@@ -99,6 +111,10 @@ func TestGitlab_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Gitlab,Verified: false,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/gitlab/",+ "version": "1",+ },},},wantErr: false,@@ -116,6 +132,10 @@ func TestGitlab_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Gitlab,Verified: false,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/gitlab/",+ "version": "1",+ },},},wantErr: false,@@ -133,6 +153,10 @@ func TestGitlab_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Gitlab,Verified: true,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/gitlab/",+ "version": "1",+ },},},wantErr: false,diff --git a/pkg/detectors/gitlab/gitlab_v2_test.go b/pkg/detectors/gitlab/v1/gitlab_v2_test.gosimilarity index 100%rename from pkg/detectors/gitlab/gitlab_v2_test.gorename to pkg/detectors/gitlab/v1/gitlab_v2_test.godiff --git a/pkg/detectors/gitlabv2/gitlab_v1_test.go b/pkg/detectors/gitlab/v2/gitlab_v1_test.gosimilarity index 99%rename from pkg/detectors/gitlabv2/gitlab_v1_test.gorename to pkg/detectors/gitlab/v2/gitlab_v1_test.goindex 930d6a848..19e2c0b50 100644--- a/pkg/detectors/gitlabv2/gitlab_v1_test.go+++ b/pkg/detectors/gitlab/v2/gitlab_v1_test.go@@ -1,7 +1,7 @@//go:build detectors// +build detectors-package gitlabv2+package gitlabimport ("context"diff --git a/pkg/detectors/gitlabv2/gitlab_v2.go b/pkg/detectors/gitlab/v2/gitlab_v2.gosimilarity index 98%rename from pkg/detectors/gitlabv2/gitlab_v2.gorename to pkg/detectors/gitlab/v2/gitlab_v2.goindex 24f0f1e75..30ab43cc3 100644--- a/pkg/detectors/gitlabv2/gitlab_v2.go+++ b/pkg/detectors/gitlab/v2/gitlab_v2.go@@ -1,12 +1,13 @@-package gitlabv2+package gitlabimport ("context""fmt"- regexp "github.com/wasilibs/go-re2""net/http""strings"+ regexp "github.com/wasilibs/go-re2"+"github.com/trufflesecurity/trufflehog/v3/pkg/common""github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"@@ -53,6 +54,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}s1.ExtraData = map[string]string{"rotation_guide": "https://howtorotate.com/docs/tutorials/gitlab/",+ "version": fmt.Sprintf("%d", s.Version()),}if verify {diff --git a/pkg/detectors/gitlabv2/gitlab_v2_test.go b/pkg/detectors/gitlab/v2/gitlab_v2_test.gosimilarity index 85%rename from pkg/detectors/gitlabv2/gitlab_v2_test.gorename to pkg/detectors/gitlab/v2/gitlab_v2_test.goindex ee6b8591e..72706b1b4 100644--- a/pkg/detectors/gitlabv2/gitlab_v2_test.go+++ b/pkg/detectors/gitlab/v2/gitlab_v2_test.go@@ -1,7 +1,7 @@//go:build detectors// +build detectors-package gitlabv2+package gitlabimport ("context"@@ -51,6 +51,10 @@ func TestGitlabV2_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Gitlab,Verified: true,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/gitlab/",+ "version": "2",+ },},},wantErr: false,@@ -67,6 +71,10 @@ func TestGitlabV2_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Gitlab,Verified: false,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/gitlab/",+ "version": "2",+ },},},wantErr: false,@@ -83,6 +91,10 @@ func TestGitlabV2_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Gitlab,Verified: false,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/gitlab/",+ "version": "2",+ },},},wantErr: false,@@ -100,6 +112,10 @@ func TestGitlabV2_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Gitlab,Verified: false,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/gitlab/",+ "version": "2",+ },},},wantErr: false,@@ -117,6 +133,10 @@ func TestGitlabV2_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_Gitlab,Verified: true,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/gitlab/",+ "version": "2",+ },},},wantErr: false,diff --git a/pkg/detectors/jiratoken/jiratoken.go b/pkg/detectors/jiratoken/v1/jiratoken.gosimilarity index 95%rename from pkg/detectors/jiratoken/jiratoken.gorename to pkg/detectors/jiratoken/v1/jiratoken.goindex 9abc58c00..ae174feb3 100644--- a/pkg/detectors/jiratoken/jiratoken.go+++ b/pkg/detectors/jiratoken/v1/jiratoken.go@@ -4,10 +4,11 @@ import ("context"b64 "encoding/base64""fmt"- regexp "github.com/wasilibs/go-re2""net/http""strings"+ regexp "github.com/wasilibs/go-re2"+"github.com/trufflesecurity/trufflehog/v3/pkg/common""github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"@@ -72,9 +73,10 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultDetectorType: detectorspb.DetectorType_JiraToken,Raw: []byte(resToken),RawV2: []byte(fmt.Sprintf("%s:%s:%s", resEmail, resToken, resDomain)),- }- s1.ExtraData = map[string]string{- "rotation_guide": "https://howtorotate.com/docs/tutorials/atlassian/",+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/atlassian/",+ "version": fmt.Sprintf("%d", s.Version()),+ },}if verify {diff --git a/pkg/detectors/jiratoken/jiratoken_test.go b/pkg/detectors/jiratoken/v1/jiratoken_test.gosimilarity index 88%rename from pkg/detectors/jiratoken/jiratoken_test.gorename to pkg/detectors/jiratoken/v1/jiratoken_test.goindex b9f6579f4..c4990b385 100644--- a/pkg/detectors/jiratoken/jiratoken_test.go+++ b/pkg/detectors/jiratoken/v1/jiratoken_test.go@@ -54,6 +54,10 @@ func TestJiraToken_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_JiraToken,Verified: true,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/atlassian/",+ "version": "1",+ },},},wantErr: false,@@ -71,6 +75,10 @@ func TestJiraToken_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_JiraToken,Verified: false,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/atlassian/",+ "version": "1",+ },},},wantErr: false,@@ -100,6 +108,10 @@ func TestJiraToken_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_JiraToken,Verified: false,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/atlassian/",+ "version": "1",+ },},},wantErr: false,@@ -117,6 +129,10 @@ func TestJiraToken_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_JiraToken,Verified: false,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/atlassian/",+ "version": "1",+ },},},wantErr: false,diff --git a/pkg/detectors/jiratoken_v2/jiratoken_v2.go b/pkg/detectors/jiratoken/v2/jiratoken_v2.gosimilarity index 95%rename from pkg/detectors/jiratoken_v2/jiratoken_v2.gorename to pkg/detectors/jiratoken/v2/jiratoken_v2.goindex 9cdfc688d..04f08953e 100644--- a/pkg/detectors/jiratoken_v2/jiratoken_v2.go+++ b/pkg/detectors/jiratoken/v2/jiratoken_v2.go@@ -1,13 +1,14 @@-package jiratoken_v2+package jiratokenimport ("context"b64 "encoding/base64""fmt"- regexp "github.com/wasilibs/go-re2""net/http""strings"+ regexp "github.com/wasilibs/go-re2"+"github.com/trufflesecurity/trufflehog/v3/pkg/common""github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"@@ -73,6 +74,10 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultDetectorType: detectorspb.DetectorType_JiraToken,Raw: []byte(resToken),RawV2: []byte(fmt.Sprintf("%s:%s:%s", resEmail, resToken, resDomain)),+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/atlassian/",+ "version": fmt.Sprintf("%d", s.Version()),+ },}if verify {diff --git a/pkg/detectors/jiratoken_v2/jiratoken_v2_test.go b/pkg/detectors/jiratoken/v2/jiratoken_v2_test.gosimilarity index 88%rename from pkg/detectors/jiratoken_v2/jiratoken_v2_test.gorename to pkg/detectors/jiratoken/v2/jiratoken_v2_test.goindex 3fec014b7..92b248dba 100644--- a/pkg/detectors/jiratoken_v2/jiratoken_v2_test.go+++ b/pkg/detectors/jiratoken/v2/jiratoken_v2_test.go@@ -1,7 +1,7 @@//go:build detectors// +build detectors-package jiratoken_v2+package jiratokenimport ("context"@@ -54,6 +54,10 @@ func TestJiraToken_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_JiraToken,Verified: true,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/atlassian/",+ "version": "2",+ },},},wantErr: false,@@ -71,6 +75,10 @@ func TestJiraToken_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_JiraToken,Verified: false,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/atlassian/",+ "version": "2",+ },},},wantErr: false,@@ -100,6 +108,10 @@ func TestJiraToken_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_JiraToken,Verified: false,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/atlassian/",+ "version": "2",+ },},},wantErr: false,@@ -117,6 +129,10 @@ func TestJiraToken_FromChunk(t *testing.T) {{DetectorType: detectorspb.DetectorType_JiraToken,Verified: false,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/atlassian/",+ "version": "2",+ },},},wantErr: false,diff --git a/pkg/detectors/maxmindlicense/maxmindlicense.go b/pkg/detectors/maxmindlicense/v1/maxmindlicense.gosimilarity index 92%rename from pkg/detectors/maxmindlicense/maxmindlicense.gorename to pkg/detectors/maxmindlicense/v1/maxmindlicense.goindex fda7d5579..0e20c158b 100644--- a/pkg/detectors/maxmindlicense/maxmindlicense.go+++ b/pkg/detectors/maxmindlicense/v1/maxmindlicense.go@@ -2,10 +2,12 @@ package maxmindlicenseimport ("context"- regexp "github.com/wasilibs/go-re2"+ "fmt""net/http""strings"+ regexp "github.com/wasilibs/go-re2"+"github.com/trufflesecurity/trufflehog/v3/pkg/common""github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"@@ -51,9 +53,10 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultDetectorType: detectorspb.DetectorType_MaxMindLicense,Redacted: idRes,Raw: []byte(keyRes),- }- s1.ExtraData = map[string]string{- "rotation_guide": "https://howtorotate.com/docs/tutorials/maxmind/",+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/maxmind/",+ "version": fmt.Sprintf("%d", s.Version()),+ },}if verify {diff --git a/pkg/detectors/maxmindlicense/maxmindlicense_test.go b/pkg/detectors/maxmindlicense/v1/maxmindlicense_test.gosimilarity index 91%rename from pkg/detectors/maxmindlicense/maxmindlicense_test.gorename to pkg/detectors/maxmindlicense/v1/maxmindlicense_test.goindex 42ff4ca1b..f64d67994 100644--- a/pkg/detectors/maxmindlicense/maxmindlicense_test.go+++ b/pkg/detectors/maxmindlicense/v1/maxmindlicense_test.go@@ -52,6 +52,10 @@ func TestMaxMindLicense_FromChunk(t *testing.T) {DetectorType: detectorspb.DetectorType_MaxMindLicense,Redacted: "510124",Verified: true,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/maxmind/",+ "version": "1",+ },},},wantErr: false,@@ -69,6 +73,10 @@ func TestMaxMindLicense_FromChunk(t *testing.T) {DetectorType: detectorspb.DetectorType_MaxMindLicense,Redacted: "510124",Verified: false,+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/maxmind/",+ "version": "1",+ },},},wantErr: false,diff --git a/pkg/detectors/maxmindlicense_v2/maxmindlicense_v2.go b/pkg/detectors/maxmindlicense/v2/maxmindlicense_v2.gosimilarity index 91%rename from pkg/detectors/maxmindlicense_v2/maxmindlicense_v2.gorename to pkg/detectors/maxmindlicense/v2/maxmindlicense_v2.goindex c9b1cac2e..4815a8565 100644--- a/pkg/detectors/maxmindlicense_v2/maxmindlicense_v2.go+++ b/pkg/detectors/maxmindlicense/v2/maxmindlicense_v2.go@@ -1,7 +1,8 @@-package maxmindlicense_v2+package maxmindlicenseimport ("context"+ "fmt""net/http""regexp""strings"@@ -52,9 +53,10 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultRedacted: idRes,Raw: []byte(keyRes),RawV2: []byte(keyRes + idRes),- }- s.ExtraData = map[string]string{- "rotation_guide": "https://howtorotate.com/docs/tutorials/maxmind/",+ ExtraData: map[string]string{+ "rotation_guide": "https://howtorotate.com/docs/tutorials/maxmind/",+ "version": fmt.Sprintf("%d", s.Version()),+ },}if verify {diff --git a/pkg/detectors/maxmindlicense_v2/maxmindlicense_v2_test.go b/pkg/detectors/maxmindlicense/v2/maxmindlicense_v2_test.gosimilarity index 97%rename from pkg/detectors/maxmindlicense_v2/maxmindlicense_v2_test.gorename to pkg/detectors/maxmindlicense/v2/maxmindlicense_v2_test.goindex 84b2598fa..e47ce4f1d 100644--- a/pkg/detectors/maxmindlicense_v2/maxmindlicense_v2_test.go+++ b/pkg/detectors/maxmindlicense/v2/maxmindlicense_v2_test.go@@ -1,7 +1,7 @@//go:build detectors// +build detectors-package maxmindlicense_v2+package maxmindlicenseimport ("context"@@ -54,6 +54,7 @@ func TestMaxMindLicense_FromChunk(t *testing.T) {Verified: true,ExtraData: map[string]string{"rotation_guide": "https://howtorotate.com/docs/tutorials/maxmind/",+ "version": "2",},},},@@ -74,6 +75,7 @@ func TestMaxMindLicense_FromChunk(t *testing.T) {Verified: false,ExtraData: map[string]string{"rotation_guide": "https://howtorotate.com/docs/tutorials/maxmind/",+ "version": "2",},},},diff --git a/pkg/engine/defaults.go b/pkg/engine/defaults.goindex 2b2a6a882..7e46502bc 100644--- a/pkg/engine/defaults.go+++ b/pkg/engine/defaults.go@@ -247,8 +247,8 @@ import ("github.com/trufflesecurity/trufflehog/v3/pkg/detectors/feedier""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/fetchrss""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/fibery"- figmapersonalaccesstokenV1 "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/figmapersonalaccesstoken/v1"- figmapersonalaccesstokenV2 "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/figmapersonalaccesstoken/v2"+ figmapersonalaccesstokenv1 "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/figmapersonalaccesstoken/v1"+ figmapersonalaccesstokenv2 "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/figmapersonalaccesstoken/v2""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/fileio""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/finage""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/financialmodelingprep"@@ -276,8 +276,8 @@ import ("github.com/trufflesecurity/trufflehog/v3/pkg/detectors/front""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/ftp""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/fulcrum"- "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/fullstory"- "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/fullstory_v2"+ fullstoryv1 "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/fullstory/v1"+ fullstoryv2 "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/fullstory/v2""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/fxmarket""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/gcp""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/geckoboard"@@ -292,12 +292,12 @@ import ("github.com/trufflesecurity/trufflehog/v3/pkg/detectors/getgist""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/getresponse""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/getsandbox"- "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/github"+ githubv1 "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/github/v1"+ githubv2 "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/github/v2""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/github_oauth2"- "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/github_old""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/githubapp"- "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/gitlab"- "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/gitlabv2"+ gitlabv1 "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/gitlab/v1"+ gitlabv2 "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/gitlab/v2""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/gitter""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/glassnode""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/gocanvas"@@ -354,8 +354,8 @@ import ("github.com/trufflesecurity/trufflehog/v3/pkg/detectors/ipquality""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/ipstack""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/jdbc"- "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/jiratoken"- "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/jiratoken_v2"+ jiratokenv1 "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/jiratoken/v1"+ jiratokenv2 "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/jiratoken/v2""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/jotform""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/jumpcloud""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/juro"@@ -411,8 +411,8 @@ import ("github.com/trufflesecurity/trufflehog/v3/pkg/detectors/marketstack""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/mattermostpersonaltoken""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/mavenlink"- "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/maxmindlicense"- "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/maxmindlicense_v2"+ maxmindlicensev1 "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/maxmindlicense/v1"+ maxmindlicensev2 "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/maxmindlicense/v2""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/meaningcloud""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/mediastack""github.com/trufflesecurity/trufflehog/v3/pkg/detectors/meistertask"@@ -793,7 +793,7 @@ func DefaultDetectors() []detectors.Detector {aws.New(),awssessionkey.New(),&slack.Scanner{}, // has 4 secret types- &gitlab.Scanner{},+ &gitlabv1.Scanner{},&gitlabv2.Scanner{},&sendgrid.Scanner{},&mailchimp.Scanner{},@@ -804,7 +804,8 @@ func DefaultDetectors() []detectors.Detector {&square.Scanner{},&squareapp.Scanner{},&pivotaltracker.Scanner{},- &github.Scanner{},+ &githubv1.Scanner{},+ &githubv2.Scanner{},&twilio.Scanner{},&gcp.Scanner{},&circleci.Scanner{},@@ -812,8 +813,8 @@ func DefaultDetectors() []detectors.Detector {&razorpay.Scanner{},&jdbc.Scanner{},&privatekey.Scanner{},- &maxmindlicense.Scanner{},- &maxmindlicense_v2.Scanner{},+ &maxmindlicensev1.Scanner{},+ &maxmindlicensev2.Scanner{},&airtableapikey.Scanner{},&bitfinex.Scanner{},&telegrambottoken.Scanner{},@@ -848,9 +849,8 @@ func DefaultDetectors() []detectors.Detector {&fastlypersonaltoken.Scanner{},&snykkey.Scanner{},&postmark.Scanner{},- &figmapersonalaccesstokenV1.Scanner{},- &figmapersonalaccesstokenV2.Scanner{},- &github_old.Scanner{},+ &figmapersonalaccesstokenv1.Scanner{},+ &figmapersonalaccesstokenv2.Scanner{},&webex.Scanner{},&segmentapikey.Scanner{},&vultrapikey.Scanner{},@@ -865,7 +865,8 @@ func DefaultDetectors() []detectors.Detector {&airbrakeuserkey.Scanner{},&sumologickey.Scanner{},&pagerdutyapikey.Scanner{},- &jiratoken.Scanner{},+ &jiratokenv1.Scanner{},+ jiratokenv2.Scanner{},&airbrakeprojectkey.Scanner{},&calendlyapikey.Scanner{},&bitlyaccesstoken.Scanner{},@@ -1085,8 +1086,8 @@ func DefaultDetectors() []detectors.Detector {// mixpanel.Scanner{},ipgeolocation.Scanner{},tmetric.Scanner{},- fullstory.Scanner{},- fullstory_v2.Scanner{},+ fullstoryv1.Scanner{},+ fullstoryv2.Scanner{},noticeable.Scanner{},currencyscoop.Scanner{},scrapingbee.Scanner{},@@ -1591,7 +1592,6 @@ func DefaultDetectors() []detectors.Detector {azuredevopspersonalaccesstoken.Scanner{},azuresearchadminkey.Scanner{},&azuresearchquerykey.Scanner{},- jiratoken_v2.Scanner{},&googleoauth2.Scanner{},}