Find, verify, and analyze leaked credentials
Go credentialsdevsecopsdynamic-analysisprecommitscanningsecretsecret-managementsecretssecuritysecurity-toolstrufflehogverification
fixed scrapingAnt detector (#3736)
Kashif Khanfb9f0a524f47
diff --git a/pkg/detectors/scrapingant/scrapingant.go b/pkg/detectors/scrapingant/scrapingant.goindex fae90b90f..3c14c9c6e 100644--- a/pkg/detectors/scrapingant/scrapingant.go+++ b/pkg/detectors/scrapingant/scrapingant.go@@ -2,11 +2,14 @@ package scrapingantimport ("context"- regexp "github.com/wasilibs/go-re2"+ "fmt"+ "io""net/http""strings""time"+ 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,20 +51,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- timeout := 10 * time.Second- client.Timeout = timeout- req, err := http.NewRequestWithContext(ctx, "GET", "https://api.scrapingant.com/v1/general?url=google.com", nil)- if err != nil {- continue- }- req.Header.Add("x-api-key", resMatch)- res, err := client.Do(req)- if err == nil {- defer res.Body.Close()- if res.StatusCode >= 200 && res.StatusCode < 300 {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyScrapingAnt(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -77,3 +69,33 @@ func (s Scanner) Type() detectorspb.DetectorType {func (s Scanner) Description() string {return "ScrapingAnt is a web scraping service that provides API keys to authenticate and make requests to their scraping endpoints."}++func verifyScrapingAnt(ctx context.Context, client *http.Client, apiKey string) (bool, error) {+ ctx, cancel := context.WithTimeout(ctx, 10*time.Second)+ defer cancel()++ // do not use google.com as url as it cannot be used under free subscription+ apiUrl := fmt.Sprintf("https://api.scrapingant.com/v1/general?url=example.com&x-api-key=%s", apiKey)+ req, err := http.NewRequestWithContext(ctx, http.MethodGet, apiUrl, http.NoBody)+ if err != nil {+ return false, err+ }++ resp, err := client.Do(req)+ if err != nil {+ return false, nil+ }++ defer func() {+ _, _ = io.Copy(io.Discard, resp.Body)+ _ = resp.Body.Close()+ }()++ if resp.StatusCode == http.StatusOK {+ return true, nil+ } else if resp.StatusCode == http.StatusUnauthorized || resp.StatusCode == http.StatusForbidden {+ return false, nil+ } else {+ return false, fmt.Errorf("unexpected status code: %d", resp.StatusCode)+ }+}diff --git a/pkg/detectors/scrapingant/scrapingant_test.go b/pkg/detectors/scrapingant/scrapingant_test.goindex 311550c8e..eb69636ca 100644--- a/pkg/detectors/scrapingant/scrapingant_test.go+++ b/pkg/detectors/scrapingant/scrapingant_test.go@@ -10,9 +10,9 @@ import ("time""github.com/kylelemons/godebug/pretty"- "github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/common"+ "github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb")