Find, verify, and analyze leaked credentials
Go credentialsdevsecopsdynamic-analysisprecommitscanningsecretsecret-managementsecretssecuritysecurity-toolstrufflehogverification
Add AnalysisError type and wrap all analyzer error paths (#4779)
John Elliott761be8877b62
diff --git a/pkg/analyzer/analyzers/airbrake/airbrake.go b/pkg/analyzer/analyzers/airbrake/airbrake.goindex 00b8c8ceb..eba06658f 100644--- a/pkg/analyzer/analyzers/airbrake/airbrake.go+++ b/pkg/analyzer/analyzers/airbrake/airbrake.go@@ -25,7 +25,8 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeAirfunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {info, err := AnalyzePermissions(a.Cfg, credInfo["key"])if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/airtable/airtableoauth/airtable.go b/pkg/analyzer/analyzers/airtable/airtableoauth/airtable.goindex d54c589c2..7a85e7799 100644--- a/pkg/analyzer/analyzers/airtable/airtableoauth/airtable.go+++ b/pkg/analyzer/analyzers/airtable/airtableoauth/airtable.go@@ -22,12 +22,12 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeAirfunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {token, ok := credInfo["token"]if !ok {- return nil, errors.New("token not found in credInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("token not found in credInfo"))}userInfo, err := common.FetchAirtableUserInfo(token)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}var basesInfo *common.AirtableBasesdiff --git a/pkg/analyzer/analyzers/airtable/airtablepat/airtable.go b/pkg/analyzer/analyzers/airtable/airtablepat/airtable.goindex 4b5fca66c..2a8741799 100644--- a/pkg/analyzer/analyzers/airtable/airtablepat/airtable.go+++ b/pkg/analyzer/analyzers/airtable/airtablepat/airtable.go@@ -36,12 +36,12 @@ func getScopeEndpoint(scope string) (common.Endpoint, bool) {func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {token, ok := credInfo["token"]if !ok {- return nil, errors.New("token not found in credInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("token not found in credInfo"))}userInfo, err := common.FetchAirtableUserInfo(token)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}scopeStatusMap[common.PermissionStrings[common.UserEmailRead]] = userInfo.Email != nil@@ -49,17 +49,17 @@ func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyvar basesInfo *common.AirtableBasesgranted, err := determineScope(token, common.SchemaBasesRead, nil)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}if granted {basesInfo, err = common.FetchAirtableBases(token)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}// If bases are fetched, determine the token scopeserr := determineScopes(token, basesInfo)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}}diff --git a/pkg/analyzer/analyzers/anthropic/anthropic.go b/pkg/analyzer/analyzers/anthropic/anthropic.goindex 00db6bebe..6b4b36b39 100644--- a/pkg/analyzer/analyzers/anthropic/anthropic.go+++ b/pkg/analyzer/analyzers/anthropic/anthropic.go@@ -51,12 +51,14 @@ func (a Analyzer) Type() analyzers.AnalyzerType {func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, exist := credInfo["key"]if !exist {- return nil, errors.New("key not found in credentials info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credentials info"),+ )}secretInfo, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(secretInfo), nildiff --git a/pkg/analyzer/analyzers/asana/asana.go b/pkg/analyzer/analyzers/asana/asana.goindex 81ed2ca12..a25158ab2 100644--- a/pkg/analyzer/analyzers/asana/asana.go+++ b/pkg/analyzer/analyzers/asana/asana.go@@ -28,12 +28,14 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeAsafunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok {- return nil, errors.New("key not found in credInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credInfo"),+ )}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nildiff --git a/pkg/analyzer/analyzers/bitbucket/bitbucket.go b/pkg/analyzer/analyzers/bitbucket/bitbucket.goindex fd9f89b98..fd8471998 100644--- a/pkg/analyzer/analyzers/bitbucket/bitbucket.go+++ b/pkg/analyzer/analyzers/bitbucket/bitbucket.go@@ -63,11 +63,11 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeBitfunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok {- return nil, errors.New("key not found in credentialInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credentialInfo"))}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/databricks/databricks.go b/pkg/analyzer/analyzers/databricks/databricks.goindex 9ec61d119..f3bcf7d12 100644--- a/pkg/analyzer/analyzers/databricks/databricks.go+++ b/pkg/analyzer/analyzers/databricks/databricks.go@@ -26,17 +26,17 @@ func (a Analyzer) Type() analyzers.AnalyzerType {func (a Analyzer) Analyze(ctx context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {token, exist := credInfo["token"]if !exist {- return nil, fmt.Errorf("key not found in credential info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", fmt.Errorf("key not found in credential info"))}domain, exist := credInfo["domain"]if !exist {- return nil, fmt.Errorf("domain not found in credential info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", fmt.Errorf("domain not found in credential info"))}info, err := AnalyzePermissions(ctx, a.Cfg, domain, token)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}return secretInfoToAnalyzerResult(info), nildiff --git a/pkg/analyzer/analyzers/datadog/datadog.go b/pkg/analyzer/analyzers/datadog/datadog.goindex dfafe7a22..cb024341a 100644--- a/pkg/analyzer/analyzers/datadog/datadog.go+++ b/pkg/analyzer/analyzers/datadog/datadog.go@@ -33,7 +33,7 @@ func (a Analyzer) Analyze(ctx context.Context, credInfo map[string]string) (*anainfo, err := AnalyzePermissions(a.Cfg, apiKey, appKey, endpoint)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/digitalocean/digitalocean.go b/pkg/analyzer/analyzers/digitalocean/digitalocean.goindex 3e3233ab3..e2266deb9 100644--- a/pkg/analyzer/analyzers/digitalocean/digitalocean.go+++ b/pkg/analyzer/analyzers/digitalocean/digitalocean.go@@ -34,11 +34,13 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeDigfunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok {- return nil, errors.New("missing key in credInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("missing key in credInfo"),+ )}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/dockerhub/dockerhub.go b/pkg/analyzer/analyzers/dockerhub/dockerhub.goindex b83df3119..5584bd9e0 100644--- a/pkg/analyzer/analyzers/dockerhub/dockerhub.go+++ b/pkg/analyzer/analyzers/dockerhub/dockerhub.go@@ -54,17 +54,20 @@ func (a Analyzer) Type() analyzers.AnalyzerType {func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {username, exist := credInfo["username"]if !exist {- return nil, errors.New("username not found in the credentials info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("username not found in the credentials info"),+ )}pat, exist := credInfo["pat"]if !exist {- return nil, errors.New("personal access token(PAT) not found in the credentials info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("personal access token(PAT) not found in the credentials info"),+ )}info, err := AnalyzePermissions(a.Cfg, username, pat)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nildiff --git a/pkg/analyzer/analyzers/dropbox/dropbox.go b/pkg/analyzer/analyzers/dropbox/dropbox.goindex 684df1c2c..3e9afb622 100644--- a/pkg/analyzer/analyzers/dropbox/dropbox.go+++ b/pkg/analyzer/analyzers/dropbox/dropbox.go@@ -43,12 +43,12 @@ func (a Analyzer) Type() analyzers.AnalyzerType {func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {token, exist := credInfo["token"]if !exist {- return nil, errors.New("token not found in credentials info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("token not found in credentials info"))}info, err := AnalyzePermissions(a.Cfg, token)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}return secretInfoToAnalyzerResult(info), nildiff --git a/pkg/analyzer/analyzers/elevenlabs/elevenlabs.go b/pkg/analyzer/analyzers/elevenlabs/elevenlabs.goindex dcd185e7b..7cb07b578 100644--- a/pkg/analyzer/analyzers/elevenlabs/elevenlabs.go+++ b/pkg/analyzer/analyzers/elevenlabs/elevenlabs.go@@ -86,12 +86,14 @@ func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analy// check if the `key` exist in the credentials infokey, exist := credInfo["key"]if !exist {- return nil, errors.New("key not found in credentials info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credentials info"),+ )}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nildiff --git a/pkg/analyzer/analyzers/errors.go b/pkg/analyzer/analyzers/errors.gonew file mode 100644index 000000000..7b20dcb6f--- /dev/null+++ b/pkg/analyzer/analyzers/errors.go@@ -0,0 +1,69 @@+package analyzers++import "fmt"++// Operation constants for AnalysisError.+const (+ OperationValidateCredentials = "validate_credentials"+ OperationAnalyzePermissions = "analyze_permissions"+)++// Service constants for AnalysisError.+const (+ ServiceAPI = "API"+ ServiceConfig = "config"+ ServiceDatabase = "Database"+ ServiceOAuth = "OAuth"+ ServiceCrypto = "crypto"+)++// AnalysisErrorInfo is implemented by errors that provide structured context+// about analysis failures. This allows downstream consumers (e.g., the scanner)+// to extract metadata for structured error storage without depending on+// concrete error types.+type AnalysisErrorInfo interface {+ error+ AnalyzerType() string+ Operation() string // "validate_credentials", "authenticate", "analyze_permissions", "connect", "ping"+ Service() string // "config", "API", "OAuth", "Database"+ Resource() string // account ID, endpoint URL, or other identifier+}++// AnalysisError represents a structured error from an analyzer.+type AnalysisError struct {+ analyzerType string+ operation string+ service string+ resource string+ err error+}++// NewAnalysisError creates a new AnalysisError.+func NewAnalysisError(analyzerType, operation, service, resource string, err error) *AnalysisError {+ return &AnalysisError{+ analyzerType: analyzerType,+ operation: operation,+ service: service,+ resource: resource,+ err: err,+ }+}++func (e *AnalysisError) Error() string {+ var resource string+ if e.resource != "" {+ resource = fmt.Sprintf(" (resource: %s)", e.resource)+ }+ if e.err != nil {+ return fmt.Sprintf("%s analysis failed: %s on %s%s: %v",+ e.analyzerType, e.operation, e.service, resource, e.err)+ }+ return fmt.Sprintf("%s analysis failed: %s on %s%s",+ e.analyzerType, e.operation, e.service, resource)+}++func (e *AnalysisError) Unwrap() error { return e.err }+func (e *AnalysisError) AnalyzerType() string { return e.analyzerType }+func (e *AnalysisError) Operation() string { return e.operation }+func (e *AnalysisError) Service() string { return e.service }+func (e *AnalysisError) Resource() string { return e.resource }diff --git a/pkg/analyzer/analyzers/errors_test.go b/pkg/analyzer/analyzers/errors_test.gonew file mode 100644index 000000000..a7e64317c--- /dev/null+++ b/pkg/analyzer/analyzers/errors_test.go@@ -0,0 +1,86 @@+package analyzers++import (+ "errors"+ "fmt"+ "testing"+)++func TestAnalysisErrorImplementsInterface(t *testing.T) {+ var _ AnalysisErrorInfo = (*AnalysisError)(nil)+}++func TestAnalysisErrorFields(t *testing.T) {+ orig := fmt.Errorf("connection refused")+ e := NewAnalysisError("Postgres", "connect", "Database", "localhost:5432", orig)++ if e.AnalyzerType() != "Postgres" {+ t.Errorf("AnalyzerType() = %q, want %q", e.AnalyzerType(), "Postgres")+ }+ if e.Operation() != "connect" {+ t.Errorf("Operation() = %q, want %q", e.Operation(), "connect")+ }+ if e.Service() != "Database" {+ t.Errorf("Service() = %q, want %q", e.Service(), "Database")+ }+ if e.Resource() != "localhost:5432" {+ t.Errorf("Resource() = %q, want %q", e.Resource(), "localhost:5432")+ }+}++func TestAnalysisErrorUnwrap(t *testing.T) {+ orig := fmt.Errorf("timeout")+ e := NewAnalysisError("GitHub", "authenticate", "API", "", orig)++ if !errors.Is(e, orig) {+ t.Error("errors.Is should find the original error")+ }+}++func TestAnalysisErrorAs(t *testing.T) {+ orig := fmt.Errorf("bad key")+ e := NewAnalysisError("Airbrake", "validate_credentials", "config", "", orig)++ // Wrap it further+ wrapped := fmt.Errorf("analyze failed: %w", e)++ var ae AnalysisErrorInfo+ if !errors.As(wrapped, &ae) {+ t.Fatal("errors.As should find AnalysisErrorInfo in wrapped error")+ }+ if ae.AnalyzerType() != "Airbrake" {+ t.Errorf("AnalyzerType() = %q, want %q", ae.AnalyzerType(), "Airbrake")+ }+ if ae.Operation() != "validate_credentials" {+ t.Errorf("Operation() = %q, want %q", ae.Operation(), "validate_credentials")+ }+}++func TestAnalysisErrorMessage(t *testing.T) {+ orig := fmt.Errorf("401 unauthorized")+ e := NewAnalysisError("Slack", "authenticate", "API", "workspace-123", orig)++ expected := "Slack analysis failed: authenticate on API (resource: workspace-123): 401 unauthorized"+ if e.Error() != expected {+ t.Errorf("Error() = %q, want %q", e.Error(), expected)+ }+}++func TestAnalysisErrorMessageNilError(t *testing.T) {+ e := NewAnalysisError("MySQL", "connect", "Database", "db.example.com", nil)++ expected := "MySQL analysis failed: connect on Database (resource: db.example.com)"+ if e.Error() != expected {+ t.Errorf("Error() = %q, want %q", e.Error(), expected)+ }+}++func TestAnalysisErrorMessageEmptyResource(t *testing.T) {+ orig := fmt.Errorf("invalid token")+ e := NewAnalysisError("OpenAI", "analyze_permissions", "API", "", orig)++ expected := "OpenAI analysis failed: analyze_permissions on API: invalid token"+ if e.Error() != expected {+ t.Errorf("Error() = %q, want %q", e.Error(), expected)+ }+}diff --git a/pkg/analyzer/analyzers/fastly/fastly.go b/pkg/analyzer/analyzers/fastly/fastly.goindex 40dfe94dc..52b5d64f0 100644--- a/pkg/analyzer/analyzers/fastly/fastly.go+++ b/pkg/analyzer/analyzers/fastly/fastly.go@@ -25,16 +25,16 @@ func (a Analyzer) Type() analyzers.AnalyzerType {func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, exist := credInfo["key"]if !exist {- return nil, fmt.Errorf("key not found in credential info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", fmt.Errorf("key not found in credential info"),+ )}- // analyze permissionsinfo, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}- // secret info to analyzerreturn secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/figma/figma.go b/pkg/analyzer/analyzers/figma/figma.goindex 65e5c9c3a..fc381bede 100644--- a/pkg/analyzer/analyzers/figma/figma.go+++ b/pkg/analyzer/analyzers/figma/figma.go@@ -41,11 +41,11 @@ const (func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {token, ok := credInfo["token"]if !ok {- return nil, errors.New("token not found in credInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("token not found in credInfo"))}info, err := AnalyzePermissions(a.Cfg, token)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}return MapToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/github/github.go b/pkg/analyzer/analyzers/github/github.goindex e84d958fd..8d3e34a91 100644--- a/pkg/analyzer/analyzers/github/github.go+++ b/pkg/analyzer/analyzers/github/github.go@@ -35,10 +35,10 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeGitfunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {info, err := AnalyzePermissions(a.Cfg, credInfo["key"])if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}if info == nil {- return nil, fmt.Errorf("GitHub analyzer returned no data for token")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", fmt.Errorf("GitHub analyzer returned no data for token"))}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/gitlab/gitlab.go b/pkg/analyzer/analyzers/gitlab/gitlab.goindex 517774c03..62ab2a587 100644--- a/pkg/analyzer/analyzers/gitlab/gitlab.go+++ b/pkg/analyzer/analyzers/gitlab/gitlab.go@@ -34,7 +34,7 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeGitfunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok {- return nil, errors.New("key not found in credentialInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credentialInfo"))}host, ok := credInfo["host"]if !ok {@@ -43,7 +43,7 @@ func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyinfo, err := AnalyzePermissions(a.Cfg, key, host)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/groq/groq.go b/pkg/analyzer/analyzers/groq/groq.goindex 66f016aa7..1e345cfd1 100644--- a/pkg/analyzer/analyzers/groq/groq.go+++ b/pkg/analyzer/analyzers/groq/groq.go@@ -58,12 +58,14 @@ func (a Analyzer) Type() analyzers.AnalyzerType {func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, exist := credInfo["key"]if !exist {- return nil, errors.New("key not found in credentials info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credentials info"),+ )}secretInfo, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(secretInfo), nildiff --git a/pkg/analyzer/analyzers/huggingface/huggingface.go b/pkg/analyzer/analyzers/huggingface/huggingface.goindex b4508b56e..b7ca38fc7 100644--- a/pkg/analyzer/analyzers/huggingface/huggingface.go+++ b/pkg/analyzer/analyzers/huggingface/huggingface.go@@ -33,12 +33,14 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeHugfunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok || key == "" {- return nil, fmt.Errorf("key not found in credentialInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", fmt.Errorf("key not found in credentialInfo"),+ )}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/jira/jira.go b/pkg/analyzer/analyzers/jira/jira.goindex 3caba5bdb..80379be14 100644--- a/pkg/analyzer/analyzers/jira/jira.go+++ b/pkg/analyzer/analyzers/jira/jira.go@@ -28,20 +28,20 @@ func (a Analyzer) Type() analyzers.AnalyzerType {func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {token, exist := credInfo["token"]if !exist {- return nil, fmt.Errorf("token not found in credential info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", fmt.Errorf("token not found in credential info"))}domain, exist := credInfo["domain"]if !exist {- return nil, fmt.Errorf("domain not found in credential info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", fmt.Errorf("domain not found in credential info"))}email, exist := credInfo["email"]if !exist {- return nil, fmt.Errorf("email not found in credential info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", fmt.Errorf("email not found in credential info"))}info, err := AnalyzePermissions(a.Cfg, token, domain, email)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}return secretInfoToAnalyzerResult(info), nildiff --git a/pkg/analyzer/analyzers/launchdarkly/launchdarkly.go b/pkg/analyzer/analyzers/launchdarkly/launchdarkly.goindex 91dea5dd5..2631f5d3b 100644--- a/pkg/analyzer/analyzers/launchdarkly/launchdarkly.go+++ b/pkg/analyzer/analyzers/launchdarkly/launchdarkly.go@@ -29,16 +29,16 @@ func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analy// check if the `key` exist in the credentials infokey, exist := credInfo["key"]if !exist {- return nil, errors.New("key not found in credentials info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credentials info"))}if isSDKKey(key) {- return nil, errors.New("sdk keys cannot be analyzed")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("sdk keys cannot be analyzed"))}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}return secretInfoToAnalyzerResult(info), nildiff --git a/pkg/analyzer/analyzers/mailchimp/mailchimp.go b/pkg/analyzer/analyzers/mailchimp/mailchimp.goindex ca775db4f..514f25d3d 100644--- a/pkg/analyzer/analyzers/mailchimp/mailchimp.go+++ b/pkg/analyzer/analyzers/mailchimp/mailchimp.go@@ -29,12 +29,14 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeMaifunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok {- return nil, errors.New("key not found in credentialInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credentialInfo"),+ )}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/mailgun/mailgun.go b/pkg/analyzer/analyzers/mailgun/mailgun.goindex 26dd093ae..0297aa7d1 100644--- a/pkg/analyzer/analyzers/mailgun/mailgun.go+++ b/pkg/analyzer/analyzers/mailgun/mailgun.go@@ -33,12 +33,14 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeMaifunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok {- return nil, errors.New("key not found in credentialInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credentialInfo"),+ )}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nildiff --git a/pkg/analyzer/analyzers/monday/monday.go b/pkg/analyzer/analyzers/monday/monday.goindex f66388132..8159d0a75 100644--- a/pkg/analyzer/analyzers/monday/monday.go+++ b/pkg/analyzer/analyzers/monday/monday.go@@ -44,12 +44,12 @@ func (a Analyzer) Type() analyzers.AnalyzerType {func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, exist := credInfo["key"]if !exist {- return nil, errors.New("key not found in credentials info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credentials info"))}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}return secretInfoToAnalyzerResult(info), nildiff --git a/pkg/analyzer/analyzers/mux/mux.go b/pkg/analyzer/analyzers/mux/mux.goindex b05a9f561..d6039aa8f 100644--- a/pkg/analyzer/analyzers/mux/mux.go+++ b/pkg/analyzer/analyzers/mux/mux.go@@ -41,16 +41,19 @@ func (a Analyzer) Type() analyzers.AnalyzerType {func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, exist := credInfo["key"]if !exist {- return nil, errors.New("key not found in credentials info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credentials info"),+ )}secret, exist := credInfo["secret"]if !exist {- return nil, errors.New("secret not found in credentials info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("secret not found in credentials info"),+ )}info, err := AnalyzePermissions(a.Cfg, key, secret)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nildiff --git a/pkg/analyzer/analyzers/mysql/mysql.go b/pkg/analyzer/analyzers/mysql/mysql.goindex 259476122..213ed6757 100644--- a/pkg/analyzer/analyzers/mysql/mysql.go+++ b/pkg/analyzer/analyzers/mysql/mysql.go@@ -33,11 +33,11 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeMySfunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {uri, ok := credInfo["connection_string"]if !ok {- return nil, fmt.Errorf("missing connection string")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", fmt.Errorf("missing connection string"))}info, err := AnalyzePermissions(a.Cfg, uri)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceDatabase, "", err)}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/netlify/netlify.go b/pkg/analyzer/analyzers/netlify/netlify.goindex e2380f68f..f9a8fcca2 100644--- a/pkg/analyzer/analyzers/netlify/netlify.go+++ b/pkg/analyzer/analyzers/netlify/netlify.go@@ -25,12 +25,14 @@ func (a Analyzer) Type() analyzers.AnalyzerType {func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, exist := credInfo["key"]if !exist {- return nil, fmt.Errorf("key not found in credential info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", fmt.Errorf("key not found in credential info"),+ )}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nildiff --git a/pkg/analyzer/analyzers/ngrok/ngrok.go b/pkg/analyzer/analyzers/ngrok/ngrok.goindex 66abc4d63..f92279d0a 100644--- a/pkg/analyzer/analyzers/ngrok/ngrok.go+++ b/pkg/analyzer/analyzers/ngrok/ngrok.go@@ -36,12 +36,14 @@ func (a Analyzer) Type() analyzers.AnalyzerType {func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, exist := credInfo["key"]if !exist {- return nil, errors.New("key not found in credentials info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credentials info"),+ )}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nildiff --git a/pkg/analyzer/analyzers/notion/notion.go b/pkg/analyzer/analyzers/notion/notion.goindex 7a70a42e9..35c7e0c1d 100644--- a/pkg/analyzer/analyzers/notion/notion.go+++ b/pkg/analyzer/analyzers/notion/notion.go@@ -30,11 +30,13 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeNotfunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok {- return nil, errors.New("missing key in credInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("missing key in credInfo"),+ )}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/openai/openai.go b/pkg/analyzer/analyzers/openai/openai.goindex 41103dcd8..d7057db05 100644--- a/pkg/analyzer/analyzers/openai/openai.go+++ b/pkg/analyzer/analyzers/openai/openai.go@@ -31,7 +31,8 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeOpefunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {info, err := AnalyzePermissions(a.Cfg, credInfo["key"])if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/opsgenie/opsgenie.go b/pkg/analyzer/analyzers/opsgenie/opsgenie.goindex c18c5c990..6c13a92ef 100644--- a/pkg/analyzer/analyzers/opsgenie/opsgenie.go+++ b/pkg/analyzer/analyzers/opsgenie/opsgenie.go@@ -30,11 +30,13 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeOpsfunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok {- return nil, errors.New("missing key in credInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("missing key in credInfo"),+ )}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/plaid/plaid.go b/pkg/analyzer/analyzers/plaid/plaid.goindex d35d2580a..fc44e9810 100644--- a/pkg/analyzer/analyzers/plaid/plaid.go+++ b/pkg/analyzer/analyzers/plaid/plaid.go@@ -31,20 +31,20 @@ func (a Analyzer) Type() analyzers.AnalyzerType {func (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {secret, exist := credInfo["secret"]if !exist {- return nil, errors.New("secret not found in credentials info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("secret not found in credentials info"))}clientID, exist := credInfo["id"]if !exist {- return nil, errors.New("id not found in credentials info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("id not found in credentials info"))}accessToken, exist := credInfo["token"]if !exist {- return nil, errors.New("token not found in credentials info")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("token not found in credentials info"))}info, err := AnalyzePermissions(a.Cfg, secret, clientID, accessToken)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}return secretInfoToAnalyzerResult(info), nildiff --git a/pkg/analyzer/analyzers/planetscale/planetscale.go b/pkg/analyzer/analyzers/planetscale/planetscale.goindex 412fc753a..9d356be9c 100644--- a/pkg/analyzer/analyzers/planetscale/planetscale.go+++ b/pkg/analyzer/analyzers/planetscale/planetscale.go@@ -31,15 +31,15 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypePlafunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {id, ok := credInfo["id"]if !ok {- return nil, errors.New("missing id in credInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("missing id in credInfo"))}key, ok := credInfo["token"]if !ok {- return nil, errors.New("missing key in credInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("missing key in credInfo"))}info, err := AnalyzePermissions(a.Cfg, id, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/postgres/postgres.go b/pkg/analyzer/analyzers/postgres/postgres.goindex be7cf2666..3d5a8265a 100644--- a/pkg/analyzer/analyzers/postgres/postgres.go+++ b/pkg/analyzer/analyzers/postgres/postgres.go@@ -30,12 +30,12 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypePosfunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {uri, ok := credInfo["connection_string"]if !ok {- return nil, errors.New("connection string not found in credInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("connection string not found in credInfo"))}info, err := AnalyzePermissions(a.Cfg, uri)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceDatabase, "", err)}return secretInfoToAnalyzerResult(info), nil}@@ -404,20 +404,20 @@ func getUserPrivs(db *sql.DB) (string, map[string]bool, error) {func getDBPrivs(db *sql.DB) (string, []DB, error) {query := `- SELECT+ SELECTd.datname AS database_name,u.usename AS owner,current_user AS current_user,has_database_privilege(current_user, d.datname, 'CONNECT') AS can_connect,has_database_privilege(current_user, d.datname, 'CREATE') AS can_create,has_database_privilege(current_user, d.datname, 'TEMP') AS can_create_temporary_tables- FROM+ FROMpg_database d- JOIN+ JOINpg_user u ON d.datdba = u.usesysid- WHERE+ WHERENOT d.datistemplate- ORDER BY+ ORDER BYd.datname;`// Originally had WHERE NOT d.datistemplate AND d.datallowconndiff --git a/pkg/analyzer/analyzers/posthog/posthog.go b/pkg/analyzer/analyzers/posthog/posthog.goindex 6efe7119c..2706e988c 100644--- a/pkg/analyzer/analyzers/posthog/posthog.go+++ b/pkg/analyzer/analyzers/posthog/posthog.go@@ -37,11 +37,13 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypePosfunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok {- return nil, errors.New("missing key in credInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("missing key in credInfo"),+ )}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/postman/postman.go b/pkg/analyzer/analyzers/postman/postman.goindex 0f1b75dd1..93a09ffca 100644--- a/pkg/analyzer/analyzers/postman/postman.go+++ b/pkg/analyzer/analyzers/postman/postman.go@@ -26,11 +26,13 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypePosfunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok {- return nil, fmt.Errorf("missing key in credInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", fmt.Errorf("missing key in credInfo"),+ )}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/privatekey/privatekey.go b/pkg/analyzer/analyzers/privatekey/privatekey.goindex c270a5ce9..02a63a038 100644--- a/pkg/analyzer/analyzers/privatekey/privatekey.go+++ b/pkg/analyzer/analyzers/privatekey/privatekey.go@@ -32,12 +32,12 @@ func (a Analyzer) Analyze(ctx context.Context, credInfo map[string]string) (*ana// token will be already normalized by the time it reaches heretoken, ok := credInfo["token"]if !ok {- return nil, errors.New("token not found in credInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("token not found in credInfo"))}info, err := AnalyzePermissions(ctx, a.Cfg, token)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceCrypto, "", err)}return secretInfoToAnalyzerResult(info), nildiff --git a/pkg/analyzer/analyzers/sendgrid/sendgrid.go b/pkg/analyzer/analyzers/sendgrid/sendgrid.goindex 894680df2..e4e23962b 100644--- a/pkg/analyzer/analyzers/sendgrid/sendgrid.go+++ b/pkg/analyzer/analyzers/sendgrid/sendgrid.go@@ -47,11 +47,13 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeSenfunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok {- return nil, fmt.Errorf("missing key in credInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", fmt.Errorf("missing key in credInfo"),+ )}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/shopify/shopify.go b/pkg/analyzer/analyzers/shopify/shopify.goindex efd14fd75..ad1cafa92 100644--- a/pkg/analyzer/analyzers/shopify/shopify.go+++ b/pkg/analyzer/analyzers/shopify/shopify.go@@ -34,17 +34,17 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeShofunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok {- return nil, errors.New("key not found in credentialInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credentialInfo"))}storeUrl, ok := credInfo["store_url"]if !ok {- return nil, errors.New("store_url not found in credentialInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("store_url not found in credentialInfo"))}info, err := AnalyzePermissions(a.Cfg, key, storeUrl)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/slack/slack.go b/pkg/analyzer/analyzers/slack/slack.goindex 273bc90c2..a8d55f6e2 100644--- a/pkg/analyzer/analyzers/slack/slack.go+++ b/pkg/analyzer/analyzers/slack/slack.go@@ -29,12 +29,12 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeSlafunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok {- return nil, errors.New("key not found in credentialInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credentialInfo"))}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/sourcegraph/sourcegraph.go b/pkg/analyzer/analyzers/sourcegraph/sourcegraph.goindex f1fa25326..609d3aee0 100644--- a/pkg/analyzer/analyzers/sourcegraph/sourcegraph.go+++ b/pkg/analyzer/analyzers/sourcegraph/sourcegraph.go@@ -26,11 +26,13 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeSoufunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok {- return nil, fmt.Errorf("missing key in credInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", fmt.Errorf("missing key in credInfo"),+ )}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err,+ )}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/square/square.go b/pkg/analyzer/analyzers/square/square.goindex 7a51c5d11..104b21190 100644--- a/pkg/analyzer/analyzers/square/square.go+++ b/pkg/analyzer/analyzers/square/square.go@@ -28,11 +28,11 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeSqufunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok {- return nil, errors.New("key not found in credentialInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credentialInfo"))}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/stripe/stripe.go b/pkg/analyzer/analyzers/stripe/stripe.goindex 2cd4b4e03..65325406e 100644--- a/pkg/analyzer/analyzers/stripe/stripe.go+++ b/pkg/analyzer/analyzers/stripe/stripe.go@@ -33,12 +33,12 @@ func (Analyzer) Type() analyzers.AnalyzerType { return analyzers.AnalyzerTypeStrfunc (a Analyzer) Analyze(_ context.Context, credInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credInfo["key"]if !ok {- return nil, errors.New("key not found in credentialInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credentialInfo"))}info, err := AnalyzePermissions(a.Cfg, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}return secretInfoToAnalyzerResult(info), nil}diff --git a/pkg/analyzer/analyzers/twilio/twilio.go b/pkg/analyzer/analyzers/twilio/twilio.goindex e09eb9c50..87229f662 100644--- a/pkg/analyzer/analyzers/twilio/twilio.go+++ b/pkg/analyzer/analyzers/twilio/twilio.go@@ -25,12 +25,12 @@ func (a *Analyzer) Type() analyzers.AnalyzerType {func (a *Analyzer) Analyze(ctx context.Context, credentialInfo map[string]string) (*analyzers.AnalyzerResult, error) {key, ok := credentialInfo["key"]if !ok {- return nil, errors.New("key not found in credentialInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("key not found in credentialInfo"))}sid, ok := credentialInfo["sid"]if !ok {- return nil, errors.New("sid not found in credentialInfo")+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationValidateCredentials, analyzers.ServiceConfig, "", errors.New("sid not found in credentialInfo"))}if a.Cfg == nil {@@ -39,13 +39,13 @@ func (a *Analyzer) Analyze(ctx context.Context, credentialInfo map[string]stringinfo, err := AnalyzePermissions(a.Cfg, sid, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}// List parent and subaccountsaccounts, err := listTwilioAccounts(a.Cfg, sid, key)if err != nil {- return nil, err+ return nil, analyzers.NewAnalysisError(a.Type().String(), analyzers.OperationAnalyzePermissions, analyzers.ServiceAPI, "", err)}var permissions []Permission