feat(detectors): added make.com api_token and mcp_token detectors

pkg/detectors/make/api_token/api_token.go

@@ -0,0 +1,188 @@
+package api_token
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"net/http"
+
+	regexp "github.com/wasilibs/go-re2"
+
+	"github.com/trufflesecurity/trufflehog/v3/pkg/common"
+	"github.com/trufflesecurity/trufflehog/v3/pkg/detectors"
+	"github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"
+)
+
+type Scanner struct {
+	client *http.Client
+}
+
+// Ensure the Scanner satisfies the interface at compile time.
+var _ detectors.Detector = (*Scanner)(nil)
+
+var (
+	defaultClient = common.SaneHttpClient()
+	// Make sure that your group is surrounded in boundary characters such as below to reduce false positives.
+	keyPat = regexp.MustCompile(detectors.PrefixRegex([]string{"make"}) + `\b([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})\b`)
+	// Pattern to match Make.com URLs in the data
+	urlPat = regexp.MustCompile(`\bhttps://(eu[12]|us[12])\.make\.(?:com|celonis\.com)/api/v2/`)
+)
+
+// Keywords are used for efficiently pre-filtering chunks.
+// Use identifiers in the secret preferably, or the provider name.
+func (s Scanner) Keywords() []string {
+	return []string{"make"}
+}
+
+// FromData will find and optionally verify Make secrets in a given set of bytes.
+func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (results []detectors.Result, err error) {
+	dataStr := string(data)
+
+	uniqueMatches := make(map[string]struct{})
+	for _, match := range keyPat.FindAllStringSubmatch(dataStr, -1) {
+		uniqueMatches[match[1]] = struct{}{}
+	}
+
+	// Extract Make URLs from the data
+	var foundURLs []string
+	for _, match := range urlPat.FindAllStringSubmatch(dataStr, -1) {
+		foundURLs = append(foundURLs, match[0])
+	}
+
+	// If URLs were found, create combinations of tokens and URLs
+	if len(foundURLs) > 0 {
+		for match := range uniqueMatches {
+			for _, foundURL := range foundURLs {
+				s1 := detectors.Result{
+					DetectorType: detectorspb.DetectorType_MakeApiToken,
+					Raw:          []byte(match),
+					RawV2:        []byte(match + ":" + foundURL),
+				}
+
+				if verify {
+					client := s.client
+					if client == nil {
+						client = defaultClient
+					}
+
+					isVerified, extraData, verificationErr := verifyMatch(ctx, client, match, foundURLs)
+					s1.Verified = isVerified
+					s1.ExtraData = extraData
+					s1.SetVerificationError(verificationErr, match)
+				}
+
+				results = append(results, s1)
+			}
+		}
+	} else {
+		// No URLs found, just return tokens
+		for match := range uniqueMatches {
+			s1 := detectors.Result{
+				DetectorType: detectorspb.DetectorType_MakeApiToken,
+				Raw:          []byte(match),
+			}
+
+			if verify {
+				client := s.client
+				if client == nil {
+					client = defaultClient
+				}
+
+				isVerified, extraData, verificationErr := verifyMatch(ctx, client, match, foundURLs)
+				s1.Verified = isVerified
+				s1.ExtraData = extraData
+				s1.SetVerificationError(verificationErr, match)
+			}
+
+			results = append(results, s1)
+		}
+	}
+
+	return
+}
+
+func verifyMatch(ctx context.Context, client *http.Client, token string, foundURLs []string) (bool, map[string]string, error) {
+	baseURLs := []string{
+		"https://eu1.make.com/api/v2/",
+		"https://eu2.make.com/api/v2/",
+		"https://us1.make.com/api/v2/",
+		"https://us2.make.com/api/v2/",
+		"https://us1.make.celonis.com/api/v2/",
+		"https://eu1.make.celonis.com/api/v2/",
+	}
+
+
+	// If we found URLs in the data, try those first
+	if len(foundURLs) > 0 {
+		for _, foundURL := range foundURLs {
+			verified, err := tryURL(ctx, client, foundURL, token)
+			if verified {
+				return true, nil, nil
+			}
+			if err != nil {
+				// If the matched URL failed, continue to try all base URLs
+				break
+			}
+			// If the matched URL returned a determinate failure (401), we still try other base URLs
+		}
+	}
+
+	// Try all base URLs
+	var lastErr error
+	for _, baseURL := range baseURLs {
+		verified, err := tryURL(ctx, client, baseURL, token)
+		if verified {
+			return true, nil, nil
+		}
+		if err != nil {
+			lastErr = err
+			continue
+		}
+		// Continue to next URL on determinate failures (401)
+	}
+
+	// If we got here, either all endpoints failed or we had errors
+	if lastErr != nil {
+		return false, nil, lastErr
+	}
+	return false, nil, nil
+}
+
+func tryURL(ctx context.Context, client *http.Client, baseURL, token string) (bool, error) {
+	// This endpoint returns 200 OK if the token is valid and the correct FQDN for the API is used.
+	// https://developers.make.com/api-documentation/api-reference/users-greater-than-me#get-users-me-current-authorization
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, baseURL+"users/me/current-authorization", nil)
+	if err != nil {
+		return false, err
+	}
+	req.Header.Set("Authorization", "Token "+token)
+
+	res, err := client.Do(req)
+	if err != nil {
+		return false, err
+	}
+
+	func() {
+		_, _ = io.Copy(io.Discard, res.Body)
+		_ = res.Body.Close()
+	}()
+
+	switch res.StatusCode {
+	case http.StatusOK:
+		return true, nil
+	case http.StatusUnauthorized:
+		// Determinate failure - invalid token
+		return false, nil
+	default:
+		// Indeterminate failure - unexpected response
+		return false, fmt.Errorf("unexpected status code: %d", res.StatusCode)
+	}
+}
+
+func (s Scanner) Type() detectorspb.DetectorType {
+	return detectorspb.DetectorType_MakeApiToken
+}
+
+func (s Scanner) Description() string {
+	return "Make.com is a low-code/no-code automation platform that allows users to connect apps and services typically to automate business workflows. This detector identifies API tokens used for Make.com integrations."
+}

