updated and fixed typeform detectors

pkg/detectors/typeform/v1/typeform.go

@@ -3,6 +3,7 @@ package typeform
 import (
 	"context"
 	"fmt"
+	"io"
 	"net/http"
 	"strings"
 
@@ -51,18 +52,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
 		}
 
 		if verify {
-			req, err := http.NewRequestWithContext(ctx, "GET", "https://api.typeform.com/me", nil)
-			if err != nil {
-				continue
-			}
-			req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", resMatch))
-			res, err := client.Do(req)
-			if err == nil {
-				defer res.Body.Close()
-				if res.StatusCode >= 200 && res.StatusCode < 300 {
-					s1.Verified = true
-				}
-			}
+			isVerified, verificationErr := verifyTypeForm(ctx, client, resMatch)
+			s1.Verified = isVerified
+			s1.SetVerificationError(verificationErr)
 		}
 
 		results = append(results, s1)
@@ -78,3 +70,31 @@ func (s Scanner) Type() detectorspb.DetectorType {
 func (s Scanner) Description() string {
 	return "Typeform is a service for creating forms and surveys. Typeform API keys can be used to access and manage forms and responses."
 }
+
+func verifyTypeForm(ctx context.Context, client *http.Client, key string) (bool, error) {
+	req, err := http.NewRequestWithContext(ctx, "GET", "https://api.typeform.com/me", nil)
+	if err != nil {
+		return false, err
+	}
+
+	req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", key))
+
+	resp, err := client.Do(req)
+	if err != nil {
+		return false, err
+	}
+
+	defer func() {
+		_, _ = io.Copy(io.Discard, resp.Body)
+		_ = resp.Body.Close()
+	}()
+
+	switch resp.StatusCode {
+	case http.StatusOK:
+		return true, nil
+	case http.StatusUnauthorized, http.StatusForbidden:
+		return false, nil
+	default:
+		return false, fmt.Errorf("unexpected status code: %d", resp.StatusCode)
+	}
+}

pkg/detectors/typeform/v2/typeform.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"io"
 	"net/http"
 
 	regexp "github.com/wasilibs/go-re2"
@@ -13,7 +14,9 @@ import (
 	"github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"
 )
 
-type Scanner struct{}
+type Scanner struct {
+	client *http.Client
+}
 
 // Ensure the Scanner satisfies the interface at compile time.
 var _ detectors.Detector = (*Scanner)(nil)
@@ -24,6 +27,14 @@ var (
 	keyPat = regexp.MustCompile(`\btfp_[a-zA-Z0-9_]{40,59}\b`)
 )
 
+func (s Scanner) getClient() *http.Client {
+	if s.client != nil {
+		return s.client
+	}
+
+	return client
+}
+
 func (s Scanner) Version() int { return 2 }
 
 // Keywords are used for efficiently pre-filtering chunks.
@@ -52,11 +63,11 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
 		}
 
 		if verify {
-			verified, typeformResponse, requestErr := verifyMatch(ctx, client, match)
+			verified, typeformResponse, requestErr := verifyMatch(ctx, s.getClient(), match)
 			s1.Verified = verified
-			if requestErr != nil {
-				s1.SetVerificationError(err, match)
-			} else {
+			s1.SetVerificationError(requestErr)
+
+			if typeformResponse != nil {
 				s1.ExtraData = map[string]string{
 					"UserId":   typeformResponse.UserID,
 					"Email":    typeformResponse.Email,
@@ -72,26 +83,33 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
 	return results, nil
 }
 
-func verifyMatch(ctx context.Context, client *http.Client, secret string) (bool, TypeFormResponse, error) {
-	var response TypeFormResponse
-
+func verifyMatch(ctx context.Context, client *http.Client, secret string) (bool, *TypeFormResponse, error) {
 	req, err := http.NewRequestWithContext(ctx, "GET", "https://api.typeform.com/me", nil)
 	if err != nil {
-		return false, response, nil
+		return false, nil, nil
 	}
 	req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", secret))
 	res, err := client.Do(req)
 	if err != nil {
-		return false, response, err
-	}
-	defer res.Body.Close()
-	if err = json.NewDecoder(res.Body).Decode(&response); err != nil {
-		return false, response, err
+		return false, nil, err
 	}
+
+	defer func() {
+		_, _ = io.Copy(io.Discard, res.Body)
+		_ = res.Body.Close()
+	}()
+
 	if res.StatusCode == 200 {
+		var response *TypeFormResponse
+		if err = json.NewDecoder(res.Body).Decode(&response); err != nil {
+			return false, nil, err
+		}
+
 		return true, response, nil
+	} else if res.StatusCode == 401 || res.StatusCode == 403 {
+		return false, nil, nil
 	} else {
-		return false, response, fmt.Errorf("unexpected status code %d", res.StatusCode)
+		return false, nil, fmt.Errorf("unexpected status code %d", res.StatusCode)
 	}
 }
 

pkg/detectors/typeform/v2/typeform_integration_test.go

@@ -52,6 +52,12 @@ func TestTypeform_FromChunk(t *testing.T) {
 				{
 					DetectorType: detectorspb.DetectorType_Typeform,
 					Verified:     true,
+					ExtraData: map[string]string{
+						"Alias":    "TruffleSecurity Detectors",
+						"Email":    "[email protected]",
+						"Language": "en",
+						"UserId":   "01JEX5WZZGGEC89F5E4DKW4144",
+					},
 				},
 			},
 			wantErr:             false,
@@ -86,40 +92,6 @@ func TestTypeform_FromChunk(t *testing.T) {
 			wantErr:             false,
 			wantVerificationErr: false,
 		},
-		{
-			name: "found, would be verified if not for timeout",
-			s:    Scanner{client: common.SaneHttpClientTimeOut(1 * time.Microsecond)},
-			args: args{
-				ctx:    context.Background(),
-				data:   []byte(fmt.Sprintf("You can find a typeform secret %s within", secret)),
-				verify: true,
-			},
-			want: []detectors.Result{
-				{
-					DetectorType: detectorspb.DetectorType_Typeform,
-					Verified:     false,
-				},
-			},
-			wantErr:             false,
-			wantVerificationErr: true,
-		},
-		{
-			name: "found, verified but unexpected api surface",
-			s:    Scanner{client: common.ConstantResponseHttpClient(404, "")},
-			args: args{
-				ctx:    context.Background(),
-				data:   []byte(fmt.Sprintf("You can find a typeform secret %s within", secret)),
-				verify: true,
-			},
-			want: []detectors.Result{
-				{
-					DetectorType: detectorspb.DetectorType_Typeform,
-					Verified:     false,
-				},
-			},
-			wantErr:             false,
-			wantVerificationErr: true,
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {