Allow password to be saved to keychain with skip-prompt

cmd/saml2aws/commands/configure.go

@@ -21,6 +21,7 @@ const OneLoginOAuthPath = "/auth/oauth2/v2/token"
 func Configure(configFlags *flags.CommonFlags) error {
 
 	idpAccountName := configFlags.IdpAccount
+	idpAccountPassword := configFlags.Password
 
 	// pass in alternative location of saml2aws config file, if set.
 	cfgm, err := cfg.NewConfigManager(configFlags.ConfigFile)
@@ -43,13 +44,27 @@ func Configure(configFlags *flags.CommonFlags) error {
 			return errors.Wrap(err, "failed to input configuration")
 		}
 
-		if credentials.SupportsStorage() {
-			if err := storeCredentials(configFlags, account); err != nil {
-				return err
+		if credentials.SupportsStorage() && idpAccountPassword == "" {
+			password := prompter.Password("Password")
+			if password != "" {
+				if confirmPassword := prompter.Password("Confirm"); confirmPassword == password {
+					idpAccountPassword = password
+				} else {
+					log.Println("Passwords did not match")
+					os.Exit(1)
+				}
+			} else {
+				log.Println("No password supplied")
 			}
 		}
 	}
 
+	if credentials.SupportsStorage() {
+		if err := storeCredentials(configFlags, account, idpAccountPassword); err != nil {
+			return err
+		}
+	}
+
 	err = cfgm.SaveIDPAccount(idpAccountName, account)
 	if err != nil {
 		return errors.Wrap(err, "failed to save configuration")
@@ -63,28 +78,16 @@ func Configure(configFlags *flags.CommonFlags) error {
 	return nil
 }
 
-func storeCredentials(configFlags *flags.CommonFlags, account *cfg.IDPAccount) error {
+func storeCredentials(configFlags *flags.CommonFlags, account *cfg.IDPAccount, idpAccountPassword string) error {
 	if configFlags.DisableKeychain {
 		return nil
 	}
-	if configFlags.Password != "" {
-		if err := credentials.SaveCredentials(account.URL, account.Username, configFlags.Password); err != nil {
+	if idpAccountPassword != "" {
+		if err := credentials.SaveCredentials(account.URL, account.Username, idpAccountPassword); err != nil {
 			return errors.Wrap(err, "error storing password in keychain")
 		}
 	} else {
-		password := prompter.Password("Password")
-		if password != "" {
-			if confirmPassword := prompter.Password("Confirm"); confirmPassword == password {
-				if err := credentials.SaveCredentials(account.URL, account.Username, password); err != nil {
-					return errors.Wrap(err, "error storing password in keychain")
-				}
-			} else {
-				log.Println("Passwords did not match")
-				os.Exit(1)
-			}
-		} else {
-			log.Println("No password supplied")
-		}
+		log.Println("No password supplied")
 	}
 	if account.Provider == onelogin.ProviderName {
 		if configFlags.ClientID == "" || configFlags.ClientSecret == "" {

cmd/saml2aws/commands/configure_test.go

@@ -0,0 +1,234 @@
+package commands
+
+import (
+	"os"
+	"os/exec"
+	"path"
+	"testing"
+
+	"github.com/pkg/errors"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/versent/saml2aws/v2/helper/credentials"
+	"github.com/versent/saml2aws/v2/mocks"
+	"github.com/versent/saml2aws/v2/pkg/cfg"
+	"github.com/versent/saml2aws/v2/pkg/flags"
+	"github.com/versent/saml2aws/v2/pkg/provider/onelogin"
+)
+
+// Configure module
+func TestConfigureStoresCredentialOnSupportedStorage(t *testing.T) {
+	commonFlags := &flags.CommonFlags{URL: "https://id.example.com", Username: "some-username", Password: "password", SkipPrompt: true}
+	creds := &credentials.Credentials{ServerURL: "https://id.example.com", Username: "some-username", Secret: "password"}
+	helperMock := &mocks.Helper{}
+	helperMock.Mock.On("Add", creds).Return(nil).Once()
+	helperMock.Mock.On("SupportsCredentialStorage").Return(true).Once()
+	oldCurrentHelper := credentials.CurrentHelper
+	credentials.CurrentHelper = helperMock
+
+	err := Configure(commonFlags)
+	// making linter happy
+	if err != nil {
+		credentials.CurrentHelper = oldCurrentHelper
+	}
+
+	helperMock.AssertCalled(t, "Add", creds)
+	credentials.CurrentHelper = oldCurrentHelper
+}
+
+// Store Credentials module
+func TestStoreCredentialsOnDisabledKeychainFlagReturnsNil(t *testing.T) {
+	commonFlags := &flags.CommonFlags{DisableKeychain: true}
+	idpAccount := &cfg.IDPAccount{
+		URL:      "https://id.example.com",
+		MFA:      "none",
+		Provider: "Ping",
+		Username: "wolfeidau",
+	}
+
+	result := storeCredentials(commonFlags, idpAccount, "password")
+
+	assert.Nil(t, result)
+}
+
+func TestStoreCredentialsOnProvidedPasswordSavesCredentials(t *testing.T) {
+	commonFlags := &flags.CommonFlags{DisableKeychain: false}
+	idpAccount := &cfg.IDPAccount{
+		URL:      "https://id.example.com",
+		MFA:      "none",
+		Provider: "Ping",
+		Username: "wolfeidau",
+	}
+	creds := &credentials.Credentials{ServerURL: "https://id.example.com", Username: "wolfeidau", Secret: "password"}
+	helperMock := &mocks.Helper{}
+	helperMock.Mock.On("Add", creds).Return(nil).Once()
+	oldCurrentHelper := credentials.CurrentHelper
+	defer func() {
+		credentials.CurrentHelper = oldCurrentHelper
+	}()
+	credentials.CurrentHelper = helperMock
+
+	result := storeCredentials(commonFlags, idpAccount, "password")
+
+	helperMock.AssertCalled(t, "Add", creds)
+	assert.Nil(t, result)
+}
+
+func TestStoreCredentialsOnProvidedPasswordHandlesErrorOnSavesCredentials(t *testing.T) {
+	commonFlags := &flags.CommonFlags{DisableKeychain: false}
+	idpAccount := &cfg.IDPAccount{
+		URL:      "https://id.example.com",
+		MFA:      "none",
+		Provider: "Ping",
+		Username: "wolfeidau",
+	}
+	creds := &credentials.Credentials{ServerURL: "https://id.example.com", Username: "wolfeidau", Secret: "password"}
+	helperMock := &mocks.Helper{}
+	helperMock.Mock.On("Add", creds).Return(errors.New("i am an error")).Once()
+	oldCurrentHelper := credentials.CurrentHelper
+	defer func() {
+		credentials.CurrentHelper = oldCurrentHelper
+	}()
+	credentials.CurrentHelper = helperMock
+
+	result := storeCredentials(commonFlags, idpAccount, "password")
+
+	helperMock.AssertCalled(t, "Add", creds)
+	assert.ErrorContains(t, result, "i am an error")
+	assert.ErrorContains(t, result, "error storing password in keychain")
+}
+
+func TestStoreCredentialsOnMissingPasswordSkipsSavingCredentials(t *testing.T) {
+	commonFlags := &flags.CommonFlags{DisableKeychain: false}
+	idpAccount := &cfg.IDPAccount{
+		URL:      "https://id.example.com",
+		MFA:      "none",
+		Provider: "Ping",
+		Username: "wolfeidau",
+	}
+	creds := &credentials.Credentials{ServerURL: "https://id.example.com", Username: "wolfeidau", Secret: "password"}
+	helperMock := &mocks.Helper{}
+	helperMock.Mock.On("Add", creds).Return(nil).Once()
+	oldCurrentHelper := credentials.CurrentHelper
+	defer func() {
+		credentials.CurrentHelper = oldCurrentHelper
+	}()
+	credentials.CurrentHelper = helperMock
+
+	result := storeCredentials(commonFlags, idpAccount, "")
+
+	helperMock.AssertNotCalled(t, "Add")
+	assert.Nil(t, result)
+}
+
+func TestStoreCredentialsOnMissingOneLoginClientIdExitsProgram(t *testing.T) {
+	commonFlags := &flags.CommonFlags{DisableKeychain: false, ClientID: "", ClientSecret: "oneloginSecret"}
+	idpAccount := &cfg.IDPAccount{
+		URL:      "https://id.example.com",
+		MFA:      "none",
+		Provider: onelogin.ProviderName,
+		Username: "wolfeidau",
+	}
+	helperMock := &mocks.Helper{}
+	helperMock.Mock.On("Add", mock.Anything).Return(nil).Once()
+	oldCurrentHelper := credentials.CurrentHelper
+	defer func() {
+		credentials.CurrentHelper = oldCurrentHelper
+	}()
+	credentials.CurrentHelper = helperMock
+
+	if os.Getenv("BE_CRASHER") == "1" {
+		err := storeCredentials(commonFlags, idpAccount, "password")
+		// making linter happy
+		if err != nil {
+			return
+		}
+		return
+	}
+	cmd := exec.Command(os.Args[0], "-test.run=TestStoreCredentialsOnMissingOneLoginClientIdExitsProgram")
+	cmd.Env = append(os.Environ(), "BE_CRASHER=1")
+	err := cmd.Run()
+	if e, ok := err.(*exec.ExitError); ok && !e.Success() {
+		return
+	}
+	t.Fatalf("process ran with err %v, want exit status 1", err)
+}
+
+func TestStoreCredentialsOnMissingOneLoginClientSecretExitsProgram(t *testing.T) {
+	commonFlags := &flags.CommonFlags{DisableKeychain: false, ClientID: "oneloginSecret", ClientSecret: ""}
+	idpAccount := &cfg.IDPAccount{
+		URL:      "https://id.example.com",
+		MFA:      "none",
+		Provider: onelogin.ProviderName,
+		Username: "wolfeidau",
+	}
+	helperMock := &mocks.Helper{}
+	helperMock.Mock.On("Add", mock.Anything).Return(nil).Once()
+	oldCurrentHelper := credentials.CurrentHelper
+	defer func() {
+		credentials.CurrentHelper = oldCurrentHelper
+	}()
+	credentials.CurrentHelper = helperMock
+
+	if os.Getenv("BE_CRASHER") == "1" {
+		err := storeCredentials(commonFlags, idpAccount, "password")
+		// making linter happy
+		if err != nil {
+			return
+		}
+		return
+	}
+	cmd := exec.Command(os.Args[0], "-test.run=TestStoreCredentialsOnMissingOneLoginClientSecretExitsProgram")
+	cmd.Env = append(os.Environ(), "BE_CRASHER=1")
+	err := cmd.Run()
+	if e, ok := err.(*exec.ExitError); ok && !e.Success() {
+		return
+	}
+	t.Fatalf("process ran with err %v, want exit status 1", err)
+}
+
+func TestStoreCredentialsOnProvidedOneLoginSavesCredentials(t *testing.T) {
+	commonFlags := &flags.CommonFlags{DisableKeychain: false, ClientID: "oneloginId", ClientSecret: "oneloginSecret"}
+	idpAccount := &cfg.IDPAccount{
+		URL:      "https://id.example.com",
+		MFA:      "none",
+		Provider: onelogin.ProviderName,
+		Username: "wolfeidau",
+	}
+	helperMock := &mocks.Helper{}
+	helperMock.Mock.On("Add", &credentials.Credentials{ServerURL: "https://id.example.com", Username: "wolfeidau", Secret: "password"}).Return(nil).Once()
+	helperMock.Mock.On("Add", &credentials.Credentials{ServerURL: path.Join("https://id.example.com", OneLoginOAuthPath), Username: "oneloginId", Secret: "oneloginSecret"}).Return(nil).Once()
+	oldCurrentHelper := credentials.CurrentHelper
+	defer func() {
+		credentials.CurrentHelper = oldCurrentHelper
+	}()
+	credentials.CurrentHelper = helperMock
+
+	result := storeCredentials(commonFlags, idpAccount, "password")
+
+	helperMock.AssertNumberOfCalls(t, "Add", 2)
+	assert.Nil(t, result)
+}
+
+func TestStoreCredentialsOnProvidedOneLoginHandlesErrorOnSavesCredentials(t *testing.T) {
+	commonFlags := &flags.CommonFlags{DisableKeychain: false, ClientID: "oneloginId", ClientSecret: "oneloginSecret"}
+	idpAccount := &cfg.IDPAccount{
+		URL:      "https://id.example.com",
+		MFA:      "none",
+		Provider: onelogin.ProviderName,
+		Username: "wolfeidau",
+	}
+	helperMock := &mocks.Helper{}
+	helperMock.Mock.On("Add", &credentials.Credentials{ServerURL: "https://id.example.com", Username: "wolfeidau", Secret: "password"}).Return(nil).Once()
+	helperMock.Mock.On("Add", &credentials.Credentials{ServerURL: path.Join("https://id.example.com", OneLoginOAuthPath), Username: "oneloginId", Secret: "oneloginSecret"}).Return(errors.New("failed again")).Once()
+	oldCurrentHelper := credentials.CurrentHelper
+	defer func() {
+		credentials.CurrentHelper = oldCurrentHelper
+	}()
+	credentials.CurrentHelper = helperMock
+
+	result := storeCredentials(commonFlags, idpAccount, "password")
+
+	assert.ErrorContains(t, result, "failed again")
+	assert.ErrorContains(t, result, "error storing client_id and client_secret in keychain")
+}