pkg/detectors/make/api_token/api_token_integration_test.go

@@ -0,0 +1,161 @@
+//go:build detectors
+// +build detectors
+
+package api_token
+
+import (
+	"context"
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
+
+	"github.com/trufflesecurity/trufflehog/v3/pkg/common"
+	"github.com/trufflesecurity/trufflehog/v3/pkg/detectors"
+	"github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"
+)
+
+func TestMake_FromChunk(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+	defer cancel()
+	testSecrets, err := common.GetSecret(ctx, "trufflehog-testing", "detectors5")
+	if err != nil {
+		t.Fatalf("could not get test secrets from GCP: %s", err)
+	}
+	secret := testSecrets.MustGetField("MAKE_API_TOKEN")
+	inactiveSecret := testSecrets.MustGetField("MAKE_API_TOKEN_INACTIVE")
+
+	type args struct {
+		ctx    context.Context
+		data   []byte
+		verify bool
+	}
+	tests := []struct {
+		name                string
+		s                   Scanner
+		args                args
+		want                []detectors.Result
+		wantErr             bool
+		wantVerificationErr bool
+	}{
+		{
+			name: "found, verified",
+			s:    Scanner{},
+			args: args{
+				ctx:    context.Background(),
+				data:   []byte(fmt.Sprintf("You can find a make secret %s within", secret)),
+				verify: true,
+			},
+			want: []detectors.Result{
+				{
+					DetectorType: detectorspb.DetectorType_MakeApiToken,
+					Verified:     true,
+				},
+			},
+			wantErr:             false,
+			wantVerificationErr: false,
+		},
+		{
+			name: "found, unverified",
+			s:    Scanner{},
+			args: args{
+				ctx:    context.Background(),
+				data:   []byte(fmt.Sprintf("You can find a make secret %s within but not valid", inactiveSecret)), // the secret would satisfy the regex but not pass validation
+				verify: true,
+			},
+			want: []detectors.Result{
+				{
+					DetectorType: detectorspb.DetectorType_MakeApiToken,
+					Verified:     false,
+				},
+			},
+			wantErr:             false,
+			wantVerificationErr: false,
+		},
+		{
+			name: "not found",
+			s:    Scanner{},
+			args: args{
+				ctx:    context.Background(),
+				data:   []byte("You cannot find the secret within"),
+				verify: true,
+			},
+			want:                nil,
+			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 make secret %s within", secret)),
+				verify: true,
+			},
+			want: []detectors.Result{
+				{
+					DetectorType: detectorspb.DetectorType_MakeApiToken,
+					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 make secret %s within", secret)),
+				verify: true,
+			},
+			want: []detectors.Result{
+				{
+					DetectorType: detectorspb.DetectorType_MakeApiToken,
+					Verified:     false,
+				},
+			},
+			wantErr:             false,
+			wantVerificationErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := tt.s.FromData(tt.args.ctx, tt.args.verify, tt.args.data)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("Make.FromData() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			for i := range got {
+				if len(got[i].Raw) == 0 {
+					t.Fatalf("no raw secret present: \n %+v", got[i])
+				}
+				if (got[i].VerificationError() != nil) != tt.wantVerificationErr {
+					t.Fatalf("wantVerificationError = %v, verification error = %v", tt.wantVerificationErr, got[i].VerificationError())
+				}
+			}
+			ignoreOpts := cmpopts.IgnoreFields(detectors.Result{}, "Raw", "verificationError", "primarySecret")
+			if diff := cmp.Diff(got, tt.want, ignoreOpts); diff != "" {
+				t.Errorf("Make.FromData() %s diff: (-got +want)\n%s", tt.name, diff)
+			}
+		})
+	}
+}
+
+func BenchmarkFromData(benchmark *testing.B) {
+	ctx := context.Background()
+	s := Scanner{}
+	for name, data := range detectors.MustGetBenchmarkData() {
+		benchmark.Run(name, func(b *testing.B) {
+			b.ResetTimer()
+			for n := 0; n < b.N; n++ {
+				_, err := s.FromData(ctx, false, data)
+				if err != nil {
+					b.Fatal(err)
+				}
+			}
+		})
+	}
+}