Skip to content

Find, verify, and analyze leaked credentials

Separated printing and analyzes functionality for twilio (#3118)

Abdul Basit67c01aee6e2d
diff --git a/pkg/analyzer/analyzers/twilio/twilio.go b/pkg/analyzer/analyzers/twilio/twilio.go
index 493c6dacd..4bcdc4ed6 100644
--- a/pkg/analyzer/analyzers/twilio/twilio.go
+++ b/pkg/analyzer/analyzers/twilio/twilio.go
@@ -16,6 +16,11 @@ type VerifyJSON struct {
Code int `json:"code"`
}
+type SecretInfo struct {
+ VerifyJson VerifyJSON
+ AccountStatusCode int
+}
+
const (
AUTHENTICATED_NO_PERMISSION = 70051
INVALID_CREDENTIALS = 20003
@@ -96,35 +101,52 @@ func getVerifyServicesStatusCode(cfg *config.Config, sid string, secret string)
return verifyJSON, nil
}
-func AnalyzePermissions(cfg *config.Config, key string) {
+func AnalyzePermissions(cfg *config.Config, key string) (*SecretInfo, error) {
sid, secret, err := splitKey(key)
if err != nil {
- color.Red("[x]" + err.Error())
- return
+ return nil, err
}
verifyJSON, err := getVerifyServicesStatusCode(cfg, sid, secret)
if err != nil {
- color.Red("[x]" + err.Error())
+ return nil, err
+ }
+
+ statusCode, err := getAccountsStatusCode(cfg, sid, secret)
+ if err != nil {
+ return nil, err
+ }
+
+ return &SecretInfo{
+ VerifyJson: verifyJSON,
+ AccountStatusCode: statusCode,
+ }, nil
+}
+
+func AnalyzeAndPrintPermissions(cfg *config.Config, key string) {
+ // ToDo: Add in logging
+ if cfg.LoggingEnabled {
+ color.Red("[x] Logging is not supported for this analyzer.")
return
}
- if verifyJSON.Code == INVALID_CREDENTIALS {
- color.Red("[x] Invalid Twilio API Key")
+ info, err := AnalyzePermissions(cfg, key)
+ if err != nil {
+ color.Red("[x] Error: %s", err.Error())
return
}
- if verifyJSON.Code == AUTHENTICATED_NO_PERMISSION {
- printRestrictedKeyMsg()
+ if info.VerifyJson.Code == INVALID_CREDENTIALS {
+ color.Red("[x] Invalid Twilio API Key")
return
}
- statusCode, err := getAccountsStatusCode(cfg, sid, secret)
- if err != nil {
- color.Red("[x]" + err.Error())
+ if info.VerifyJson.Code == AUTHENTICATED_NO_PERMISSION {
+ printRestrictedKeyMsg()
return
}
- printPermissions(statusCode)
+
+ printPermissions(info.AccountStatusCode)
}
// printPermissions prints the permissions based on the status code
diff --git a/pkg/analyzer/cli.go b/pkg/analyzer/cli.go
index 81130c9b1..8c95ecb15 100644
--- a/pkg/analyzer/cli.go
+++ b/pkg/analyzer/cli.go
@@ -206,7 +206,7 @@ func Run(cmd string) {
slack.AnalyzePermissions(cfg, *slackKey)
case twilioScan.FullCommand():
cfg.LogFile = analyzers.CreateLogFileName("twilio")
- twilio.AnalyzePermissions(cfg, *twilioKey)
+ twilio.AnalyzeAndPrintPermissions(cfg, *twilioKey)
case airbrakeScan.FullCommand():
cfg.LogFile = analyzers.CreateLogFileName("airbrake")
airbrake.AnalyzeAndPrintPermissions(cfg, *airbrakeKey)