Merge branch 'master' into master

Author: tinaboyce

.github/workflows/go.yml

@@ -91,7 +91,7 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - ubuntu-20.04
+          - ubuntu-22.04
           - macos-latest
     runs-on: ${{ matrix.os }}
     steps:
@@ -104,7 +104,7 @@ jobs:
           go-version-file: "go.mod"
 
       - name: Install dependency required for linux builds
-        if: matrix.os == 'ubuntu-20.04'
+        if: matrix.os == 'ubuntu-22.04'
         run: sudo apt-get update && sudo apt-get install -y libudev-dev
 
       - name: GoReleaser

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - ubuntu-20.04
+          - ubuntu-22.04
           - macos-latest
     runs-on: ${{ matrix.os }}
     if: github.event_name != 'workflow_dispatch'
@@ -37,15 +37,15 @@ jobs:
           go-version-file: "go.mod"
 
       - name: Install dependency required for linux builds
-        if: matrix.os == 'ubuntu-20.04'
+        if: matrix.os == 'ubuntu-22.04'
         run: sudo apt-get update && sudo apt-get install -y libudev-dev
 
       - name: Add Lowercase Repository Name to Environment
         run: |
           echo REPOSITORY_NAME_LOWERCASE=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
 
       - uses: "docker/login-action@v3"
-        if: matrix.os == 'ubuntu-20.04'
+        if: matrix.os == 'ubuntu-22.04'
         with:
           registry: "ghcr.io"
           username: "${{ github.actor }}"

.goreleaser.ubuntu-20.04.yml .goreleaser.ubuntu-22.04.yml.goreleaser.ubuntu-20.04.yml renamed to .goreleaser.ubuntu-22.04.yml

@@ -16,7 +16,7 @@ BIN_DIR := $(CURDIR)/bin
 ifeq ($(OS),Darwin)
    CONFIG_FILE?=$(CURDIR)/.goreleaser.macos-latest.yml
 else ifeq ($(OS),Linux)
-   CONFIG_FILE?=$(CURDIR)/.goreleaser.ubuntu-20.04.yml
+   CONFIG_FILE?=$(CURDIR)/.goreleaser.ubuntu-22.04.yml
 else
    $(error Unsupported build OS: $(OS))
 endif

Makefile

@@ -19,11 +19,9 @@ const OneLoginOAuthPath = "/auth/oauth2/v2/token"
 
 // Configure configure account profiles
 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)
 	if err != nil {
 		return errors.Wrap(err, "failed to load configuration")
@@ -34,39 +32,34 @@ func Configure(configFlags *flags.CommonFlags) error {
 		return errors.Wrap(err, "failed to load idp account")
 	}
 
-	// update username and hostname if supplied
 	flags.ApplyFlagOverrides(configFlags, account)
 
-	// do we need to prompt for values now?
-	if !configFlags.SkipPrompt {
-		err = saml2aws.PromptForConfigurationDetails(account)
-		if err != nil {
-			return errors.Wrap(err, "failed to input configuration")
-		}
+	if configFlags.SkipPrompt {
+		return saveConfiguration(cfgm, idpAccountName, account, configFlags, idpAccountPassword)
+	}
+
+	if err = saml2aws.PromptForConfigurationDetails(account); err != nil {
+		return errors.Wrap(err, "failed to input configuration")
+	}
 
-		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() && idpAccountPassword == "" {
+		idpAccountPassword = prompter.Password("Enter password")
+		if idpAccountPassword == "" {
+			log.Println("No password supplied")
 		}
 	}
 
+	return saveConfiguration(cfgm, idpAccountName, account, configFlags, idpAccountPassword)
+}
+
+func saveConfiguration(cfgm *cfg.ConfigManager, idpAccountName string, account *cfg.IDPAccount, configFlags *flags.CommonFlags, idpAccountPassword string) error {
 	if credentials.SupportsStorage() {
 		if err := storeCredentials(configFlags, account, idpAccountPassword); err != nil {
 			return err
 		}
 	}
 
-	err = cfgm.SaveIDPAccount(idpAccountName, account)
-	if err != nil {
+	if err := cfgm.SaveIDPAccount(idpAccountName, account); err != nil {
 		return errors.Wrap(err, "failed to save configuration")
 	}
 

cmd/saml2aws/commands/configure.go

@@ -48,9 +48,6 @@ func Console(consoleFlags *flags.ConsoleFlags) error {
 		return errors.Wrap(err,
 			fmt.Sprintf("error loading credentials for profile: %s", consoleFlags.LoginExecFlags.ExecProfile))
 	}
-	if err != nil {
-		return errors.Wrap(err, "error logging in")
-	}
 
 	if consoleFlags.LoginExecFlags.ExecProfile != "" {
 		// Assume the desired role before generating env vars

cmd/saml2aws/commands/console.go

@@ -215,11 +215,14 @@ func getLoginJSON(loginDetails *creds.LoginDetails, payload *authentikPayload) (
 	switch component {
 	case "ak-stage-identification":
 		m["uid_field"] = loginDetails.Username
-		if payload.HasPassowrdField {
+		if payload.HasPasswordField {
 			m["password"] = loginDetails.Password
 		}
 	case "ak-stage-password":
 		m["password"] = loginDetails.Password
+
+	case "ak-stage-authenticator-validate":
+		m["code"] = loginDetails.MFAToken
 	default:
 		return []byte(""), errors.New("unknown component: " + component)
 	}
@@ -260,6 +263,9 @@ func prepareErrors(component string, errs map[string][]map[string]string) string
 	if field == "password" {
 		key = "password"
 	}
+	if field == "authenticator-validate" {
+		key = "code"
+	}
 	msgs := make([]string, 0, len(errs[key]))
 	for _, err := range errs[key] {
 		msgs = append(msgs, fmt.Sprintf("%s %s: %s", field, err["code"], err["string"]))