Skip to content

Commit

Permalink
Add detector for SaladCloud API Keys
Browse files Browse the repository at this point in the history
  • Loading branch information
seniorquico committed Oct 11, 2024
1 parent 8b2b986 commit d2938fb
Show file tree
Hide file tree
Showing 5 changed files with 337 additions and 6 deletions.
98 changes: 98 additions & 0 deletions pkg/detectors/saladcloudapikey/saladcloudapikey.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
package saladcloudapikey

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)

Check failure on line 21 in pkg/detectors/saladcloudapikey/saladcloudapikey.go

View workflow job for this annotation

GitHub Actions / golangci-lint

cannot use (*Scanner)(nil) (value of type *Scanner) as detectors.Detector value in variable declaration: *Scanner does not implement detectors.Detector (missing method Description) (typecheck)

Check failure on line 21 in pkg/detectors/saladcloudapikey/saladcloudapikey.go

View workflow job for this annotation

GitHub Actions / golangci-lint

cannot use (*Scanner)(nil) (value of type *Scanner) as detectors.Detector value in variable declaration: *Scanner does not implement detectors.Detector (missing method Description)) (typecheck)

Check failure on line 21 in pkg/detectors/saladcloudapikey/saladcloudapikey.go

View workflow job for this annotation

GitHub Actions / zombies

cannot use (*Scanner)(nil) (value of type *Scanner) as detectors.Detector value in variable declaration: *Scanner does not implement detectors.Detector (missing method Description)

Check failure on line 21 in pkg/detectors/saladcloudapikey/saladcloudapikey.go

View workflow job for this annotation

GitHub Actions / test-community

cannot use (*Scanner)(nil) (value of type *Scanner) as detectors.Detector value in variable declaration: *Scanner does not implement detectors.Detector (missing method Description)

Check failure on line 21 in pkg/detectors/saladcloudapikey/saladcloudapikey.go

View workflow job for this annotation

GitHub Actions / Analyze (go)

cannot use (*Scanner)(nil) (value of type *Scanner) as detectors.Detector value in variable declaration: *Scanner does not implement detectors.Detector (missing method Description)

Check failure on line 21 in pkg/detectors/saladcloudapikey/saladcloudapikey.go

View workflow job for this annotation

GitHub Actions / smoke

cannot use (*Scanner)(nil) (value of type *Scanner) as detectors.Detector value in variable declaration: *Scanner does not implement detectors.Detector (missing method Description)

var (
defaultClient = common.SaneHttpClient()
apiKey = regexp.MustCompile(`\b(salad_cloud_[0-9A-Za-z]{1,7}_[0-9A-Za-z]{7,235})\b`)
)

// 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{"salad_cloud_"}
}

// FromData will find and optionally verify SaladCloud API Key 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 apiKey.FindAllStringSubmatch(dataStr, -1) {
uniqueMatches[match[1]] = struct{}{}
}

for match := range uniqueMatches {
s1 := detectors.Result{
DetectorType: detectorspb.DetectorType_SaladCloudApiKey,
Raw: []byte(match),
ExtraData: map[string]string{
"rotation_guide": "https://howtorotate.com/docs/tutorials/saladcloudapikey/",
},
}

if verify {
client := s.client
if client == nil {
client = defaultClient
}

isVerified, extraData, verificationErr := verifyMatch(ctx, client, match)
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) (bool, map[string]string, error) {
req, err := http.NewRequestWithContext(ctx, http.MethodGet, "https://api.salad.com/api/public", nil)
if err != nil {
return false, nil, nil
}

req.Header.Set("Salad-Api-Key", token)
res, err := client.Do(req)
if err != nil {
return false, nil, err
}
defer func() {
_, _ = io.Copy(io.Discard, res.Body)
_ = res.Body.Close()
}()

switch res.StatusCode {
case http.StatusNoContent:
return true, nil, nil
case http.StatusUnauthorized:
return false, nil, nil
default:
return false, nil, fmt.Errorf("unexpected HTTP response status %d", res.StatusCode)
}
}

func (s Scanner) Type() detectorspb.DetectorType {
return detectorspb.DetectorType_SaladCloudApiKey
}
225 changes: 225 additions & 0 deletions pkg/detectors/saladcloudapikey/saladcloudapikey_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,225 @@
//go:build detectors
// +build detectors

package saladcloudapikey

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/engine/ahocorasick"
"github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"
)

