-
Notifications
You must be signed in to change notification settings - Fork 2.5k
[INS-497] Add Pganalyze Read Key Detector #4993
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
MuneebUllahKhan222
wants to merge
1
commit into
main
Choose a base branch
from
pganalyze-read-detector
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| package pganalyzereadkey | ||
|
|
||
| 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/detector_typepb" | ||
| ) | ||
|
|
||
| type Scanner struct { | ||
| client *http.Client | ||
| } | ||
|
|
||
| // Compile-time interface check | ||
| var _ detectors.Detector = (*Scanner)(nil) | ||
|
|
||
| var ( | ||
| defaultClient = common.SaneHttpClient() | ||
|
|
||
| // pganalyze Read API keys use the format: | ||
| // pgar_<27 alphanumeric characters> | ||
| // | ||
| // Example: | ||
| // pgar_abcdefghijklmnopqrstuvwxyz12 | ||
| pganalyzeTokenPat = regexp.MustCompile( | ||
| `\b(pgar_[A-Za-z0-9]{27})\b`, | ||
| ) | ||
| ) | ||
|
|
||
| // Keywords used for fast pre-filtering | ||
| func (s Scanner) Keywords() []string { | ||
| return []string{ | ||
| "pgar_", | ||
| } | ||
| } | ||
|
|
||
| func (s Scanner) getClient() *http.Client { | ||
| if s.client != nil { | ||
| return s.client | ||
| } | ||
| return defaultClient | ||
| } | ||
|
|
||
| // FromData scans for pganalyze API tokens and optionally verifies them. | ||
| func (s Scanner) FromData( | ||
| ctx context.Context, | ||
| verify bool, | ||
| data []byte, | ||
| ) (results []detectors.Result, err error) { | ||
|
|
||
| dataStr := string(data) | ||
|
|
||
| uniqueTokens := make(map[string]struct{}) | ||
|
|
||
| matches := pganalyzeTokenPat.FindAllStringSubmatch(dataStr, -1) | ||
| for _, match := range matches { | ||
| uniqueTokens[match[1]] = struct{}{} | ||
| } | ||
|
|
||
| for token := range uniqueTokens { | ||
| result := detectors.Result{ | ||
| DetectorType: detector_typepb.DetectorType_PgAnalyzeReadKey, | ||
| Raw: []byte(token), | ||
| SecretParts: map[string]string{ | ||
| "key": token, | ||
| "access_type": "read", | ||
| }, | ||
| } | ||
|
|
||
| if verify { | ||
| verified, verificationErr := verifyPganalyzeToken( | ||
| ctx, | ||
| s.getClient(), | ||
| token, | ||
| ) | ||
|
|
||
| result.SetVerificationError(verificationErr, token) | ||
| result.Verified = verified | ||
| } | ||
|
|
||
| results = append(results, result) | ||
| } | ||
|
|
||
| return | ||
| } | ||
|
|
||
| func verifyPganalyzeToken( | ||
| ctx context.Context, | ||
| client *http.Client, | ||
| token string, | ||
| ) (bool, error) { | ||
|
|
||
| req, err := http.NewRequestWithContext( | ||
| ctx, | ||
| http.MethodPost, | ||
| "https://app.pganalyze.com/graphql", | ||
| http.NoBody, | ||
| ) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| req.Header.Set("Authorization", "Token "+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 | ||
|
|
||
| // Explicit invalid auth | ||
| case http.StatusUnauthorized: | ||
| return false, nil | ||
|
|
||
| default: | ||
| return false, fmt.Errorf( | ||
| "unexpected HTTP response status %d", | ||
| res.StatusCode, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| func (s Scanner) Type() detector_typepb.DetectorType { | ||
| return detector_typepb.DetectorType_PgAnalyzeReadKey | ||
| } | ||
|
|
||
| func (s Scanner) Description() string { | ||
| return "pganalyze is a PostgreSQL monitoring and performance analysis platform. pganalyze Read API keys can be used to access read-only monitoring and query performance data." | ||
| } | ||
215 changes: 215 additions & 0 deletions
215
pkg/detectors/pganalyzereadkey/pganalyzereadkey_integration_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,215 @@ | ||
| //go:build detectors | ||
| // +build detectors | ||
|
|
||
| package pganalyzereadkey | ||
|
|
||
| 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/detector_typepb" | ||
| ) | ||
|
|
||
| func TestPgAnalyzeReadKey_FromData(t *testing.T) { | ||
| ctx, cancel := context.WithTimeout(context.Background(), time.Second*10) | ||
| defer cancel() | ||
|
|
||
| testSecrets, err := common.GetSecret( | ||
| ctx, | ||
| "trufflehog-testing", | ||
| "detectors6", | ||
| ) | ||
| if err != nil { | ||
| t.Fatalf("could not get test secrets from GCP: %s", err) | ||
| } | ||
|
|
||
| activeToken := testSecrets.MustGetField("PGANALYZE_READ_KEY") | ||
| inactiveToken := "pgar_abcdefghijklmnopqrstuvwxyz1" | ||
|
|
||
| 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: fmt.Appendf( | ||
| []byte{}, | ||
| "Using pganalyze read key %s for dashboard access", | ||
| activeToken, | ||
| ), | ||
| verify: true, | ||
| }, | ||
| want: []detectors.Result{ | ||
| { | ||
| DetectorType: detector_typepb.DetectorType_PgAnalyzeReadKey, | ||
| Verified: true, | ||
| Raw: []byte(activeToken), | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "found, real token, verification error due to timeout", | ||
| s: Scanner{ | ||
| client: common.SaneHttpClientTimeOut(1 * time.Microsecond), | ||
| }, | ||
| args: args{ | ||
| ctx: context.Background(), | ||
| data: fmt.Appendf( | ||
| []byte{}, | ||
| "Using pganalyze read key %s for dashboard access", | ||
| activeToken, | ||
| ), | ||
| verify: true, | ||
| }, | ||
| want: []detectors.Result{ | ||
| { | ||
| DetectorType: detector_typepb.DetectorType_PgAnalyzeReadKey, | ||
| Verified: false, | ||
| Raw: []byte(activeToken), | ||
| }, | ||
| }, | ||
| wantVerificationErr: true, | ||
| }, | ||
| { | ||
| name: "found, real token, verification error due to unexpected api surface", | ||
| s: Scanner{ | ||
| client: common.ConstantResponseHttpClient(500, "{}"), | ||
| }, | ||
| args: args{ | ||
| ctx: context.Background(), | ||
| data: fmt.Appendf( | ||
| []byte{}, | ||
| "Using pganalyze read key %s for dashboard access", | ||
| activeToken, | ||
| ), | ||
| verify: true, | ||
| }, | ||
| want: []detectors.Result{ | ||
| { | ||
| DetectorType: detector_typepb.DetectorType_PgAnalyzeReadKey, | ||
| Verified: false, | ||
| Raw: []byte(activeToken), | ||
| }, | ||
| }, | ||
| wantVerificationErr: true, | ||
| }, | ||
| { | ||
| name: "found, unverified (inactive token)", | ||
| s: Scanner{}, | ||
| args: args{ | ||
| ctx: context.Background(), | ||
| data: fmt.Appendf( | ||
| []byte{}, | ||
| "Using pganalyze read key %s for dashboard access", | ||
| inactiveToken, | ||
| ), | ||
| verify: true, | ||
| }, | ||
| want: []detectors.Result{ | ||
| { | ||
| DetectorType: detector_typepb.DetectorType_PgAnalyzeReadKey, | ||
| Verified: false, | ||
| Raw: []byte(inactiveToken), | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "not found", | ||
| s: Scanner{}, | ||
| args: args{ | ||
| ctx: context.Background(), | ||
| data: []byte("no secrets here"), | ||
| verify: true, | ||
| }, | ||
| want: nil, | ||
| }, | ||
| } | ||
|
|
||
| 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.Fatalf( | ||
| "PgAnalyzeReadKey.FromData() error = %v, wantErr %v", | ||
| err, | ||
| tt.wantErr, | ||
| ) | ||
| } | ||
|
|
||
| for i := range got { | ||
| if len(got[i].Raw) == 0 { | ||
| t.Fatal("no raw secret present") | ||
| } | ||
|
|
||
| if (got[i].VerificationError() != nil) != tt.wantVerificationErr { | ||
| t.Fatalf( | ||
| "wantVerificationError = %v, verification error = %v", | ||
| tt.wantVerificationErr, | ||
| got[i].VerificationError(), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| ignoreOpts := cmpopts.IgnoreFields( | ||
| detectors.Result{}, | ||
| "ExtraData", | ||
| "verificationError", | ||
| "primarySecret", | ||
| "SecretParts", | ||
| "chunkOffset", | ||
| "chunkOffsetSet", | ||
| ) | ||
|
|
||
| if diff := cmp.Diff(got, tt.want, ignoreOpts); diff != "" { | ||
| t.Errorf( | ||
| "PgAnalyzeReadKey.FromData() %s diff: (-got +want)\n%s", | ||
| tt.name, | ||
| diff, | ||
| ) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func BenchmarkPgAnalyzeReadKey_FromData(b *testing.B) { | ||
| ctx := context.Background() | ||
| s := Scanner{} | ||
|
|
||
| for name, data := range detectors.MustGetBenchmarkData() { | ||
| b.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) | ||
| } | ||
| } | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's worth adding this to the
ExtraDataas well.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since the detector name is
PgAnalyzeReadKey, which already indicates that this is a read-only key, what additional value doesaccess_type: readprovide in the secret metadata?Also, can this secret type have other permission levels (e.g. write or admin), or is it always read-only?