Files
trufflehog/pkg/detectors/cloudflareapitoken/v2/cloudflareapitoken_integration_test.go
Kashif KhanandNicholas Comer e1f9e5d1d5 Update Cloudflare detectors for 2026+ prefixed credential formats (include upstream PR changes) (#5111)
* Update Cloudflare detectors for 2026+ prefixed credential formats

 ## Context/Background

Cloudflare is rolling out new prefixed credential formats in 2026.
The new formats (`cfk_`, `cfut_`, `cfat_`) are self-identifying via
prefix and do not need keyword proximity matching. Per project
convention, new token formats are added via the `Versioner` interface
with a `v1`/`v2` directory split.

Additionally, CA keys (Service Keys) are now deprecated.

 ## Changes in this commit

- cloudflareglobalapikey: split into `v1`/`v2` with `Versioner`
  interface. v1 fixes legacy regex to `[a-f0-9]{37,45}` (lowercase
  hex). v2 adds `cfk_` prefixed format detection.
- cloudflareapitoken: split into `v1`/`v2` with `Versioner`
  interface. v2 adds `cfut_`/`cfat_` prefixed format detection.
  `cfat_` (account tokens) route verification through the
  account-scoped `/accounts/:id/tokens/verify` endpoint, extracting
  account IDs from surrounding data.
- cloudflarecakey: add deprecation notice with changelog link.
- defaults.go: updated imports and registrations for versioned
  scanners.

* Address PR feedback on Cloudflare detectors

 ## Context/Background

Addressing reviewer feedback from @MuneebUllahKhan222 and Cursor
Bugbot on PR #4830.

 ## Changes in this commit

- Verification functions now return `(bool, error)` with proper
  indeterminate/determinate handling. Callsites use
  `SetVerificationError`. Status checks use exact `http.StatusOK`
  instead of range. Response bodies properly drained via
  `io.Copy(io.Discard, ...)`.
- Extracted shared verification functions into `common.go` at each
  detector package root (following the AWS detector pattern). v1 and
  v2 both import from the parent package instead of v2 importing v1.
- Added integration tests for both v2 detectors with coverage for
  `cfk_`, `cfut_`, and `cfat_` (including account-scoped
  verification).
- `cfat_` tokens now pair with account IDs in `RawV2` regardless of
  the `verify` flag, consistent with how `cfk_` pairs with emails.

* Resolved Comments

---------

Co-authored-by: Nicholas Comer <[email protected]>
2026-07-15 11:14:06 +05:00

158 lines
3.9 KiB
Go

//go:build detectors
// +build detectors
package cloudflareapitoken
import (
"context"
"fmt"
"testing"
"time"
"github.com/kylelemons/godebug/pretty"
"github.com/trufflesecurity/trufflehog/v3/pkg/detectors"
"github.com/trufflesecurity/trufflehog/v3/pkg/common"
"github.com/trufflesecurity/trufflehog/v3/pkg/pb/detector_typepb"
)
func TestCloudflareApiTokenV2_FromChunk(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
defer cancel()
testSecrets, err := common.GetSecret(ctx, "trufflehog-testing", "detectors6")
if err != nil {
t.Fatalf("could not get test secrets from GCP: %s", err)
}
userToken := testSecrets.MustGetField("CLOUDFLARE_USER_API_TOKEN_V2")
userTokenInactive := testSecrets.MustGetField("CLOUDFLARE_USER_API_TOKEN_V2_INACTIVE")
accountToken := testSecrets.MustGetField("CLOUDFLARE_ACCOUNT_API_TOKEN_V2")
accountID := testSecrets.MustGetField("CLOUDFLARE_ACCOUNT_API_TOKEN_V2_ACCOUNT_ID")
accountTokenInactive := testSecrets.MustGetField("CLOUDFLARE_ACCOUNT_API_TOKEN_V2_INACTIVE")
type args struct {
ctx context.Context
data []byte
verify bool
}
tests := []struct {
name string
s Scanner
args args
want []detectors.Result
wantErr bool
}{
{
name: "cfut_ found, verified",
s: Scanner{},
args: args{
ctx: context.Background(),
data: []byte(fmt.Sprintf("cloudflare token %s", userToken)),
verify: true,
},
want: []detectors.Result{
{
DetectorType: detector_typepb.DetectorType_CloudflareApiToken,
Verified: true,
},
},
wantErr: false,
},
{
name: "cfut_ found, unverified",
s: Scanner{},
args: args{
ctx: context.Background(),
data: []byte(fmt.Sprintf("cloudflare token %s", userTokenInactive)),
verify: true,
},
want: []detectors.Result{
{
DetectorType: detector_typepb.DetectorType_CloudflareApiToken,
Verified: false,
},
},
wantErr: false,
},
{
name: "cfat_ found, verified",
s: Scanner{},
args: args{
ctx: context.Background(),
data: []byte(fmt.Sprintf("cloudflare token %s account %s", accountToken, accountID)),
verify: true,
},
want: []detectors.Result{
{
DetectorType: detector_typepb.DetectorType_CloudflareApiToken,
Verified: true,
},
},
wantErr: false,
},
{
name: "cfat_ found, unverified",
s: Scanner{},
args: args{
ctx: context.Background(),
data: []byte(fmt.Sprintf("cloudflare token %s account %s", accountTokenInactive, accountID)),
verify: true,
},
want: []detectors.Result{
{
DetectorType: detector_typepb.DetectorType_CloudflareApiToken,
Verified: false,
},
},
wantErr: 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,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
s := Scanner{}
got, err := s.FromData(tt.args.ctx, tt.args.verify, tt.args.data)
if (err != nil) != tt.wantErr {
t.Errorf("CloudflareApiTokenV2.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])
}
got[i].Raw = nil
got[i].RawV2 = nil
}
if diff := pretty.Compare(got, tt.want); diff != "" {
t.Errorf("CloudflareApiTokenV2.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)
}
}
})
}
}