Find, verify, and analyze leaked credentials
Go credentialsdevsecopsdynamic-analysisprecommitscanningsecretsecret-managementsecretssecuritysecurity-toolstrufflehogverification
Set all verification errors in detectors (#5253)
Shahzad Haidera5f3de55cc20
diff --git a/pkg/detectors/cexio/cexio.go b/pkg/detectors/cexio/cexio.goindex 750fa854a..47abeba4c 100644--- a/pkg/detectors/cexio/cexio.go+++ b/pkg/detectors/cexio/cexio.go@@ -71,41 +71,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {-- timestamp := strconv.FormatInt(time.Now().Unix()*1000, 10)-- signature := getCexIOPassphrase(resSecretMatch, resKeyMatch, timestamp, resUserIdMatch)-- payload := url.Values{}- payload.Add("key", resKeyMatch)- payload.Add("signature", signature)- payload.Add("nonce", timestamp)-- req, err := http.NewRequestWithContext(ctx, "POST", "https://cex.io/api/balance/", strings.NewReader(payload.Encode()))- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/x-www-form-urlencoded")- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()-- body, err := io.ReadAll(res.Body)- if err != nil {- continue- }- bodyString := string(body)- validResponse := strings.Contains(bodyString, `timestamp`)-- var responseObject Response- if err := json.Unmarshal(body, &responseObject); err != nil {- continue- }-- if res.StatusCode >= 200 && res.StatusCode < 300 && validResponse {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resSecretMatch, resKeyMatch, resUserIdMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resSecretMatch, resKeyMatch, resUserIdMatch)}results = append(results, s1)@@ -116,6 +84,47 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resSecretMatch string, resKeyMatch string, resUserIdMatch string) (bool, error) {++ timestamp := strconv.FormatInt(time.Now().Unix()*1000, 10)++ signature := getCexIOPassphrase(resSecretMatch, resKeyMatch, timestamp, resUserIdMatch)++ payload := url.Values{}+ payload.Add("key", resKeyMatch)+ payload.Add("signature", signature)+ payload.Add("nonce", timestamp)++ req, err := http.NewRequestWithContext(ctx, "POST", "https://cex.io/api/balance/", strings.NewReader(payload.Encode()))+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/x-www-form-urlencoded")+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()++ body, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ bodyString := string(body)+ validResponse := strings.Contains(bodyString, `timestamp`)++ var responseObject Response+ if err := json.Unmarshal(body, &responseObject); err != nil {+ return false, err+ }++ if res.StatusCode >= 200 && res.StatusCode < 300 && validResponse {+ return true, nil+ }++ return false, nil+}+type Response struct {Error string `json:"error"`}diff --git a/pkg/detectors/commodities/commodities.go b/pkg/detectors/commodities/commodities.goindex a0a6fde5f..2ae4c88f3 100644--- a/pkg/detectors/commodities/commodities.go+++ b/pkg/detectors/commodities/commodities.go@@ -48,28 +48,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- client.Timeout = 5 * time.Second- req, err := http.NewRequestWithContext(ctx, "GET", "https://commodities-api.com/api/latest?access_key="+resMatch, nil)- if err != nil {- continue- }- res, err := client.Do(req)- if err == nil {- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- bodyString := string(bodyBytes)- validResponse := strings.Contains(bodyString, `"success":true`)- defer func() { _ = res.Body.Close() }()- if res.StatusCode >= 200 && res.StatusCode < 300 {- if validResponse {- s1.Verified = true- } else {- s1.Verified = false- }- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -78,6 +59,35 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ client.Timeout = 5 * time.Second+ req, err := http.NewRequestWithContext(ctx, "GET", "https://commodities-api.com/api/latest?access_key="+resMatch, nil)+ if err != nil {+ return false, err+ }+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() {+ _, _ = io.Copy(io.Discard, res.Body)+ _ = res.Body.Close()+ }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ bodyString := string(bodyBytes)+ validResponse := strings.Contains(bodyString, `"success":true`)+ if res.StatusCode >= 200 && res.StatusCode < 300 {+ if validResponse {+ return true, nil+ }+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Commodities}diff --git a/pkg/detectors/convier/convier.go b/pkg/detectors/convier/convier.goindex 9fcf405ba..a7154b595 100644--- a/pkg/detectors/convier/convier.go+++ b/pkg/detectors/convier/convier.go@@ -49,30 +49,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, "POST", "https://convier.me/api/event", nil)- if err != nil {- continue- }- req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", resMatch))- res, err := client.Do(req)- if err == nil {- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- bodyString := string(bodyBytes)- validResponse := strings.Contains(bodyString, `"error":false`)- defer func() { _ = res.Body.Close() }()- if res.StatusCode >= 200 && res.StatusCode < 300 {- if validResponse {- s1.Verified = true- } else {- s1.Verified = false- }- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -81,6 +60,37 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ timeout := 10 * time.Second+ client.Timeout = timeout+ req, err := http.NewRequestWithContext(ctx, "POST", "https://convier.me/api/event", nil)+ if err != nil {+ return false, err+ }+ req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", resMatch))+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() {+ _, _ = io.Copy(io.Discard, res.Body)+ _ = res.Body.Close()+ }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ bodyString := string(bodyBytes)+ validResponse := strings.Contains(bodyString, `"error":false`)+ if res.StatusCode >= 200 && res.StatusCode < 300 {+ if validResponse {+ return true, nil+ }+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Convier}diff --git a/pkg/detectors/cryptocompare/cryptocompare.go b/pkg/detectors/cryptocompare/cryptocompare.goindex 782628ce6..87563f1d0 100644--- a/pkg/detectors/cryptocompare/cryptocompare.go+++ b/pkg/detectors/cryptocompare/cryptocompare.go@@ -47,27 +47,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", "https://min-api.cryptocompare.com/data/blockchain/list?api_key="+resMatch, nil)- if err != nil {- continue- }- res, err := client.Do(req)- if err == nil {- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- bodyString := string(bodyBytes)- errCode := strings.Contains(bodyString, `"Response":"Success"`)- defer func() { _ = res.Body.Close() }()- if res.StatusCode >= 200 && res.StatusCode < 300 {- if errCode {- s1.Verified = true- } else {- s1.Verified = false- }- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -76,6 +58,34 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", "https://min-api.cryptocompare.com/data/blockchain/list?api_key="+resMatch, nil)+ if err != nil {+ return false, err+ }+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() {+ _, _ = io.Copy(io.Discard, res.Body)+ _ = res.Body.Close()+ }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ bodyString := string(bodyBytes)+ errCode := strings.Contains(bodyString, `"Response":"Success"`)+ if res.StatusCode >= 200 && res.StatusCode < 300 {+ if errCode {+ return true, nil+ }+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_CryptoCompare}diff --git a/pkg/detectors/dareboost/dareboost.go b/pkg/detectors/dareboost/dareboost.goindex 049297aed..0ae3d7a2d 100644--- a/pkg/detectors/dareboost/dareboost.go+++ b/pkg/detectors/dareboost/dareboost.go@@ -47,32 +47,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- payload := strings.NewReader(`{ "token": "` + resMatch + `", "location": "Paris"}`)-- req, err := http.NewRequestWithContext(ctx, "POST", "https://api.dareboost.com/0.8/config", payload)- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/json")- res, err := client.Do(req)- if err == nil {- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }-- bodyString := string(bodyBytes)- validResponse := strings.Contains(bodyString, `"status":200`)-- defer func() { _ = res.Body.Close() }()- if res.StatusCode >= 200 && res.StatusCode < 300 {- if validResponse {- s1.Verified = true- } else {- s1.Verified = false- }- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -81,6 +58,39 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ payload := strings.NewReader(`{ "token": "` + resMatch + `", "location": "Paris"}`)++ req, err := http.NewRequestWithContext(ctx, "POST", "https://api.dareboost.com/0.8/config", payload)+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/json")+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() {+ _, _ = io.Copy(io.Discard, res.Body)+ _ = res.Body.Close()+ }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }++ bodyString := string(bodyBytes)+ validResponse := strings.Contains(bodyString, `"status":200`)++ if res.StatusCode >= 200 && res.StatusCode < 300 {+ if validResponse {+ return true, nil+ }+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Dareboost}diff --git a/pkg/detectors/dyspatch/dyspatch.go b/pkg/detectors/dyspatch/dyspatch.goindex 974f4e9ca..3842b4588 100644--- a/pkg/detectors/dyspatch/dyspatch.go+++ b/pkg/detectors/dyspatch/dyspatch.go@@ -48,26 +48,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", "https://api.dyspatch.io/templates", nil)- if err != nil {- continue- }- req.Header.Add("Accept", "application/vnd.dyspatch.2020.11+json")- req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", resMatch))- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- validResponse := strings.Contains(body, "limited_usage") || strings.Contains(body, "data")-- if validResponse {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -76,6 +59,32 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", "https://api.dyspatch.io/templates", nil)+ if err != nil {+ return false, err+ }+ req.Header.Add("Accept", "application/vnd.dyspatch.2020.11+json")+ req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", resMatch))+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ validResponse := strings.Contains(body, "limited_usage") || strings.Contains(body, "data")++ if validResponse {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Dyspatch}diff --git a/pkg/detectors/etherscan/etherscan.go b/pkg/detectors/etherscan/etherscan.goindex c519f486e..b2fb2bab5 100644--- a/pkg/detectors/etherscan/etherscan.go+++ b/pkg/detectors/etherscan/etherscan.go@@ -47,23 +47,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", "https://api.etherscan.io/api?module=account&action=balance&address=0xde0b295669a9fd93d5f28d9ec85e40f4cb697bae&tag=latest&apikey="+resMatch, nil)- if err != nil {- continue- }- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)-- if strings.Contains(body, `"OK"`) {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -72,6 +58,29 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", "https://api.etherscan.io/api?module=account&action=balance&address=0xde0b295669a9fd93d5f28d9ec85e40f4cb697bae&tag=latest&apikey="+resMatch, nil)+ if err != nil {+ return false, err+ }+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)++ if strings.Contains(body, `"OK"`) {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Etherscan}diff --git a/pkg/detectors/fixerio/fixerio.go b/pkg/detectors/fixerio/fixerio.goindex 26e1d7853..8999e344a 100644--- a/pkg/detectors/fixerio/fixerio.go+++ b/pkg/detectors/fixerio/fixerio.go@@ -47,32 +47,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", "https://data.fixer.io/api/latest?access_key="+resMatch, nil)- if err != nil {- continue- }-- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)-- // if client_id and client_secret is valid -> 403 {"error":"invalid_grant","error_description":"Invalid authorization code"}- // if invalid -> 401 {"error":"access_denied","error_description":"Unauthorized"}- // ingenious!-- validResponse := strings.Contains(body, `"success": true`) || strings.Contains(body, `"info":"Access Restricted - Your current Subscription Plan does not support HTTPS Encryption."`)- defer func() { _ = res.Body.Close() }()-- if res.StatusCode >= 200 && res.StatusCode < 300 && validResponse {- s1.Verified = true- }-- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -81,6 +58,36 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", "https://data.fixer.io/api/latest?access_key="+resMatch, nil)+ if err != nil {+ return false, err+ }++ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)++ // if client_id and client_secret is valid -> 403 {"error":"invalid_grant","error_description":"Invalid authorization code"}+ // if invalid -> 401 {"error":"access_denied","error_description":"Unauthorized"}+ // ingenious!++ validResponse := strings.Contains(body, `"success": true`) || strings.Contains(body, `"info":"Access Restricted - Your current Subscription Plan does not support HTTPS Encryption."`)++ if res.StatusCode >= 200 && res.StatusCode < 300 && validResponse {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_FixerIO}diff --git a/pkg/detectors/flickr/flickr.go b/pkg/detectors/flickr/flickr.goindex da8592c5e..e67e3ee8f 100644--- a/pkg/detectors/flickr/flickr.go+++ b/pkg/detectors/flickr/flickr.go@@ -48,23 +48,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://www.flickr.com/services/rest/?method=flickr.tags.getHotList&api_key=%s", resMatch), nil)- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/json")- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- if (res.StatusCode >= 200 && res.StatusCode < 300) && strings.Contains(body, "owner=") {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -73,6 +59,29 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://www.flickr.com/services/rest/?method=flickr.tags.getHotList&api_key=%s", resMatch), nil)+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/json")+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ if (res.StatusCode >= 200 && res.StatusCode < 300) && strings.Contains(body, "owner=") {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Flickr}diff --git a/pkg/detectors/flightstats/flightstats.go b/pkg/detectors/flightstats/flightstats.goindex 5a5e6fe0e..32ed5d12a 100644--- a/pkg/detectors/flightstats/flightstats.go+++ b/pkg/detectors/flightstats/flightstats.go@@ -55,24 +55,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.flightstats.com/flex/aircraft/rest/v1/json/availableFields?appId=%s&appKey=%s", resId, resMatch), nil)- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/json")- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- validResponse := (res.StatusCode >= 200 && res.StatusCode < 300 && strings.Contains(body, "id")) || (res.StatusCode == 403 && strings.Contains(body, "application is not active"))- if validResponse {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resId, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resId, resMatch)}results = append(results, s1)@@ -82,6 +67,30 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resId string, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.flightstats.com/flex/aircraft/rest/v1/json/availableFields?appId=%s&appKey=%s", resId, resMatch), nil)+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/json")+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ validResponse := (res.StatusCode >= 200 && res.StatusCode < 300 && strings.Contains(body, "id")) || (res.StatusCode == 403 && strings.Contains(body, "application is not active"))+ if validResponse {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Flightstats}diff --git a/pkg/detectors/flowflu/flowflu.go b/pkg/detectors/flowflu/flowflu.goindex e0cc5cc4e..29fc83b0b 100644--- a/pkg/detectors/flowflu/flowflu.go+++ b/pkg/detectors/flowflu/flowflu.go@@ -56,29 +56,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://%s.flowlu.com/api/v1/module/crm/lead/list?api_key=%s", resAccount, resMatch), nil)- if err != nil {- continue- }- res, err := client.Do(req)- if err == nil {- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }-- bodyString := string(bodyBytes)- validResponse := strings.Contains(bodyString, `total_result`)-- defer func() { _ = res.Body.Close() }()- if res.StatusCode >= 200 && res.StatusCode < 300 {- if validResponse {- s1.Verified = true- } else {- s1.Verified = false- }- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resAccount, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resAccount, resMatch)}results = append(results, s1)@@ -88,6 +68,36 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resAccount string, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://%s.flowlu.com/api/v1/module/crm/lead/list?api_key=%s", resAccount, resMatch), nil)+ if err != nil {+ return false, err+ }+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() {+ _, _ = io.Copy(io.Discard, res.Body)+ _ = res.Body.Close()+ }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }++ bodyString := string(bodyBytes)+ validResponse := strings.Contains(bodyString, `total_result`)++ if res.StatusCode >= 200 && res.StatusCode < 300 {+ if validResponse {+ return true, nil+ }+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_FlowFlu}diff --git a/pkg/detectors/freshbooks/freshbooks.go b/pkg/detectors/freshbooks/freshbooks.goindex c6b8c3d45..893de60d1 100644--- a/pkg/detectors/freshbooks/freshbooks.go+++ b/pkg/detectors/freshbooks/freshbooks.go@@ -53,22 +53,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf(`https://auth.freshbooks.com/oauth/authorize?client_id=%s&redirect_uri=%s&response_type=code`, resMatch, resURI), nil)- if err != nil {- continue- }- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- if res.StatusCode >= 200 && res.StatusCode < 300 && strings.Contains(body, "Log In to FreshBooks") {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch, resURI)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch, resURI)}results = append(results, s1)@@ -78,6 +65,28 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string, resURI string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf(`https://auth.freshbooks.com/oauth/authorize?client_id=%s&redirect_uri=%s&response_type=code`, resMatch, resURI), nil)+ if err != nil {+ return false, err+ }+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ if res.StatusCode >= 200 && res.StatusCode < 300 && strings.Contains(body, "Log In to FreshBooks") {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Freshbooks}diff --git a/pkg/detectors/gengo/gengo.go b/pkg/detectors/gengo/gengo.goindex 7c74d9615..9178bfe7c 100644--- a/pkg/detectors/gengo/gengo.go+++ b/pkg/detectors/gengo/gengo.go@@ -66,31 +66,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {-- timestamp := strconv.FormatInt(time.Now().Unix(), 10)- signature := getGengoSignature(timestamp, resSecretMatch)-- req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.gengo.com/v2/account/me?ts=%s&api_key=%s&api_sig=%s", timestamp, resMatch, signature), nil)- if err != nil {- continue- }- req.Header.Add("Accept", "application/json")- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- body, errBody := io.ReadAll(res.Body)-- if errBody == nil {- var response Response- if err := json.Unmarshal(body, &response); err != nil {- continue- }-- if res.StatusCode >= 200 && res.StatusCode < 300 && response.OpStat == "ok" {- s1.Verified = true- }- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resSecretMatch, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resSecretMatch, resMatch)}results = append(results, s1)@@ -100,6 +78,38 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resSecretMatch string, resMatch string) (bool, error) {++ timestamp := strconv.FormatInt(time.Now().Unix(), 10)+ signature := getGengoSignature(timestamp, resSecretMatch)++ req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.gengo.com/v2/account/me?ts=%s&api_key=%s&api_sig=%s", timestamp, resMatch, signature), nil)+ if err != nil {+ return false, err+ }+ req.Header.Add("Accept", "application/json")+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ body, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }++ var response Response+ if err := json.Unmarshal(body, &response); err != nil {+ return false, err+ }++ if res.StatusCode >= 200 && res.StatusCode < 300 && response.OpStat == "ok" {+ return true, nil+ }++ return false, nil+}+type Response struct {OpStat string `json:"opstat"`}diff --git a/pkg/detectors/getemail/getemail.go b/pkg/detectors/getemail/getemail.goindex 6ddf51f35..0aed3b29f 100644--- a/pkg/detectors/getemail/getemail.go+++ b/pkg/detectors/getemail/getemail.go@@ -49,27 +49,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.getemail.io/v1/find-mail?firstname=Larry&lastname=Page&domain=google.com&api_key=%s", resMatch), nil)- if err != nil {- continue- }- res, err := client.Do(req)- if err == nil {- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- bodyString := string(bodyBytes)- errCode := strings.Contains(bodyString, `"code":"USER_NOT_EXIST"`)- defer func() { _ = res.Body.Close() }()- if res.StatusCode >= 200 && res.StatusCode < 300 {- if errCode {- s1.Verified = false- } else {- s1.Verified = true- }- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -78,6 +60,34 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.getemail.io/v1/find-mail?firstname=Larry&lastname=Page&domain=google.com&api_key=%s", resMatch), nil)+ if err != nil {+ return false, err+ }+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() {+ _, _ = io.Copy(io.Discard, res.Body)+ _ = res.Body.Close()+ }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ bodyString := string(bodyBytes)+ errCode := strings.Contains(bodyString, `"code":"USER_NOT_EXIST"`)+ if res.StatusCode >= 200 && res.StatusCode < 300 {+ if !errCode {+ return true, nil+ }+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_GetEmail}diff --git a/pkg/detectors/gocanvas/gocanvas.go b/pkg/detectors/gocanvas/gocanvas.goindex f13168c70..88b9ddf4e 100644--- a/pkg/detectors/gocanvas/gocanvas.go+++ b/pkg/detectors/gocanvas/gocanvas.go@@ -59,31 +59,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- payload := url.Values{}- payload.Add("username", emailMatch)-- req, err := http.NewRequestWithContext(ctx, "GET", "https://www.gocanvas.com/apiv2/forms.xml", strings.NewReader(payload.Encode()))- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/x-www-form-urlencoded")- req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", resMatch))- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- body, errBody := io.ReadAll(res.Body)-- if errBody == nil {- response := Response{}- if err := xml.Unmarshal(body, &response); err != nil {- continue- }-- if res.StatusCode >= 200 && res.StatusCode < 300 && response.Error == nil {- s1.Verified = true- }- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, emailMatch, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, emailMatch, resMatch)}results = append(results, s1)@@ -93,6 +71,38 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, emailMatch string, resMatch string) (bool, error) {+ payload := url.Values{}+ payload.Add("username", emailMatch)++ req, err := http.NewRequestWithContext(ctx, "GET", "https://www.gocanvas.com/apiv2/forms.xml", strings.NewReader(payload.Encode()))+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/x-www-form-urlencoded")+ req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", resMatch))+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ body, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }++ response := Response{}+ if err := xml.Unmarshal(body, &response); err != nil {+ return false, err+ }++ if res.StatusCode >= 200 && res.StatusCode < 300 && response.Error == nil {+ return true, nil+ }++ return false, nil+}+type Response struct {Error []struct {ErrorCode int `xml:"ErrorCode"`diff --git a/pkg/detectors/holistic/holistic.go b/pkg/detectors/holistic/holistic.goindex e5157a7dd..56cd2f028 100644--- a/pkg/detectors/holistic/holistic.go+++ b/pkg/detectors/holistic/holistic.go@@ -47,26 +47,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", "https://api.holistic.dev/api/v1/project", nil)- if err != nil {- continue- }- req.Header.Add("x-api-key", resMatch)- res, err := client.Do(req)- if err == nil {- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }-- bodyString := string(bodyBytes)- errorResponse := strings.Contains(bodyString, `"data":[]`)-- defer func() { _ = res.Body.Close() }()- if res.StatusCode >= 200 && res.StatusCode < 300 && !errorResponse {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -75,6 +58,35 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", "https://api.holistic.dev/api/v1/project", nil)+ if err != nil {+ return false, err+ }+ req.Header.Add("x-api-key", resMatch)+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() {+ _, _ = io.Copy(io.Discard, res.Body)+ _ = res.Body.Close()+ }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }++ bodyString := string(bodyBytes)+ errorResponse := strings.Contains(bodyString, `"data":[]`)++ if res.StatusCode >= 200 && res.StatusCode < 300 && !errorResponse {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Holistic}diff --git a/pkg/detectors/humanity/humanity.go b/pkg/detectors/humanity/humanity.goindex 959860dfa..62398de81 100644--- a/pkg/detectors/humanity/humanity.go+++ b/pkg/detectors/humanity/humanity.go@@ -47,25 +47,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", "https://www.humanity.com/api/v2/me?access_token="+resMatch, nil)- if err != nil {- continue- }- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)-- validResponse := strings.Contains(body, "name")-- if validResponse {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -74,6 +58,31 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", "https://www.humanity.com/api/v2/me?access_token="+resMatch, nil)+ if err != nil {+ return false, err+ }+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)++ validResponse := strings.Contains(body, "name")++ if validResponse {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Humanity}diff --git a/pkg/detectors/infura/infura.go b/pkg/detectors/infura/infura.goindex a659d883c..a782bb33a 100644--- a/pkg/detectors/infura/infura.go+++ b/pkg/detectors/infura/infura.go@@ -47,24 +47,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- payload := strings.NewReader(`{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}`)- req, err := http.NewRequestWithContext(ctx, "POST", "https://mainnet.infura.io/v3/"+resMatch, payload)- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/json")- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- if strings.Contains(body, `"result"`) {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -73,6 +58,30 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ payload := strings.NewReader(`{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}`)+ req, err := http.NewRequestWithContext(ctx, "POST", "https://mainnet.infura.io/v3/"+resMatch, payload)+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/json")+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ if strings.Contains(body, `"result"`) {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Infura}diff --git a/pkg/detectors/instamojo/instamojo.go b/pkg/detectors/instamojo/instamojo.goindex c79c4c54f..15203d609 100644--- a/pkg/detectors/instamojo/instamojo.go+++ b/pkg/detectors/instamojo/instamojo.go@@ -61,30 +61,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultif client == nil {client = defaultClient}- payload := strings.NewReader("grant_type=client_credentials&client_id=" + resClientId + "&client_secret=" + resSecret)-- req, err := http.NewRequestWithContext(ctx, "POST", "https://api.instamojo.com/oauth2/token/", payload)- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/x-www-form-urlencoded")- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- if (res.StatusCode >= 200 && res.StatusCode < 300) && strings.Contains(body, "access_token") {- s1.Verified = true- } else {- err = fmt.Errorf("unexpected HTTP response status %d", res.StatusCode)- s1.SetVerificationError(err, resSecret)- }- } else {- s1.SetVerificationError(err, resSecret)- }+ isVerified, verificationErr := verifyMatch(ctx, client, resClientId, resSecret)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resClientId, resSecret)}results = append(results, s1)@@ -94,6 +73,33 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resClientId, resSecret string) (bool, error) {+ payload := strings.NewReader("grant_type=client_credentials&client_id=" + resClientId + "&client_secret=" + resSecret)++ req, err := http.NewRequestWithContext(ctx, "POST", "https://api.instamojo.com/oauth2/token/", payload)+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/x-www-form-urlencoded")++ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()++ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ if (res.StatusCode >= 200 && res.StatusCode < 300) && strings.Contains(body, "access_token") {+ return true, nil+ }++ return false, fmt.Errorf("unexpected HTTP response status %d", res.StatusCode)+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Instamojo}diff --git a/pkg/detectors/ipstack/ipstack.go b/pkg/detectors/ipstack/ipstack.goindex c32c963ef..2f100d48a 100644--- a/pkg/detectors/ipstack/ipstack.go+++ b/pkg/detectors/ipstack/ipstack.go@@ -46,25 +46,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", "https://api.ipstack.com/134.201.250.155?access_key="+resMatch, nil)- if err != nil {- continue- }- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- validResponse := strings.Contains(body, "continent_code") || strings.Contains(body, `"info":"Access Restricted - Your current Subscription Plan does not support HTTPS Encryption."`)-- if validResponse {- s1.Verified = true- }- }-+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -73,6 +57,30 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", "https://api.ipstack.com/134.201.250.155?access_key="+resMatch, nil)+ if err != nil {+ return false, err+ }+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ validResponse := strings.Contains(body, "continent_code") || strings.Contains(body, `"info":"Access Restricted - Your current Subscription Plan does not support HTTPS Encryption."`)++ if validResponse {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_IpStack}diff --git a/pkg/detectors/linearapi/linearapi.go b/pkg/detectors/linearapi/linearapi.goindex 09363bb0e..9b287f1bc 100644--- a/pkg/detectors/linearapi/linearapi.go+++ b/pkg/detectors/linearapi/linearapi.go@@ -47,26 +47,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- reqDataQuery := strings.NewReader(`{ "query": "{ viewer { id name } }" }`)- req, err := http.NewRequestWithContext(ctx, "POST", "https://api.linear.app/graphql", reqDataQuery)- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/json")- req.Header.Add("Authorization", resMatch)-- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- if res.StatusCode >= 200 && res.StatusCode < 300 && strings.Contains(body, `"data":`) {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -75,6 +58,32 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ reqDataQuery := strings.NewReader(`{ "query": "{ viewer { id name } }" }`)+ req, err := http.NewRequestWithContext(ctx, "POST", "https://api.linear.app/graphql", reqDataQuery)+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/json")+ req.Header.Add("Authorization", resMatch)++ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ if res.StatusCode >= 200 && res.StatusCode < 300 && strings.Contains(body, `"data":`) {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_LinearAPI}diff --git a/pkg/detectors/mailboxlayer/mailboxlayer.go b/pkg/detectors/mailboxlayer/mailboxlayer.goindex 48f451b9b..9e038a8a7 100644--- a/pkg/detectors/mailboxlayer/mailboxlayer.go+++ b/pkg/detectors/mailboxlayer/mailboxlayer.go@@ -47,29 +47,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", "https://apilayer.net/api/check?access_key="+resMatch+"&[email protected]", nil)- if err != nil {- continue- }- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- validResponse := strings.Contains(body, `email`) || strings.Contains(body, `"info":"Access Restricted - Your current Subscription Plan does not support HTTPS Encryption."`)-- // if client_id and client_secret is valid -> 403 {"error":"invalid_grant","error_description":"Invalid authorization code"}- // if invalid -> 401 {"error":"access_denied","error_description":"Unauthorized"}- // ingenious!-- if validResponse {- s1.Verified = true- }-- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -78,6 +58,34 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", "https://apilayer.net/api/check?access_key="+resMatch+"&[email protected]", nil)+ if err != nil {+ return false, err+ }+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ validResponse := strings.Contains(body, `email`) || strings.Contains(body, `"info":"Access Restricted - Your current Subscription Plan does not support HTTPS Encryption."`)++ // if client_id and client_secret is valid -> 403 {"error":"invalid_grant","error_description":"Invalid authorization code"}+ // if invalid -> 401 {"error":"access_denied","error_description":"Unauthorized"}+ // ingenious!++ if validResponse {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Mailboxlayer}diff --git a/pkg/detectors/metabase/metabase.go b/pkg/detectors/metabase/metabase.goindex 289f1e32e..990eb83b5 100644--- a/pkg/detectors/metabase/metabase.go+++ b/pkg/detectors/metabase/metabase.go@@ -5,6 +5,7 @@ import ("encoding/json""io""net/http"+ "net/url""strings"regexp "github.com/wasilibs/go-re2"@@ -65,23 +66,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- u.Path = "/api/user/current"- req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)- if err != nil {- continue- }- req.Header.Add("X-Metabase-Session", resMatch)- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- body, err := io.ReadAll(res.Body)- if err != nil {- continue- }- if res.StatusCode == http.StatusOK && json.Valid(body) {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, u, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -91,6 +78,31 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, u *url.URL, resMatch string) (bool, error) {+ u.Path = "/api/user/current"+ req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)+ if err != nil {+ return false, err+ }+ req.Header.Add("X-Metabase-Session", resMatch)++ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()++ body, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ if res.StatusCode == http.StatusOK && json.Valid(body) {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Metabase}diff --git a/pkg/detectors/moosend/moosend.go b/pkg/detectors/moosend/moosend.goindex 3b3951e5c..489b3d751 100644--- a/pkg/detectors/moosend/moosend.go+++ b/pkg/detectors/moosend/moosend.go@@ -47,22 +47,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", "https://api.moosend.com/v3/lists.json?apikey="+resMatch+"&format=json", nil)- if err != nil {- continue- }- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- if strings.Contains(body, "CreatedOn") {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -71,6 +58,28 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", "https://api.moosend.com/v3/lists.json?apikey="+resMatch+"&format=json", nil)+ if err != nil {+ return false, err+ }+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ if strings.Contains(body, "CreatedOn") {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Moosend}diff --git a/pkg/detectors/mrticktock/mrticktock.go b/pkg/detectors/mrticktock/mrticktock.goindex c783d8995..d4d497243 100644--- a/pkg/detectors/mrticktock/mrticktock.go+++ b/pkg/detectors/mrticktock/mrticktock.go@@ -57,24 +57,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- payload := strings.NewReader(fmt.Sprintf(`email=%s&password=%s`, emailMatch, resPassword))- req, err := http.NewRequestWithContext(ctx, "POST", "https://mrticktock.com/app/api/is_timer_active", payload)- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/x-www-form-urlencoded")- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- if res.StatusCode >= 200 && res.StatusCode < 300 && strings.Contains(body, `"errors":[]`) {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, emailMatch, resPassword)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, emailMatch, resPassword)}results = append(results, s1)@@ -83,6 +68,30 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, emailMatch string, resPassword string) (bool, error) {+ payload := strings.NewReader(fmt.Sprintf(`email=%s&password=%s`, emailMatch, resPassword))+ req, err := http.NewRequestWithContext(ctx, "POST", "https://mrticktock.com/app/api/is_timer_active", payload)+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/x-www-form-urlencoded")+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ if res.StatusCode >= 200 && res.StatusCode < 300 && strings.Contains(body, `"errors":[]`) {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Mrticktock}diff --git a/pkg/detectors/onedesk/onedesk.go b/pkg/detectors/onedesk/onedesk.goindex 83b1ee06f..7c4910884 100644--- a/pkg/detectors/onedesk/onedesk.go+++ b/pkg/detectors/onedesk/onedesk.go@@ -57,24 +57,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- payload := strings.NewReader(fmt.Sprintf(`{"email": "%s", "password": "%s"}`, emailMatch, resPword))- req, err := http.NewRequestWithContext(ctx, "POST", "https://app.onedesk.com/rest/2.0/login/loginUser", payload)- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/json")- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- if res.StatusCode >= 200 && res.StatusCode < 300 && strings.Contains(body, `"code":"SUCCESS"`) {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, emailMatch, resPword)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, emailMatch, resPword)}results = append(results, s1)@@ -83,6 +68,30 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, emailMatch string, resPword string) (bool, error) {+ payload := strings.NewReader(fmt.Sprintf(`{"email": "%s", "password": "%s"}`, emailMatch, resPword))+ req, err := http.NewRequestWithContext(ctx, "POST", "https://app.onedesk.com/rest/2.0/login/loginUser", payload)+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/json")+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ if res.StatusCode >= 200 && res.StatusCode < 300 && strings.Contains(body, `"code":"SUCCESS"`) {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Onedesk}diff --git a/pkg/detectors/paralleldots/paralleldots.go b/pkg/detectors/paralleldots/paralleldots.goindex b39d9c82f..37d900ce8 100644--- a/pkg/detectors/paralleldots/paralleldots.go+++ b/pkg/detectors/paralleldots/paralleldots.go@@ -49,42 +49,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- payload := &bytes.Buffer{}- writer := multipart.NewWriter(payload)- fw, err := writer.CreateFormField("api_key")- if err != nil {- continue- }- _, err = io.Copy(fw, strings.NewReader(resMatch))- if err != nil {- continue- }- fw, err = writer.CreateFormField("text")- if err != nil {- continue- }- _, err = io.Copy(fw, strings.NewReader("sample text"))- if err != nil {- continue- }- _ = writer.Close()- req, err := http.NewRequestWithContext(ctx, "POST", "https://apis.paralleldots.com/v4/intent", bytes.NewReader(payload.Bytes()))- if err != nil {- continue- }- req.Header.Add("Content-Type", writer.FormDataContentType())- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- if (res.StatusCode >= 200 && res.StatusCode < 300) && strings.Contains(body, "intent") {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -93,6 +60,48 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ payload := &bytes.Buffer{}+ writer := multipart.NewWriter(payload)+ fw, err := writer.CreateFormField("api_key")+ if err != nil {+ return false, err+ }+ _, err = io.Copy(fw, strings.NewReader(resMatch))+ if err != nil {+ return false, err+ }+ fw, err = writer.CreateFormField("text")+ if err != nil {+ return false, err+ }+ _, err = io.Copy(fw, strings.NewReader("sample text"))+ if err != nil {+ return false, err+ }+ _ = writer.Close()+ req, err := http.NewRequestWithContext(ctx, "POST", "https://apis.paralleldots.com/v4/intent", bytes.NewReader(payload.Bytes()))+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", writer.FormDataContentType())+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ if (res.StatusCode >= 200 && res.StatusCode < 300) && strings.Contains(body, "intent") {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_ParallelDots}diff --git a/pkg/detectors/planyo/planyo.go b/pkg/detectors/planyo/planyo.goindex 2880285a4..b57f295c0 100644--- a/pkg/detectors/planyo/planyo.go+++ b/pkg/detectors/planyo/planyo.go@@ -48,24 +48,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://www.planyo.com/rest/?method=get_site_info&api_key=%s", resMatch), nil)- if err != nil {- continue- }- req.Header.Add("Accept", "application/vnd.planyo+json; version=3")- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- validResponse := strings.Contains(body, "data") || strings.Contains(body, "Your Planyo site has expired")- if res.StatusCode >= 200 && res.StatusCode < 300 && validResponse {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -74,6 +59,30 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://www.planyo.com/rest/?method=get_site_info&api_key=%s", resMatch), nil)+ if err != nil {+ return false, err+ }+ req.Header.Add("Accept", "application/vnd.planyo+json; version=3")+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ validResponse := strings.Contains(body, "data") || strings.Contains(body, "Your Planyo site has expired")+ if res.StatusCode >= 200 && res.StatusCode < 300 && validResponse {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Planyo}diff --git a/pkg/detectors/raven/raven.go b/pkg/detectors/raven/raven.goindex a59a84511..bc741ec39 100644--- a/pkg/detectors/raven/raven.go+++ b/pkg/detectors/raven/raven.go@@ -49,25 +49,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.raventools.com/api?key=%s&method=profile_info&format=json", resMatch), nil)- if err != nil {- continue- }- res, err := client.Do(req)- if err == nil {- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- defer func() { _ = res.Body.Close() }()- if res.StatusCode >= 200 && res.StatusCode < 300 {- if json.Valid(bodyBytes) {- s1.Verified = true- } else {- s1.Verified = false- }- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -76,6 +60,32 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.raventools.com/api?key=%s&method=profile_info&format=json", resMatch), nil)+ if err != nil {+ return false, err+ }+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() {+ _, _ = io.Copy(io.Discard, res.Body)+ _ = res.Body.Close()+ }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ if res.StatusCode >= 200 && res.StatusCode < 300 {+ if json.Valid(bodyBytes) {+ return true, nil+ }+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Raven}diff --git a/pkg/detectors/razorpay/razorpay.go b/pkg/detectors/razorpay/razorpay.goindex d9323fa2d..7263fb3f6 100644--- a/pkg/detectors/razorpay/razorpay.go+++ b/pkg/detectors/razorpay/razorpay.go@@ -57,24 +57,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", "https://api.razorpay.com/v1/items?count=1", nil)- if err != nil {- continue- }- req.SetBasicAuth(key, secret)- res, err := client.Do(req)- if err == nil {- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- defer func() { _ = res.Body.Close() }()- if res.StatusCode >= 200 && res.StatusCode < 300 {- if json.Valid(bodyBytes) {- s1.Verified = true- }- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, key, secret)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, key, secret)}results = append(results, s1)@@ -85,6 +70,30 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, key, secret string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", "https://api.razorpay.com/v1/items?count=1", nil)+ if err != nil {+ return false, err+ }+ req.SetBasicAuth(key, secret)++ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()++ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ if res.StatusCode >= 200 && res.StatusCode < 300 && json.Valid(bodyBytes) {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_RazorPay}diff --git a/pkg/detectors/reallysimplesystems/reallysimplesystems.go b/pkg/detectors/reallysimplesystems/reallysimplesystems.goindex d5835289d..4cfd6cad6 100644--- a/pkg/detectors/reallysimplesystems/reallysimplesystems.go+++ b/pkg/detectors/reallysimplesystems/reallysimplesystems.go@@ -49,26 +49,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", "https://apiv4.reallysimplesystems.com/accounts", nil)- if err != nil {- continue- }- req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", resMatch))- res, err := client.Do(req)- if err == nil {- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- defer func() { _ = res.Body.Close() }()- if res.StatusCode >= 200 && res.StatusCode < 300 {- if json.Valid(bodyBytes) {- s1.Verified = true- } else {- s1.Verified = false- }- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -77,6 +60,33 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", "https://apiv4.reallysimplesystems.com/accounts", nil)+ if err != nil {+ return false, err+ }+ req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", resMatch))+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() {+ _, _ = io.Copy(io.Discard, res.Body)+ _ = res.Body.Close()+ }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ if res.StatusCode >= 200 && res.StatusCode < 300 {+ if json.Valid(bodyBytes) {+ return true, nil+ }+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_ReallySimpleSystems}diff --git a/pkg/detectors/semaphore/semaphore.go b/pkg/detectors/semaphore/semaphore.goindex 049ed987c..8d50be925 100644--- a/pkg/detectors/semaphore/semaphore.go+++ b/pkg/detectors/semaphore/semaphore.go@@ -52,23 +52,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.semaphore.co/api/v4/account?apikey=%s", resMatch), nil)- if err != nil {- continue- }- req.Header.Add("Accept", "application/vnd.semaphore+json; version=3")- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- if res.StatusCode >= 200 && res.StatusCode < 300 && strings.Contains(body, "account_id") {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -77,6 +63,29 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.semaphore.co/api/v4/account?apikey=%s", resMatch), nil)+ if err != nil {+ return false, err+ }+ req.Header.Add("Accept", "application/vnd.semaphore+json; version=3")+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ if res.StatusCode >= 200 && res.StatusCode < 300 && strings.Contains(body, "account_id") {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Semaphore}diff --git a/pkg/detectors/simfin/simfin.go b/pkg/detectors/simfin/simfin.goindex 687be6b81..3f2558e0c 100644--- a/pkg/detectors/simfin/simfin.go+++ b/pkg/detectors/simfin/simfin.go@@ -48,24 +48,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://simfin.com/api/v2/companies/list?api-key=%s", resMatch), nil)- if err != nil {- continue- }-- res, err := client.Do(req)- if err == nil {- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- bodyString := string(bodyBytes)- validResponse := !strings.Contains(bodyString, `"error"`)- defer func() { _ = res.Body.Close() }()- if res.StatusCode >= 200 && res.StatusCode < 300 && validResponse {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -74,6 +59,33 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://simfin.com/api/v2/companies/list?api-key=%s", resMatch), nil)+ if err != nil {+ return false, err+ }++ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() {+ _, _ = io.Copy(io.Discard, res.Body)+ _ = res.Body.Close()+ }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ bodyString := string(bodyBytes)+ validResponse := !strings.Contains(bodyString, `"error"`)+ if res.StatusCode >= 200 && res.StatusCode < 300 && validResponse {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_SimFin}diff --git a/pkg/detectors/slackwebhook/slackwebhook.go b/pkg/detectors/slackwebhook/slackwebhook.goindex 3f1925155..e4955f212 100644--- a/pkg/detectors/slackwebhook/slackwebhook.go+++ b/pkg/detectors/slackwebhook/slackwebhook.go@@ -63,44 +63,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultclient = defaultClient}- // We don't want to actually send anything to webhooks we find. To verify them without spamming them, we- // send an intentionally malformed message and look for a particular expected error message.- payload := strings.NewReader(`intentionally malformed JSON from TruffleHog scan`)- req, err := http.NewRequestWithContext(ctx, "POST", resMatch, payload)- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/json")- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }-- defer func() { _ = res.Body.Close() }()-- switch {- case res.StatusCode >= http.StatusOK && res.StatusCode < http.StatusMultipleChoices:- // Hopefully this never happens - it means we actually sent something to a channel somewhere. But- // we at least know the secret is verified.- s1.Verified = true- case res.StatusCode == http.StatusBadRequest && bytes.Equal(bodyBytes, []byte("invalid_payload")):- s1.Verified = true- case res.StatusCode == http.StatusBadRequest && bytes.Contains(bodyBytes, []byte("invalid_token")):- // Slack may return the bare error code or embed it in a longer body, hence Contains not Equal.- // Revoked webhook / gone workspace or channel is determinate verified=false.- case res.StatusCode == http.StatusNotFound || res.StatusCode == http.StatusForbidden:- // Not a real webhook or the owning app's OAuth token has been revoked or the app has been deleted- // You might want to handle this case or log it.- default:- err = fmt.Errorf("unexpected HTTP response status %d: %s", res.StatusCode, bodyBytes)- s1.SetVerificationError(err, resMatch)- }- } else {- s1.SetVerificationError(err, resMatch)- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -110,6 +75,47 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ // We don't want to actually send anything to webhooks we find. To verify them without spamming them, we+ // send an intentionally malformed message and look for a particular expected error message.+ payload := strings.NewReader(`intentionally malformed JSON from TruffleHog scan`)+ req, err := http.NewRequestWithContext(ctx, "POST", resMatch, payload)+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/json")++ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()++ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }++ switch {+ case res.StatusCode >= http.StatusOK && res.StatusCode < http.StatusMultipleChoices:+ // Hopefully this never happens - it means we actually sent something to a channel somewhere. But+ // we at least know the secret is verified.+ return true, nil+ case res.StatusCode == http.StatusBadRequest && bytes.Equal(bodyBytes, []byte("invalid_payload")):+ return true, nil+ case res.StatusCode == http.StatusBadRequest && bytes.Contains(bodyBytes, []byte("invalid_token")):+ // Slack may return the bare error code or embed it in a longer body, hence Contains not Equal.+ // Revoked webhook / gone workspace or channel is determinate verified=false.+ return false, nil+ case res.StatusCode == http.StatusNotFound || res.StatusCode == http.StatusForbidden:+ // Not a real webhook or the owning app's OAuth token has been revoked or the app has been deleted+ // You might want to handle this case or log it.+ return false, nil+ default:+ return false, fmt.Errorf("unexpected HTTP response status %d: %s", res.StatusCode, bodyBytes)+ }+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_SlackWebhook}diff --git a/pkg/detectors/tefter/tefter.go b/pkg/detectors/tefter/tefter.goindex 79ae9ec55..90153847d 100644--- a/pkg/detectors/tefter/tefter.go+++ b/pkg/detectors/tefter/tefter.go@@ -48,25 +48,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "POST", "https://www.tefter.io/api/bookmarks?url=google.com", nil)- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/json")- req.Header.Add("X-User-Token", resMatch)- res, err := client.Do(req)- if err == nil {- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- validResponse := json.Valid(bodyBytes)-- defer func() { _ = res.Body.Close() }()- if res.StatusCode >= 200 && res.StatusCode < 300 && validResponse {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -75,6 +59,34 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "POST", "https://www.tefter.io/api/bookmarks?url=google.com", nil)+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/json")+ req.Header.Add("X-User-Token", resMatch)+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() {+ _, _ = io.Copy(io.Discard, res.Body)+ _ = res.Body.Close()+ }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ validResponse := json.Valid(bodyBytes)++ if res.StatusCode >= 200 && res.StatusCode < 300 && validResponse {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Tefter}diff --git a/pkg/detectors/teletype/teletype.go b/pkg/detectors/teletype/teletype.goindex 1580f4bea..792d040c0 100644--- a/pkg/detectors/teletype/teletype.go+++ b/pkg/detectors/teletype/teletype.go@@ -47,31 +47,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", "https://api.teletype.app/public/api/v1/messages", nil)- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/json")- req.Header.Add("X-Auth-Token", resMatch)- res, err := client.Do(req)- if err == nil {- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }-- bodyString := string(bodyBytes)- validResponse := strings.Contains(bodyString, `"code":401`)-- defer func() { _ = res.Body.Close() }()- if res.StatusCode >= 200 && res.StatusCode < 300 {- if validResponse {- s1.Verified = false- } else {- s1.Verified = true- }- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -80,6 +58,38 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", "https://api.teletype.app/public/api/v1/messages", nil)+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/json")+ req.Header.Add("X-Auth-Token", resMatch)+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() {+ _, _ = io.Copy(io.Discard, res.Body)+ _ = res.Body.Close()+ }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }++ bodyString := string(bodyBytes)+ validResponse := strings.Contains(bodyString, `"code":401`)++ if res.StatusCode >= 200 && res.StatusCode < 300 {+ if !validResponse {+ return true, nil+ }+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Teletype}diff --git a/pkg/detectors/thinkific/thinkific.go b/pkg/detectors/thinkific/thinkific.goindex 50deded99..4c549c8e0 100644--- a/pkg/detectors/thinkific/thinkific.go+++ b/pkg/detectors/thinkific/thinkific.go@@ -52,27 +52,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- domainRes := fmt.Sprintf("%s-s-school", resDomainMatch)- req, err := http.NewRequestWithContext(ctx, "GET", "https://api.thinkific.com/api/public/v1/collections", nil)- if err != nil {- continue- }- req.Header.Add("X-Auth-API-Key", resMatch)- req.Header.Add("X-Auth-Subdomain", domainRes)- req.Header.Add("Content-Type", "application/json")- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)-- if strings.Contains(body, "API Access is not available") {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resDomainMatch, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resDomainMatch, resMatch)}results = append(results, s1)@@ -82,6 +64,33 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resDomainMatch string, resMatch string) (bool, error) {+ domainRes := fmt.Sprintf("%s-s-school", resDomainMatch)+ req, err := http.NewRequestWithContext(ctx, "GET", "https://api.thinkific.com/api/public/v1/collections", nil)+ if err != nil {+ return false, err+ }+ req.Header.Add("X-Auth-API-Key", resMatch)+ req.Header.Add("X-Auth-Subdomain", domainRes)+ req.Header.Add("Content-Type", "application/json")+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)++ if strings.Contains(body, "API Access is not available") {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Thinkific}diff --git a/pkg/detectors/twelvedata/twelvedata.go b/pkg/detectors/twelvedata/twelvedata.goindex a6df49260..c16add136 100644--- a/pkg/detectors/twelvedata/twelvedata.go+++ b/pkg/detectors/twelvedata/twelvedata.go@@ -47,29 +47,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", "https://api.twelvedata.com/earliest_timestamp?symbol=AAPL&interval=1day&apikey="+resMatch, nil)- if err != nil {- continue- }-- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)-- // if client_id and client_secret is valid -> 403 {"error":"invalid_grant","error_description":"Invalid authorization code"}- // if invalid -> 401 {"error":"access_denied","error_description":"Unauthorized"}- // ingenious!-- if !strings.Contains(body, "401") {- s1.Verified = true- }-- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -78,6 +58,34 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", "https://api.twelvedata.com/earliest_timestamp?symbol=AAPL&interval=1day&apikey="+resMatch, nil)+ if err != nil {+ return false, err+ }++ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)++ // if client_id and client_secret is valid -> 403 {"error":"invalid_grant","error_description":"Invalid authorization code"}+ // if invalid -> 401 {"error":"access_denied","error_description":"Unauthorized"}+ // ingenious!++ if !strings.Contains(body, "401") {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_TwelveData}diff --git a/pkg/detectors/unifyid/unifyid.go b/pkg/detectors/unifyid/unifyid.goindex 991b31d96..be01f3e1d 100644--- a/pkg/detectors/unifyid/unifyid.go+++ b/pkg/detectors/unifyid/unifyid.go@@ -47,25 +47,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- payload := strings.NewReader(`{"token": "sample"}`)- req, err := http.NewRequestWithContext(ctx, "POST", "https://api.unify.id/v1/humandetect/verify", payload)- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/json")- req.Header.Add("X-API-Key", resMatch)- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- if (res.StatusCode >= 200 && res.StatusCode < 300) || (res.StatusCode == 400 && strings.Contains(body, "invalid token")) {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -74,6 +58,31 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ payload := strings.NewReader(`{"token": "sample"}`)+ req, err := http.NewRequestWithContext(ctx, "POST", "https://api.unify.id/v1/humandetect/verify", payload)+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/json")+ req.Header.Add("X-API-Key", resMatch)+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ if (res.StatusCode >= 200 && res.StatusCode < 300) || (res.StatusCode == 400 && strings.Contains(body, "invalid token")) {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_UnifyID}diff --git a/pkg/detectors/uptimerobot/uptimerobot.go b/pkg/detectors/uptimerobot/uptimerobot.goindex 76bddc3ac..e41dcc97a 100644--- a/pkg/detectors/uptimerobot/uptimerobot.go+++ b/pkg/detectors/uptimerobot/uptimerobot.go@@ -47,27 +47,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "POST", "https://api.uptimerobot.com/v2/getMonitors?api_key="+resMatch, nil)- if err != nil {- continue- }- res, err := client.Do(req)- if err == nil {- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- bodyString := string(bodyBytes)- validResponse := strings.Contains(bodyString, `"ok"`)- defer func() { _ = res.Body.Close() }()- if res.StatusCode >= 200 && res.StatusCode < 300 {- if validResponse {- s1.Verified = true- } else {- s1.Verified = false- }- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -76,6 +58,34 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "POST", "https://api.uptimerobot.com/v2/getMonitors?api_key="+resMatch, nil)+ if err != nil {+ return false, err+ }+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() {+ _, _ = io.Copy(io.Discard, res.Body)+ _ = res.Body.Close()+ }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ bodyString := string(bodyBytes)+ validResponse := strings.Contains(bodyString, `"ok"`)+ if res.StatusCode >= 200 && res.StatusCode < 300 {+ if validResponse {+ return true, nil+ }+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_UptimeRobot}diff --git a/pkg/detectors/walkscore/walkscore.go b/pkg/detectors/walkscore/walkscore.goindex 4608c6fda..c622108f3 100644--- a/pkg/detectors/walkscore/walkscore.go+++ b/pkg/detectors/walkscore/walkscore.go@@ -48,23 +48,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://transit.walkscore.com/transit/search/stops/?lat=47.6101359&lon=-122.3420567&wsapikey=%s", resMatch), nil)- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/json")- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- if (res.StatusCode >= 200 && res.StatusCode < 300) && strings.Contains(body, `distance`) {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -73,6 +59,29 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://transit.walkscore.com/transit/search/stops/?lat=47.6101359&lon=-122.3420567&wsapikey=%s", resMatch), nil)+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/json")+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ if (res.StatusCode >= 200 && res.StatusCode < 300) && strings.Contains(body, `distance`) {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_WalkScore}diff --git a/pkg/detectors/weatherstack/weatherstack.go b/pkg/detectors/weatherstack/weatherstack.goindex a33098f6d..e0778f522 100644--- a/pkg/detectors/weatherstack/weatherstack.go+++ b/pkg/detectors/weatherstack/weatherstack.go@@ -48,24 +48,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.weatherstack.com/current?access_key=%s&query=LA", resMatch), nil)- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/json")- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- validResponse := strings.Contains(body, `location`) || strings.Contains(body, `"info":"Access Restricted - Your current Subscription Plan does not support HTTPS Encryption."`)- if (res.StatusCode >= 200 && res.StatusCode < 300) && validResponse {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -74,6 +59,30 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.weatherstack.com/current?access_key=%s&query=LA", resMatch), nil)+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/json")+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ validResponse := strings.Contains(body, `location`) || strings.Contains(body, `"info":"Access Restricted - Your current Subscription Plan does not support HTTPS Encryption."`)+ if (res.StatusCode >= 200 && res.StatusCode < 300) && validResponse {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_WeatherStack}diff --git a/pkg/detectors/webscraping/webscraping.go b/pkg/detectors/webscraping/webscraping.goindex f34dbe58c..d39d19169 100644--- a/pkg/detectors/webscraping/webscraping.go+++ b/pkg/detectors/webscraping/webscraping.go@@ -47,23 +47,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", `https://api.webscrapingapi.com/v1?api_key=`+resMatch, nil)- if err != nil {- continue- }- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)-- if strings.Contains(body, "key `url` required.") {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -72,6 +58,29 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", `https://api.webscrapingapi.com/v1?api_key=`+resMatch, nil)+ if err != nil {+ return false, err+ }+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)++ if strings.Contains(body, "key `url` required.") {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Webscraping}diff --git a/pkg/detectors/websitepulse/websitepulse.go b/pkg/detectors/websitepulse/websitepulse.goindex 5e23b2675..2c890d27f 100644--- a/pkg/detectors/websitepulse/websitepulse.go+++ b/pkg/detectors/websitepulse/websitepulse.go@@ -53,23 +53,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultSecretParts: map[string]string{"key": resMatch},}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.websitepulse.com/textserver.php?method=GetContacts&username=%s&key=%s", resIdMatch, resMatch), nil)- if err != nil {- continue- }- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)-- if strings.Contains(body, "Active") {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resIdMatch, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resIdMatch, resMatch)}results = append(results, s1)@@ -80,6 +66,29 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resIdMatch string, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.websitepulse.com/textserver.php?method=GetContacts&username=%s&key=%s", resIdMatch, resMatch), nil)+ if err != nil {+ return false, err+ }+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)++ if strings.Contains(body, "Active") {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Websitepulse}diff --git a/pkg/detectors/whoxy/whoxy.go b/pkg/detectors/whoxy/whoxy.goindex 4e7af4e9a..9ce58d9fc 100644--- a/pkg/detectors/whoxy/whoxy.go+++ b/pkg/detectors/whoxy/whoxy.go@@ -48,23 +48,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result}if verify {- req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.whoxy.com/?key=%s&account=balance", resMatch), nil)- if err != nil {- continue- }- req.Header.Add("Content-Type", "application/json")- res, err := client.Do(req)- if err == nil {- defer func() { _ = res.Body.Close() }()- bodyBytes, err := io.ReadAll(res.Body)- if err != nil {- continue- }- body := string(bodyBytes)- if res.StatusCode >= 200 && res.StatusCode < 300 && strings.Contains(body, `"status": 1`) {- s1.Verified = true- }- }+ isVerified, verificationErr := verifyMatch(ctx, client, resMatch)+ s1.Verified = isVerified+ s1.SetVerificationError(verificationErr, resMatch)}results = append(results, s1)@@ -73,6 +59,29 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultreturn results, nil}+func verifyMatch(ctx context.Context, client *http.Client, resMatch string) (bool, error) {+ req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://api.whoxy.com/?key=%s&account=balance", resMatch), nil)+ if err != nil {+ return false, err+ }+ req.Header.Add("Content-Type", "application/json")+ res, err := client.Do(req)+ if err != nil {+ return false, err+ }+ defer func() { _ = res.Body.Close() }()+ bodyBytes, err := io.ReadAll(res.Body)+ if err != nil {+ return false, err+ }+ body := string(bodyBytes)+ if res.StatusCode >= 200 && res.StatusCode < 300 && strings.Contains(body, `"status": 1`) {+ return true, nil+ }++ return false, nil+}+func (s Scanner) Type() detector_typepb.DetectorType {return detector_typepb.DetectorType_Whoxy}