Merge branch 'main' into update/oss-136-storyblok-detector

Author: kashifkhan0771

pkg/detectors/sonarcloud/sonarcloud.go

@@ -21,7 +21,7 @@ var (
 	client = common.SaneHttpClient()
 
 	// Make sure that your group is surrounded in boundary characters such as below to reduce false positives.
-	keyPat = regexp.MustCompile(detectors.PrefixRegex([]string{"sonar"}) + `\b([0-9a-z]{40})\b`)
+	keyPat = regexp.MustCompile(detectors.PrefixRegex([]string{"sonar"}) + `(?:^|[^@])\b([0-9a-z]{40})\b`)
 )
 
 // Keywords are used for efficiently pre-filtering chunks.

pkg/detectors/sonarcloud/sonarcloud_test.go

@@ -45,6 +45,11 @@ func TestSonarCloud_Pattern(t *testing.T) {
 			input: fmt.Sprintf("%s = '%s'", keyword, invalidPattern),
 			want:  []string{},
 		},
+		{
+			name:  "invalid pattern - token directly preceded by @",
+			input: fmt.Sprintf("%s token = '@%s'", keyword, validPattern),
+			want:  []string{},
+		},
 	}
 
 	for _, test := range tests {