func TestSaladCloudApiKey_Pattern(t *testing.T) {
d := Scanner{}
ahoCorasickCore := ahocorasick.NewAhoCorasickCore([]detectors.Detector{d})
tests := []struct {
name string
input string
want []string
}{
{
name: "organization API key",
input: "api_key = 'salad_cloud_org_zYLYVpmHJ3oksnZ0l9RHJCf1ib2QvJOJztWukwYjtjB1kDIGP'",
want: []string{"salad_cloud_org_zYLYVpmHJ3oksnZ0l9RHJCf1ib2QvJOJztWukwYjtjB1kDIGP"},
},
{
name: "user API key",
input: "api_key = 'salad_cloud_user_HZdqHUSBFLJI7LZjo1UcDORHIdi8wet37OMP01YTep82tdimF'",
want: []string{"salad_cloud_user_HZdqHUSBFLJI7LZjo1UcDORHIdi8wet37OMP01YTep82tdimF"},
},
}

for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
matchedDetectors := ahoCorasickCore.FindDetectorMatches([]byte(test.input))
if len(matchedDetectors) == 0 {
t.Errorf("keywords '%v' not matched by: %s", d.Keywords(), test.input)
return
}

results, err := d.FromData(context.Background(), false, []byte(test.input))
if err != nil {
t.Errorf("error = %v", err)
return
}

if len(results) != len(test.want) {
if len(results) == 0 {
t.Errorf("did not receive result")
} else {
t.Errorf("expected %d results, only received %d", len(test.want), len(results))
}
return
}

actual := make(map[string]struct{}, len(results))
for _, r := range results {
if len(r.RawV2) > 0 {
actual[string(r.RawV2)] = struct{}{}
} else {
actual[string(r.Raw)] = struct{}{}
}
}
expected := make(map[string]struct{}, len(test.want))
for _, v := range test.want {
expected[v] = struct{}{}
}

if diff := cmp.Diff(expected, actual); diff != "" {
t.Errorf("%s diff: (-want +got)\n%s", test.name, diff)
}
})
}
}

func TestSaladCloudApiKey_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("SALADCLOUDAPIKEY")
inactiveSecret := testSecrets.MustGetField("SALADCLOUDAPIKEY_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 SaladCloud API Key secret %s within", secret)),
verify: true,
},
want: []detectors.Result{
{
DetectorType: detectorspb.DetectorType_SaladCloudApiKey,
Verified: true,
},
},
wantErr: false,
wantVerificationErr: false,
},
{
name: "found, unverified",
s: Scanner{},
args: args{
ctx: context.Background(),
data: []byte(fmt.Sprintf("You can find a SaladCloud API Key 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_SaladCloudApiKey,
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 SaladCloud API Key secret %s within", secret)),
verify: true,
},
want: []detectors.Result{
{
DetectorType: detectorspb.DetectorType_SaladCloudApiKey,
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 SaladCloud API Key secret %s within", secret)),
verify: true,
},
want: []detectors.Result{
{
DetectorType: detectorspb.DetectorType_SaladCloudApiKey,
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("SaladCloudApiKey.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")
if diff := cmp.Diff(got, tt.want, ignoreOpts); diff != "" {
t.Errorf("SaladCloudApiKey.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)
}
}
})
}
}
2 changes: 2 additions & 0 deletions pkg/engine/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,7 @@ import (
"github.com/trufflesecurity/trufflehog/v3/pkg/detectors/rownd"
"github.com/trufflesecurity/trufflehog/v3/pkg/detectors/rubygems"
"github.com/trufflesecurity/trufflehog/v3/pkg/detectors/runrunit"
"github.com/trufflesecurity/trufflehog/v3/pkg/detectors/saladcloudapikey"

Check failure on line 592 in pkg/engine/defaults.go

View workflow job for this annotation

GitHub Actions / golangci-lint

could not import github.com/trufflesecurity/trufflehog/v3/pkg/detectors/saladcloudapikey (-: # github.com/trufflesecurity/trufflehog/v3/pkg/detectors/saladcloudapikey
"github.com/trufflesecurity/trufflehog/v3/pkg/detectors/salesblink"
"github.com/trufflesecurity/trufflehog/v3/pkg/detectors/salescookie"
"github.com/trufflesecurity/trufflehog/v3/pkg/detectors/salesflare"
Expand Down Expand Up @@ -1636,6 +1637,7 @@ func DefaultDetectors() []detectors.Detector {
nvapi.Scanner{},
railwayapp.Scanner{},
meraki.Scanner{},
saladcloudapikey.Scanner{},
}

// Automatically initialize all detectors that implement
Expand Down
17 changes: 11 additions & 6 deletions pkg/pb/detectorspb/detectors.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d2938fb

Please sign in to comment.