fix(detectors): report Todoist verifier errors

Author: mangod12

pkg/detectors/todoist/todoist.go

@@ -3,6 +3,7 @@ package todoist
 import (
 	"context"
 	"fmt"
+	"io"
 	"net/http"
 	"strings"
 
@@ -47,18 +48,9 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
 		}
 
 		if verify {
-			req, err := http.NewRequestWithContext(ctx, "GET", "https://api.todoist.com/api/v1/projects", nil)
-			if err != nil {
-				continue
-			}
-			req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", resMatch))
-			res, err := client.Do(req)
-			if err == nil {
-				defer func() { _ = res.Body.Close() }()
-				if res.StatusCode >= 200 && res.StatusCode < 300 {
-					s1.Verified = true
-				}
-			}
+			isVerified, verificationErr := verifyMatch(ctx, resMatch)
+			s1.Verified = isVerified
+			s1.SetVerificationError(verificationErr, resMatch)
 		}
 
 		results = append(results, s1)
@@ -67,6 +59,35 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (result
 	return results, nil
 }
 
+func verifyMatch(ctx context.Context, token string) (bool, error) {
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, "https://api.todoist.com/api/v1/projects", nil)
+	if err != nil {
+		return false, err
+	}
+	req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
+
+	res, err := client.Do(req)
+	if err != nil {
+		return false, err
+	}
+	defer func() {
+		_, _ = io.Copy(io.Discard, res.Body)
+		_ = res.Body.Close()
+	}()
+
+	switch res.StatusCode {
+	case http.StatusOK:
+		return true, nil
+	case http.StatusUnauthorized, http.StatusForbidden:
+		return false, nil
+	default:
+		if res.StatusCode >= 200 && res.StatusCode < 300 {
+			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_Todoist
 }

pkg/detectors/todoist/todoist_test.go

@@ -2,6 +2,7 @@ package todoist
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -141,3 +142,85 @@ func TestTodoist_VerificationEndpoint(t *testing.T) {
 		t.Fatal("expected result to be verified")
 	}
 }
+
+func TestTodoist_VerificationResponses(t *testing.T) {
+	d := Scanner{}
+	input := fmt.Sprintf("%s token = '%s'", keyword, validPattern)
+
+	tests := []struct {
+		name                string
+		response            *http.Response
+		responseErr         error
+		wantVerified        bool
+		wantVerificationErr bool
+	}{
+		{
+			name: "valid token",
+			response: &http.Response{
+				StatusCode: http.StatusOK,
+				Body:       io.NopCloser(strings.NewReader("{}")),
+				Header:     make(http.Header),
+			},
+			wantVerified: true,
+		},
+		{
+			name: "unauthorized token",
+			response: &http.Response{
+				StatusCode: http.StatusUnauthorized,
+				Body:       io.NopCloser(strings.NewReader("{}")),
+				Header:     make(http.Header),
+			},
+		},
+		{
+			name: "forbidden token",
+			response: &http.Response{
+				StatusCode: http.StatusForbidden,
+				Body:       io.NopCloser(strings.NewReader("{}")),
+				Header:     make(http.Header),
+			},
+		},
+		{
+			name:                "client error",
+			responseErr:         errors.New("network failure"),
+			wantVerificationErr: true,
+		},
+		{
+			name: "unexpected status",
+			response: &http.Response{
+				StatusCode: http.StatusInternalServerError,
+				Body:       io.NopCloser(strings.NewReader("{}")),
+				Header:     make(http.Header),
+			},
+			wantVerificationErr: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			prevClient := client
+			t.Cleanup(func() {
+				client = prevClient
+			})
+
+			client = &http.Client{
+				Transport: roundTripFunc(func(req *http.Request) (*http.Response, error) {
+					return tt.response, tt.responseErr
+				}),
+			}
+
+			results, err := d.FromData(context.Background(), true, []byte(input))
+			if err != nil {
+				t.Fatalf("FromData returned error: %v", err)
+			}
+			if len(results) != 1 {
+				t.Fatalf("expected 1 result, got %d", len(results))
+			}
+			if results[0].Verified != tt.wantVerified {
+				t.Fatalf("Verified = %v, want %v", results[0].Verified, tt.wantVerified)
+			}
+			if (results[0].VerificationError() != nil) != tt.wantVerificationErr {
+				t.Fatalf("wantVerificationError = %v, verification error = %v", tt.wantVerificationErr, results[0].VerificationError())
+			}
+		})
+	}
+}