feat: improvements (#4)

Allow credentials to be passed, general improvements

.gitignore

@@ -2,3 +2,4 @@
 config.yaml
 /onelogin-auth-*
 .DS_Store
+.env

.vscode/launch.json

@@ -0,0 +1,27 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "login",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/main.go",
+            "console": "integratedTerminal",
+            "args": ["login"],
+            "envFile": "${workspaceFolder}/.env"
+        },
+        {
+            "name": "list",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/main.go",
+            "console": "integratedTerminal",
+            "args": ["list"]
+        }
+    ]
+}

cmd/list.go

@@ -18,7 +18,7 @@ var listCmd = &cobra.Command{
 
 		fmt.Println("Accounts:")
 		for k, v := range config.Accounts {
-			fmt.Printf("[%d] %s\n", k, v)
+			fmt.Printf("[%d] %s\n", k, v.Name)
 		}
 	},
 }

cmd/login.go

@@ -24,7 +24,13 @@ var loginCmd = &cobra.Command{
 		//Get Role and Accounts from parameters or from keyboard input
 		if len(args) != 2 {
 			role, err = getRole(config.Roles)
+			if err != nil {
+				log.Fatalln(err)
+			}
 			account, err = getAccount(config.Accounts)
+			if err != nil {
+				log.Fatalln(err)
+			}
 		} else {
 			roleNum, err := strconv.Atoi(args[0])
 			if err != nil {
@@ -58,13 +64,24 @@ var loginCmd = &cobra.Command{
 		}
 
 		//Get email and password from keyboard input
-		email, err := utils.PromptForString("Email")
-		if err != nil {
-			log.Fatalln(err)
+		var email string
+		if config.Credentials.Email == "" {
+			email, err = utils.PromptForString("Email")
+			if err != nil {
+				log.Fatalln(err)
+			}
+		} else {
+			email = config.Credentials.Email
 		}
-		password, err := utils.PromptForSecretString("Password")
-		if err != nil {
-			log.Fatalln(err)
+
+		var password string
+		if config.Credentials.Password == "" {
+			password, err = utils.PromptForSecretString("Password")
+			if err != nil {
+				log.Fatalln(err)
+			}
+		} else {
+			password = config.Credentials.Password
 		}
 
 		//SAML Assertion and MFA Devices retrieval
@@ -82,10 +99,17 @@ var loginCmd = &cobra.Command{
 			if err != nil {
 				log.Fatalln(err)
 			}
-			mfaCode, err := utils.PromptForSecretString("MFA Code")
-			if err != nil {
-				log.Fatalln(err)
+
+			var mfaCode string
+			if config.Credentials.OTP == "" {
+				mfaCode, err = utils.PromptForSecretString("MFA Code")
+				if err != nil {
+					log.Fatalln(err)
+				}
+			} else {
+				mfaCode = config.Credentials.OTP
 			}
+
 			verificationResponse, err := onelogin.VerifyFactor(token, *deviceID, appID, assertionResponse.StateToken, mfaCode)
 			if err != nil {
 				fmt.Println(err)
@@ -126,7 +150,7 @@ var loginCmd = &cobra.Command{
 
 func getRole(roles []string) (*int, error) {
 
-	roleName, err := utils.PromptSelect("Role", config.Roles)
+	roleName, err := utils.PromptSelect("Role", config.Roles, false)
 	if err != nil {
 		return nil, err
 	}
@@ -143,7 +167,7 @@ func getAccount(accounts []Account) (*int, error) {
 	for _, v := range accounts {
 		accountsName = append(accountsName, v.Name)
 	}
-	accountName, err := utils.PromptSelect("Account", accountsName)
+	accountName, err := utils.PromptSelect("Account", accountsName, false)
 	if err != nil {
 		return nil, err
 	}
@@ -160,7 +184,7 @@ func getDeviceID(devices []onelogin.Device) (*int, error) {
 	for _, v := range devices {
 		deviceTypes = append(deviceTypes, v.DeviceType)
 	}
-	selectedDeviceType, err := utils.PromptSelect("MFA Device", deviceTypes)
+	selectedDeviceType, err := utils.PromptSelect("MFA Device", deviceTypes, true)
 	if err != nil {
 		log.Fatalln(err)
 	}

cmd/root.go

@@ -9,9 +9,16 @@ import (
 
 type Config struct {
 	Onelogin      OneLoginConf
-	Accounts      []Account `yaml:"accounts"`
-	Roles         []string  `yaml:"roles"`
-	DefaultRegion string    `yaml:"defaultRegion"`
+	Credentials   Credentials `yaml:"credentials"`
+	Accounts      []Account   `yaml:"accounts"`
+	Roles         []string    `yaml:"roles"`
+	DefaultRegion string      `yaml:"defaultRegion"`
+}
+
+type Credentials struct {
+	Email    string `yaml:"email"`
+	Password string `yaml:"password"`
+	OTP      string `yaml:"otp"`
 }
 
 type OneLoginConf struct {
@@ -59,6 +66,10 @@ func LoadConfig(path string) (config Config, err error) {
 		return
 	}
 
+	viper.BindEnv("credentials.email", "EMAIL")
+	viper.BindEnv("credentials.password", "PASSWORD")
+	viper.BindEnv("credentials.otp", "OTP")
+
 	err = viper.Unmarshal(&config)
 	return
 }

config.yaml.example

@@ -10,4 +10,17 @@ accounts:
 roles:
   - iam-role-1 # role that is configured in onelogin and IAM to use with the onelogin identity provider
   - iam-role-2
-defaultRegion: us-east-1
+defaultRegion: us-east-1
+
+# Credentials can be specified in the YAML config file, but it is not recommended
+# because it will store the credentials in plain text on your disk.
+# It is better to use the environment variables EMAIL, PASSWORD and OTP.
+credentials:
+  # it can be overridden by the EMAIL environment variable
+  email: email of user to use for authentication
+  # it makes no sense to use this option in the YAML config file,
+  # but it can be overridden by the PASSWORD environment variable
+  password: password of user to use for authentication
+  # it makes no sense to use this option in the YAML config file,
+  # but it can be overridden by the OTP environment variable
+  otp: otpToken of user to use for authentication

utils/prompt.go

@@ -2,9 +2,10 @@ package utils
 
 import (
 	"fmt"
-	"github.com/manifoldco/promptui"
 	"log"
 	"strconv"
+
+	"github.com/manifoldco/promptui"
 )
 
 func PromptForInt(label string) (*int, error) {
@@ -15,7 +16,7 @@ func PromptForInt(label string) (*int, error) {
 	}
 
 	prompt := promptui.Prompt{
-		Label:    label + ":",
+		Label:    label,
 		Validate: validate,
 	}
 
@@ -43,7 +44,7 @@ func PromptForString(label string) (string, error) {
 	}
 
 	prompt := promptui.Prompt{
-		Label:    label + ":",
+		Label:    label,
 		Validate: validate,
 	}
 
@@ -67,7 +68,7 @@ func PromptForSecretString(label string) (string, error) {
 	}
 
 	prompt := promptui.Prompt{
-		Label:    label + ":",
+		Label:    label,
 		Validate: validate,
 		Mask:     rune('*'),
 	}
@@ -82,10 +83,14 @@ func PromptForSecretString(label string) (string, error) {
 	return result, nil
 }
 
-func PromptSelect(label string, options []string) (string, error) {
+func PromptSelect(label string, options []string, skipSingleChoice bool) (string, error) {
+
+	if skipSingleChoice && len(options) == 1 {
+		return options[0], nil
+	}
 
 	prompt := promptui.Select{
-		Label: label + ":",
+		Label: label,
 		Items: options,
 	}