From 868f25f55a747324dafcd4eeaa5e288f8a87e0f0 Mon Sep 17 00:00:00 2001 From: Joe Leon Date: Fri, 19 Jan 2024 09:51:13 -0500 Subject: [PATCH 1/2] updating detector logic for zenscrape --- pkg/detectors/zenscrape/zenscrape.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkg/detectors/zenscrape/zenscrape.go b/pkg/detectors/zenscrape/zenscrape.go index 1ec246c1fddc..2f31f7e1fef6 100644 --- a/pkg/detectors/zenscrape/zenscrape.go +++ b/pkg/detectors/zenscrape/zenscrape.go @@ -2,7 +2,6 @@ package zenscrape import ( "context" - "io" "net/http" "regexp" "strings" @@ -56,20 +55,13 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result res, err := client.Do(req) if err == nil { defer res.Body.Close() - bodyBytes, err := io.ReadAll(res.Body) - if err != nil { - continue - } - body := string(bodyBytes) - - if !strings.Contains(body, "Not enough requests.") { + if (res.StatusCode >= 200 && res.StatusCode < 300) || res.StatusCode == 429 { s1.Verified = true } else { if detectors.IsKnownFalsePositive(resMatch, detectors.DefaultFalsePositives, true) { continue } } - } } From e1bc5593ff638e7644221d945dd59d25e83b4350 Mon Sep 17 00:00:00 2001 From: Joe Leon Date: Mon, 22 Jan 2024 12:26:18 -0500 Subject: [PATCH 2/2] updating to use status endpoint --- pkg/detectors/zenscrape/zenscrape.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/detectors/zenscrape/zenscrape.go b/pkg/detectors/zenscrape/zenscrape.go index 2f31f7e1fef6..08b93f7cd970 100644 --- a/pkg/detectors/zenscrape/zenscrape.go +++ b/pkg/detectors/zenscrape/zenscrape.go @@ -47,7 +47,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result } if verify { - req, err := http.NewRequestWithContext(ctx, "GET", "https://app.zenscrape.com/api/v1/get?url=http://www.google.com", nil) + req, err := http.NewRequestWithContext(ctx, "GET", "https://app.zenscrape.com/api/v1/status", nil) if err != nil { continue }