diff --git a/pam/integration-tests/native_test.go b/pam/integration-tests/native_test.go index 7494a3352..c25426be5 100644 --- a/pam/integration-tests/native_test.go +++ b/pam/integration-tests/native_test.go @@ -34,10 +34,11 @@ func TestNativeAuthenticate(t *testing.T) { }, "Authenticate user with mfa": { tape: "mfa_auth", - tapeSettings: []tapeSetting{{vhsHeight, 700}}, + tapeSettings: []tapeSetting{{vhsHeight, 800}}, }, "Authenticate user with form mode with button": { - tape: "form_with_button", + tape: "form_with_button", + tapeSettings: []tapeSetting{{vhsHeight, 600}}, }, "Authenticate user with qr code": { tape: "qr_code", @@ -46,7 +47,7 @@ func TestNativeAuthenticate(t *testing.T) { }, "Authenticate user with qr code in a TTY": { tape: "qr_code", - tapeSettings: []tapeSetting{{vhsHeight, 3500}}, + tapeSettings: []tapeSetting{{vhsHeight, 3700}}, clientOptions: clientOptions{ PamUser: "user-integration-qr-code-tty", Term: "linux", @@ -54,7 +55,7 @@ func TestNativeAuthenticate(t *testing.T) { }, "Authenticate user with qr code in a TTY session": { tape: "qr_code", - tapeSettings: []tapeSetting{{vhsHeight, 3500}}, + tapeSettings: []tapeSetting{{vhsHeight, 3700}}, clientOptions: clientOptions{ PamUser: "user-integration-qr-code-tty-session", Term: "xterm-256color", SessionType: "tty", @@ -62,7 +63,7 @@ func TestNativeAuthenticate(t *testing.T) { }, "Authenticate user with qr code in screen": { tape: "qr_code", - tapeSettings: []tapeSetting{{vhsHeight, 3500}}, + tapeSettings: []tapeSetting{{vhsHeight, 3700}}, clientOptions: clientOptions{ PamUser: "user-integration-qr-code-screen", Term: "screen", @@ -98,14 +99,14 @@ func TestNativeAuthenticate(t *testing.T) { }, "Authenticate user switching auth mode": { tape: "switch_auth_mode", - tapeSettings: []tapeSetting{{vhsHeight, 2350}}, + tapeSettings: []tapeSetting{{vhsHeight, 3000}}, }, "Authenticate user switching username": { tape: "switch_username", }, "Authenticate user switching to local broker": { tape: "switch_local_broker", - tapeSettings: []tapeSetting{{vhsHeight, 600}}, + tapeSettings: []tapeSetting{{vhsHeight, 700}}, }, "Authenticate user and add it to local group": { tape: "local_group", @@ -152,7 +153,8 @@ func TestNativeAuthenticate(t *testing.T) { }, "Deny authentication if max attempts reached": { - tape: "max_attempts", + tape: "max_attempts", + tapeSettings: []tapeSetting{{vhsHeight, 700}}, }, "Deny authentication if user does not exist": { tape: "unexistent_user", @@ -167,7 +169,7 @@ func TestNativeAuthenticate(t *testing.T) { "Prevent preset user from switching username": { tape: "switch_preset_username", - tapeSettings: []tapeSetting{{vhsHeight, 700}}, + tapeSettings: []tapeSetting{{vhsHeight, 800}}, clientOptions: clientOptions{PamUser: "user-integration-pam-preset"}, }, @@ -247,7 +249,7 @@ func TestNativeChangeAuthTok(t *testing.T) { }, "Change passwd after MFA auth": { tape: "passwd_mfa", - tapeSettings: []tapeSetting{{vhsHeight, 900}}, + tapeSettings: []tapeSetting{{vhsHeight, 1100}}, }, "Retry if new password is rejected by broker": { @@ -266,7 +268,8 @@ func TestNativeChangeAuthTok(t *testing.T) { }, "Prevent change password if auth fails": { - tape: "passwd_auth_fail", + tape: "passwd_auth_fail", + tapeSettings: []tapeSetting{{vhsHeight, 700}}, }, "Prevent change password if user does not exist": { tape: "passwd_unexistent_user", diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_accept_password_reset b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_accept_password_reset index 91d92d232..d90aa15e5 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_accept_password_reset +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_accept_password_reset @@ -3,52 +3,61 @@ Username: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-can-reset2 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-can-reset2 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-can-reset2 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-can-reset2 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 1 Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider @@ -57,17 +66,20 @@ Enter your new password (3 days until mandatory) (or enter 'r' to go back to cho ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-can-reset2 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 1 Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider @@ -78,17 +90,20 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-can-reset2 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 1 Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider @@ -102,17 +117,20 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-can-reset2 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 1 Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider @@ -127,17 +145,20 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-can-reset2 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 1 Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_add_it_to_local_group b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_add_it_to_local_group index 4bb913b09..ba78013d7 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_add_it_to_local_group +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_add_it_to_local_group @@ -6,30 +6,35 @@ Username: user-local-groups ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-local-groups -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-local-groups -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-local-groups -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -39,11 +44,13 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-local-groups -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_offer_password_reset b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_offer_password_reset index 62e9ff6f0..e3e0ada7f 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_offer_password_reset +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_offer_password_reset @@ -3,52 +3,61 @@ Username: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-can-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-can-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-can-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-can-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 2 PAM Authenticate() for user "user-can-reset" exited with success @@ -57,17 +66,20 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-can-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 2 PAM Authenticate() for user "user-can-reset" exited with success diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_reset_password_while_enforcing_policy b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_reset_password_while_enforcing_policy index 294b39a67..d770e5361 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_reset_password_while_enforcing_policy +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_reset_password_while_enforcing_policy @@ -3,30 +3,35 @@ Username: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -35,11 +40,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -50,11 +57,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -68,11 +77,13 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_on_ssh_service b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_on_ssh_service index 64f091fb0..5d6b87a73 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_on_ssh_service +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_on_ssh_service @@ -11,6 +11,7 @@ Choose your provider: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -21,6 +22,7 @@ Gimme your password: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -34,6 +36,7 @@ PAM AcctMgmt() exited with success 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_on_ssh_service_with_custom_name_and_auth_info_env b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_on_ssh_service_with_custom_name_and_auth_info_env index 0ef4469c5..e1b10a009 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_on_ssh_service_with_custom_name_and_auth_info_env +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_on_ssh_service_with_custom_name_and_auth_info_env @@ -11,6 +11,7 @@ Choose your provider: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -21,6 +22,7 @@ Gimme your password: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -34,6 +36,7 @@ PAM AcctMgmt() exited with success 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_on_ssh_service_with_custom_name_and_connection_env b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_on_ssh_service_with_custom_name_and_connection_env index 54c79e32c..0a94a5209 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_on_ssh_service_with_custom_name_and_connection_env +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_on_ssh_service_with_custom_name_and_connection_env @@ -11,6 +11,7 @@ Choose your provider: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -21,6 +22,7 @@ Gimme your password: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -34,6 +36,7 @@ PAM AcctMgmt() exited with success 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_successfully b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_successfully index 605be6760..9372a2848 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_successfully +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_successfully @@ -6,30 +6,35 @@ Username: user1 ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user1 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user1 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user1 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -39,11 +44,13 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user1 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_successfully_with_preset_user b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_successfully_with_preset_user index 5f7cd95ac..04860f266 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_successfully_with_preset_user +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_successfully_with_preset_user @@ -11,6 +11,7 @@ Choose your provider: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -21,6 +22,7 @@ Gimme your password: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -34,6 +36,7 @@ PAM AcctMgmt() exited with success 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_switching_auth_mode b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_switching_auth_mode index b47a5bdf7..4f65d4fb1 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_switching_auth_mode +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_switching_auth_mode @@ -6,34 +6,39 @@ Username: user-integration-switch-mode ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -42,20 +47,23 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -64,8 +72,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: @@ -73,15 +83,17 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -90,13 +102,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -105,20 +119,23 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -127,13 +144,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -142,8 +161,10 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: @@ -151,15 +172,17 @@ Plug your fido device and press with your thumb: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -168,13 +191,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -183,13 +208,15 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -198,20 +225,23 @@ Plug your fido device and press with your thumb: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -220,13 +250,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -235,13 +267,15 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -250,8 +284,10 @@ Plug your fido device and press with your thumb: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 4 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: @@ -259,15 +295,17 @@ Unlock your phone +33… or accept request on web interface: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -276,13 +314,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -291,13 +331,15 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -306,13 +348,15 @@ Plug your fido device and press with your thumb: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 4 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -321,20 +365,23 @@ Unlock your phone +33… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -343,13 +390,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -358,13 +407,15 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -373,13 +424,15 @@ Plug your fido device and press with your thumb: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 4 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -388,8 +441,10 @@ Unlock your phone +33… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 5 +== Use your phone +1… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +1… or accept request on web interface: @@ -397,15 +452,17 @@ Unlock your phone +1… or accept request on web interface: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -414,13 +471,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -429,13 +488,15 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -444,13 +505,15 @@ Plug your fido device and press with your thumb: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 4 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -459,13 +522,15 @@ Unlock your phone +33… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 5 +== Use your phone +1… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +1… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -474,20 +539,23 @@ Unlock your phone +1… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -496,13 +564,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -511,13 +581,15 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -526,13 +598,15 @@ Plug your fido device and press with your thumb: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 4 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -541,13 +615,15 @@ Unlock your phone +33… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 5 +== Use your phone +1… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +1… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -556,23 +632,27 @@ Unlock your phone +1… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 6 +== Pin code == Enter 'r' to cancel the request and go back to select the authentication method Enter your pin code: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -581,13 +661,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -596,13 +678,15 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -611,13 +695,15 @@ Plug your fido device and press with your thumb: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 4 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -626,13 +712,15 @@ Unlock your phone +33… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 5 +== Use your phone +1… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +1… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -641,12 +729,14 @@ Unlock your phone +1… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 6 +== Pin code == Enter 'r' to cancel the request and go back to select the authentication method Enter your pin code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -655,20 +745,23 @@ Enter your pin code: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -677,13 +770,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -692,13 +787,15 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -707,13 +804,15 @@ Plug your fido device and press with your thumb: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 4 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -722,13 +821,15 @@ Unlock your phone +33… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 5 +== Use your phone +1… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +1… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -737,12 +838,14 @@ Unlock your phone +1… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 6 +== Pin code == Enter 'r' to cancel the request and go back to select the authentication method Enter your pin code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -751,8 +854,10 @@ Enter your pin code: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -774,23 +879,25 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -799,13 +906,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -814,13 +923,15 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -829,13 +940,15 @@ Plug your fido device and press with your thumb: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 4 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -844,13 +957,15 @@ Unlock your phone +33… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 5 +== Use your phone +1… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +1… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -859,12 +974,14 @@ Unlock your phone +1… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 6 +== Pin code == Enter 'r' to cancel the request and go back to select the authentication method Enter your pin code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -873,8 +990,10 @@ Enter your pin code: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -896,12 +1015,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -910,20 +1029,23 @@ Choose action: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -932,13 +1054,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -947,13 +1071,15 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -962,13 +1088,15 @@ Plug your fido device and press with your thumb: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 4 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -977,13 +1105,15 @@ Unlock your phone +33… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 5 +== Use your phone +1… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +1… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -992,12 +1122,14 @@ Unlock your phone +1… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 6 +== Pin code == Enter 'r' to cancel the request and go back to select the authentication method Enter your pin code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1006,8 +1138,10 @@ Enter your pin code: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -1029,12 +1163,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1043,25 +1177,29 @@ Choose action: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1070,13 +1208,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1085,13 +1225,15 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1100,13 +1242,15 @@ Plug your fido device and press with your thumb: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 4 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1115,13 +1259,15 @@ Unlock your phone +33… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 5 +== Use your phone +1… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +1… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1130,12 +1276,14 @@ Unlock your phone +1… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 6 +== Pin code == Enter 'r' to cancel the request and go back to select the authentication method Enter your pin code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1144,8 +1292,10 @@ Enter your pin code: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -1167,12 +1317,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1181,14 +1331,16 @@ Choose action: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1197,20 +1349,23 @@ Choose action: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1219,13 +1374,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1234,13 +1391,15 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1249,13 +1408,15 @@ Plug your fido device and press with your thumb: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 4 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1264,13 +1425,15 @@ Unlock your phone +33… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 5 +== Use your phone +1… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +1… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1279,12 +1442,14 @@ Unlock your phone +1… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 6 +== Pin code == Enter 'r' to cancel the request and go back to select the authentication method Enter your pin code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1293,8 +1458,10 @@ Enter your pin code: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -1316,12 +1483,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1330,14 +1497,16 @@ Choose action: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1346,28 +1515,26 @@ Choose action: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > invalid-selection PAM Error Message: Provided input can't be parsed as integer value -== Authentication method selection (enter 'r' to go back to choose the provider) == - 1. Password authentication - 2. Send URL to user-integration-switch-mode@gmail.com - 3. Use your fido device foo - 4. Use your phone +33… - 5. Use your phone +1… - 6. Pin code +Choose your authentication method: +> ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1376,13 +1543,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1391,13 +1560,15 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1406,13 +1577,15 @@ Plug your fido device and press with your thumb: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 4 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1421,13 +1594,15 @@ Unlock your phone +33… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 5 +== Use your phone +1… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +1… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1436,12 +1611,14 @@ Unlock your phone +1… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 6 +== Pin code == Enter 'r' to cancel the request and go back to select the authentication method Enter your pin code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1450,8 +1627,10 @@ Enter your pin code: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -1473,12 +1652,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1487,14 +1666,16 @@ Choose action: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1503,28 +1684,39 @@ Choose action: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > invalid-selection PAM Error Message: Provided input can't be parsed as integer value -== Authentication method selection (enter 'r' to go back to choose the provider) == +Choose your authentication method: +> -1 +PAM Error Message: Invalid entry. Try again or input 'r'. +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo 4. Use your phone +33… 5. Use your phone +1… 6. Pin code + 7. Use a QR code + 8. Authentication code +Or enter 'r' to go back to choose the provider +Choose your authentication method: +> ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1533,13 +1725,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1548,13 +1742,15 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1563,13 +1759,15 @@ Plug your fido device and press with your thumb: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 4 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1578,13 +1776,15 @@ Unlock your phone +33… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 5 +== Use your phone +1… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +1… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1593,12 +1793,14 @@ Unlock your phone +1… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 6 +== Pin code == Enter 'r' to cancel the request and go back to select the authentication method Enter your pin code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1607,8 +1809,10 @@ Enter your pin code: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -1630,12 +1834,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1644,14 +1848,16 @@ Choose action: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1660,28 +1866,43 @@ Choose action: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > invalid-selection PAM Error Message: Provided input can't be parsed as integer value -== Authentication method selection (enter 'r' to go back to choose the provider) == +Choose your authentication method: +> -1 +PAM Error Message: Invalid entry. Try again or input 'r'. +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo 4. Use your phone +33… 5. Use your phone +1… 6. Pin code + 7. Use a QR code + 8. Authentication code +Or enter 'r' to go back to choose the provider +Choose your authentication method: +> 6 +== Pin code == +Enter 'r' to cancel the request and go back to select the authentication method +Enter your pin code: +> ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1690,13 +1911,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1705,13 +1928,15 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1720,13 +1945,15 @@ Plug your fido device and press with your thumb: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 4 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1735,13 +1962,15 @@ Unlock your phone +33… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 5 +== Use your phone +1… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +1… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1750,12 +1979,14 @@ Unlock your phone +1… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 6 +== Pin code == Enter 'r' to cancel the request and go back to select the authentication method Enter your pin code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1764,8 +1995,10 @@ Enter your pin code: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -1787,12 +2020,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1801,14 +2034,16 @@ Choose action: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1817,28 +2052,46 @@ Choose action: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > invalid-selection PAM Error Message: Provided input can't be parsed as integer value -== Authentication method selection (enter 'r' to go back to choose the provider) == +Choose your authentication method: +> -1 +PAM Error Message: Invalid entry. Try again or input 'r'. +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo 4. Use your phone +33… 5. Use your phone +1… 6. Pin code + 7. Use a QR code + 8. Authentication code +Or enter 'r' to go back to choose the provider +Choose your authentication method: +> 6 +== Pin code == +Enter 'r' to cancel the request and go back to select the authentication method +Enter your pin code: +> 4242 +PAM Authenticate() for user "user-integration-switch-mode" exited with success +PAM AcctMgmt() exited with success +> ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1847,13 +2100,15 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 +== Send URL to user-integration-switch-mode@gmail.com == Leave the input field empty to wait for the alternative authentication method or enter 'r' to go back to select the authentication method Click on the link received at user-integration-switch-mode@gmail.com or enter the code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1862,13 +2117,15 @@ Click on the link received at user-integration-switch-mode@gmail.com or enter th 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 3 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1877,13 +2134,15 @@ Plug your fido device and press with your thumb: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 4 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1892,13 +2151,15 @@ Unlock your phone +33… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 5 +== Use your phone +1… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +1… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1907,12 +2168,14 @@ Unlock your phone +1… or accept request on web interface: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 6 +== Pin code == Enter 'r' to cancel the request and go back to select the authentication method Enter your pin code: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1921,8 +2184,10 @@ Enter your pin code: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -1944,12 +2209,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1958,14 +2223,16 @@ Choose action: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo @@ -1974,14 +2241,30 @@ Choose action: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > invalid-selection PAM Error Message: Provided input can't be parsed as integer value -== Authentication method selection (enter 'r' to go back to choose the provider) == +Choose your authentication method: +> -1 +PAM Error Message: Invalid entry. Try again or input 'r'. +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-mode@gmail.com 3. Use your fido device foo 4. Use your phone +33… 5. Use your phone +1… 6. Pin code + 7. Use a QR code + 8. Authentication code +Or enter 'r' to go back to choose the provider +Choose your authentication method: +> 6 +== Pin code == +Enter 'r' to cancel the request and go back to select the authentication method +Enter your pin code: +> 4242 +PAM Authenticate() for user "user-integration-switch-mode" exited with success +PAM AcctMgmt() exited with success +> ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_switching_to_local_broker b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_switching_to_local_broker index 0f8aef863..2d7cba8f7 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_switching_to_local_broker +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_switching_to_local_broker @@ -3,34 +3,39 @@ Username: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-broker -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-broker -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-broker -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-broker@gmail.com 3. Use your fido device foo @@ -39,20 +44,23 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-broker -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-broker@gmail.com 3. Use your fido device foo @@ -61,25 +69,29 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > r -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-broker -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-broker@gmail.com 3. Use your fido device foo @@ -88,31 +100,32 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > r -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > invalid-ID PAM Error Message: Provided input can't be parsed as integer value -== Provider selection (enter 'r' to go back to user selection) == - 1. local - 2. ExampleBroker Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-broker -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-broker@gmail.com 3. Use your fido device foo @@ -121,37 +134,39 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > r -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > invalid-ID PAM Error Message: Provided input can't be parsed as integer value -== Provider selection (enter 'r' to go back to user selection) == - 1. local - 2. ExampleBroker Choose your provider: > 555 PAM Error Message: Invalid entry. Try again or input 'r'. -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-broker -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-broker@gmail.com 3. Use your fido device foo @@ -160,38 +175,44 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > r -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > invalid-ID PAM Error Message: Provided input can't be parsed as integer value -== Provider selection (enter 'r' to go back to user selection) == - 1. local - 2. ExampleBroker Choose your provider: > 555 PAM Error Message: Invalid entry. Try again or input 'r'. -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 1 auth=incomplete +PAM Authenticate() for user "user-integration-switch-broker" exited with error (PAM exit code: 2 +5): The return value should be ignored by PAM dispatch +PAM AcctMgmt() exited with error (PAM exit code: 26): Critical error - immediate abort +> ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-broker -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-switch-broker@gmail.com 3. Use your fido device foo @@ -200,24 +221,28 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > r -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > invalid-ID PAM Error Message: Provided input can't be parsed as integer value -== Provider selection (enter 'r' to go back to user selection) == - 1. local - 2. ExampleBroker Choose your provider: > 555 PAM Error Message: Invalid entry. Try again or input 'r'. -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 1 auth=incomplete +PAM Authenticate() for user "user-integration-switch-broker" exited with error (PAM exit code: 2 +5): The return value should be ignored by PAM dispatch +PAM AcctMgmt() exited with error (PAM exit code: 26): Critical error - immediate abort +> ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_switching_username b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_switching_username index 00e2e9b19..1477738fd 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_switching_username +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_switching_username @@ -6,74 +6,85 @@ Username: user-integration-switch-username ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-username -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-username -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > r Username: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-username -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > r Username: user-integration-username-switched ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-username -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > r Username: user-integration-username-switched -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-username -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > r Username: user-integration-username-switched -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-username -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > r Username: user-integration-username-switched -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -83,17 +94,20 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-switch-username -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > r Username: user-integration-username-switched -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_form_mode_with_button b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_form_mode_with_button index b66020743..93b0d455d 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_form_mode_with_button +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_form_mode_with_button @@ -3,34 +3,39 @@ Username: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-form-w-button -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-form-w-button -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-form-w-button -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-form-w-button@gmail.com 3. Use your fido device foo @@ -39,20 +44,23 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-form-w-button -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-form-w-button@gmail.com 3. Use your fido device foo @@ -61,25 +69,29 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-form-w-button -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-form-w-button@gmail.com 3. Use your fido device foo @@ -88,30 +100,35 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 2 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-form-w-button -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-form-w-button@gmail.com 3. Use your fido device foo @@ -120,31 +137,38 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 2 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 1 +== Authentication code == Enter 'r' to cancel the request and go back to select the authentication method +Enter your one time credential: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-form-w-button -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-form-w-button@gmail.com 3. Use your fido device foo @@ -153,31 +177,38 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 2 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 1 +== Authentication code == Enter 'r' to cancel the request and go back to select the authentication method +Enter your one time credential: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-form-w-button -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-form-w-button@gmail.com 3. Use your fido device foo @@ -186,17 +217,22 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 2 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 1 +== Authentication code == Enter 'r' to cancel the request and go back to select the authentication method +Enter your one time credential: ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_mfa b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_mfa index 6893b7242..67371c1af 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_mfa +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_mfa @@ -3,34 +3,39 @@ Username: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -39,20 +44,23 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -61,23 +69,27 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -86,11 +98,14 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: @@ -98,15 +113,17 @@ Plug your fido device and press with your thumb: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -115,33 +132,39 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -150,21 +173,26 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: @@ -172,15 +200,17 @@ Plug your fido device and press with your thumb: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -189,43 +219,51 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -234,45 +272,51 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 -Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth -od ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -281,45 +325,51 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 -Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth -od ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -328,45 +378,51 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 -Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth -od ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -375,45 +431,51 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 -Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth -od ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -422,31 +484,35 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 2 -Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth -od ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_mfa_and_reset_password_while_enforcing_policy b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_mfa_and_reset_password_while_enforcing_policy index bdcd65656..546d5cd8e 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_mfa_and_reset_password_while_enforcing_policy +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_mfa_and_reset_password_while_enforcing_policy @@ -6,52 +6,61 @@ Username: user-mfa-with-reset ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa-with-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa-with-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa-with-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa-with-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa-with-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: @@ -59,41 +68,49 @@ Plug your fido device and press with your thumb: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa-with-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa-with-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 1 Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider @@ -102,21 +119,25 @@ Enter your new password (3 days until mandatory) (or enter 'r' to go back to cho ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa-with-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 1 Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider @@ -129,21 +150,25 @@ Enter your new password (3 days until mandatory) (or enter 'r' to go back to cho ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa-with-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 1 Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider @@ -155,26 +180,28 @@ Enter your new password (3 days until mandatory) (or enter 'r' to go back to cho > PAM Error Message: The password fails the dictionary check - it is based on a dictionary word Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider -): -> ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa-with-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 1 Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider @@ -186,28 +213,28 @@ Enter your new password (3 days until mandatory) (or enter 'r' to go back to cho > PAM Error Message: The password fails the dictionary check - it is based on a dictionary word Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider -): -> -PAM Error Message: The password is the same as the old one -Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa-with-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 1 Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider @@ -219,28 +246,28 @@ Enter your new password (3 days until mandatory) (or enter 'r' to go back to cho > PAM Error Message: The password fails the dictionary check - it is based on a dictionary word Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider -): -> -PAM Error Message: The password is the same as the old one -Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa-with-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 1 Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider @@ -252,28 +279,28 @@ Enter your new password (3 days until mandatory) (or enter 'r' to go back to cho > PAM Error Message: The password fails the dictionary check - it is based on a dictionary word Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider -): -> -PAM Error Message: The password is the same as the old one -Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa-with-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 1 Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider @@ -285,28 +312,28 @@ Enter your new password (3 days until mandatory) (or enter 'r' to go back to cho > PAM Error Message: The password fails the dictionary check - it is based on a dictionary word Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider -): -> -PAM Error Message: The password is the same as the old one -Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa-with-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 1 Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider @@ -318,28 +345,28 @@ Enter your new password (3 days until mandatory) (or enter 'r' to go back to cho > PAM Error Message: The password fails the dictionary check - it is based on a dictionary word Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider -): -> -PAM Error Message: The password is the same as the old one -Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa-with-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 1 Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider @@ -351,28 +378,28 @@ Enter your new password (3 days until mandatory) (or enter 'r' to go back to cho > PAM Error Message: The password fails the dictionary check - it is based on a dictionary word Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider -): -> -PAM Error Message: The password is the same as the old one -Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-mfa-with-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > -== Password Update (enter 'r' to go back to choose the provider) == +== Password Update == 1. Proceed with password update 2. Skip +Or enter 'r' to go back to choose the provider Choose action: > 1 Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider @@ -384,8 +411,4 @@ Enter your new password (3 days until mandatory) (or enter 'r' to go back to cho > PAM Error Message: The password fails the dictionary check - it is based on a dictionary word Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider -): -> -PAM Error Message: The password is the same as the old one -Enter your new password (3 days until mandatory) (or enter 'r' to go back to choose the provider ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code index bf00270f5..fc1de4a7a 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code @@ -12,6 +12,7 @@ Choose your provider: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -23,10 +24,11 @@ Gimme your password: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code@gmail.com 3. Use your fido device foo @@ -35,6 +37,7 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── @@ -45,10 +48,11 @@ Choose your authentication method: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code@gmail.com 3. Use your fido device foo @@ -57,8 +61,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -80,9 +86,9 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -93,10 +99,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code@gmail.com 3. Use your fido device foo @@ -105,8 +112,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -128,11 +137,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -154,9 +164,9 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -167,10 +177,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code@gmail.com 3. Use your fido device foo @@ -179,8 +190,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -202,11 +215,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -228,11 +242,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████████ █████████████████████████████████████ @@ -256,9 +271,9 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -269,10 +284,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code@gmail.com 3. Use your fido device foo @@ -281,8 +297,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -304,11 +322,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -330,11 +349,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████████ █████████████████████████████████████ @@ -358,11 +378,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -384,9 +405,9 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -397,10 +418,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code@gmail.com 3. Use your fido device foo @@ -409,8 +431,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -432,11 +456,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -458,11 +483,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████████ █████████████████████████████████████ @@ -486,11 +512,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -512,11 +539,12 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -535,13 +563,6 @@ Scan the qrcode or enter the code in the login page ████▄▄▄▄▄▄▄█▄█▄█▄█▄████▄▄▄▄▄▄████ █████████████████████████████████ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ - https://ubuntu.com - 1341 - -== Qr Code authentication (enter 'r' to go back to select the authentication method) == - 1. Wait for the QR code scan result - 2. Regenerate code -Choose action: ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true @@ -550,10 +571,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code@gmail.com 3. Use your fido device foo @@ -562,8 +584,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -585,11 +609,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -611,11 +636,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████████ █████████████████████████████████████ @@ -639,11 +665,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -665,11 +692,12 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -688,13 +716,6 @@ Scan the qrcode or enter the code in the login page ████▄▄▄▄▄▄▄█▄█▄█▄█▄████▄▄▄▄▄▄████ █████████████████████████████████ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ - https://ubuntu.com - 1341 - -== Qr Code authentication (enter 'r' to go back to select the authentication method) == - 1. Wait for the QR code scan result - 2. Regenerate code -Choose action: ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true @@ -703,10 +724,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code@gmail.com 3. Use your fido device foo @@ -715,8 +737,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -738,11 +762,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -764,11 +789,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████████ █████████████████████████████████████ @@ -792,11 +818,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -818,11 +845,12 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -841,13 +869,6 @@ Scan the qrcode or enter the code in the login page ████▄▄▄▄▄▄▄█▄█▄█▄█▄████▄▄▄▄▄▄████ █████████████████████████████████ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ - https://ubuntu.com - 1341 - -== Qr Code authentication (enter 'r' to go back to select the authentication method) == - 1. Wait for the QR code scan result - 2. Regenerate code -Choose action: ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true @@ -856,10 +877,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code@gmail.com 3. Use your fido device foo @@ -868,8 +890,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -891,11 +915,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -917,11 +942,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████████ █████████████████████████████████████ @@ -945,11 +971,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -971,11 +998,12 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page █████████████████████████████████ █████████████████████████████████ @@ -994,11 +1022,4 @@ Scan the qrcode or enter the code in the login page ████▄▄▄▄▄▄▄█▄█▄█▄█▄████▄▄▄▄▄▄████ █████████████████████████████████ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ - https://ubuntu.com - 1341 - -== Qr Code authentication (enter 'r' to go back to select the authentication method) == - 1. Wait for the QR code scan result - 2. Regenerate code -Choose action: ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty index 33c5ea796..fbb1064a5 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty @@ -12,6 +12,7 @@ Choose your provider: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -23,10 +24,11 @@ Gimme your password: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty@gmail.com 3. Use your fido device foo @@ -35,6 +37,7 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── @@ -45,10 +48,11 @@ Choose your authentication method: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty@gmail.com 3. Use your fido device foo @@ -57,8 +61,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -96,9 +102,9 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -109,10 +115,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty@gmail.com 3. Use your fido device foo @@ -121,8 +128,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -160,11 +169,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -202,9 +212,9 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -215,10 +225,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty@gmail.com 3. Use your fido device foo @@ -227,8 +238,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -266,11 +279,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -308,11 +322,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -354,9 +369,9 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -367,10 +382,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty@gmail.com 3. Use your fido device foo @@ -379,8 +395,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -418,11 +436,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -460,11 +479,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -506,11 +526,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -548,9 +569,9 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -561,10 +582,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty@gmail.com 3. Use your fido device foo @@ -573,8 +595,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -612,11 +636,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -654,11 +679,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -700,11 +726,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -742,11 +769,12 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -784,8 +812,11 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result + 2. Regenerate code +Or enter 'r' to go back to select the authentication method +Choose action: +> ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true @@ -794,10 +825,11 @@ Scan the qrcode or enter the code in the login page 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty@gmail.com 3. Use your fido device foo @@ -806,8 +838,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -845,11 +879,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -887,11 +922,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -933,11 +969,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -975,11 +1012,12 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1017,8 +1055,11 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result + 2. Regenerate code +Or enter 'r' to go back to select the authentication method +Choose action: +> 1 ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true @@ -1027,10 +1068,11 @@ Scan the qrcode or enter the code in the login page 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty@gmail.com 3. Use your fido device foo @@ -1039,8 +1081,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1078,11 +1122,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1120,11 +1165,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -1166,11 +1212,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1208,11 +1255,12 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1250,8 +1298,14 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result + 2. Regenerate code +Or enter 'r' to go back to select the authentication method +Choose action: +> 1 +PAM Authenticate() for user "user-integration-qr-code-tty" exited with success +PAM AcctMgmt() exited with success +> ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true @@ -1260,10 +1314,11 @@ Scan the qrcode or enter the code in the login page 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty@gmail.com 3. Use your fido device foo @@ -1272,8 +1327,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1311,11 +1368,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1353,11 +1411,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -1399,11 +1458,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1441,11 +1501,12 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1483,6 +1544,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result + 2. Regenerate code +Or enter 'r' to go back to select the authentication method +Choose action: +> 1 +PAM Authenticate() for user "user-integration-qr-code-tty" exited with success +PAM AcctMgmt() exited with success +> ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty_session b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty_session index d62409b71..66cc594e7 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty_session +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty_session @@ -12,6 +12,7 @@ Choose your provider: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -23,10 +24,11 @@ Gimme your password: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty-session@gmail.com 3. Use your fido device foo @@ -35,6 +37,7 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── @@ -45,10 +48,11 @@ Choose your authentication method: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty-session@gmail.com 3. Use your fido device foo @@ -57,8 +61,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -96,9 +102,9 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -109,10 +115,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty-session@gmail.com 3. Use your fido device foo @@ -121,8 +128,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -160,11 +169,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -202,9 +212,9 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -215,10 +225,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty-session@gmail.com 3. Use your fido device foo @@ -227,8 +238,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -266,11 +279,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -308,11 +322,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -354,9 +369,9 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -367,10 +382,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty-session@gmail.com 3. Use your fido device foo @@ -379,8 +395,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -418,11 +436,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -460,11 +479,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -506,11 +526,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -548,9 +569,9 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -561,10 +582,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty-session@gmail.com 3. Use your fido device foo @@ -573,8 +595,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -612,11 +636,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -654,11 +679,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -700,11 +726,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -742,11 +769,12 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -784,8 +812,11 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result + 2. Regenerate code +Or enter 'r' to go back to select the authentication method +Choose action: +> ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true @@ -794,10 +825,11 @@ Scan the qrcode or enter the code in the login page 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty-session@gmail.com 3. Use your fido device foo @@ -806,8 +838,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -845,11 +879,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -887,11 +922,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -933,11 +969,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -975,11 +1012,12 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1017,8 +1055,11 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result + 2. Regenerate code +Or enter 'r' to go back to select the authentication method +Choose action: +> 1 ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true @@ -1027,10 +1068,11 @@ Scan the qrcode or enter the code in the login page 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty-session@gmail.com 3. Use your fido device foo @@ -1039,8 +1081,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1078,11 +1122,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1120,11 +1165,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -1166,11 +1212,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1208,11 +1255,12 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1250,8 +1298,14 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result + 2. Regenerate code +Or enter 'r' to go back to select the authentication method +Choose action: +> 1 +PAM Authenticate() for user "user-integration-qr-code-tty-session" exited with success +PAM AcctMgmt() exited with success +> ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true @@ -1260,10 +1314,11 @@ Scan the qrcode or enter the code in the login page 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-tty-session@gmail.com 3. Use your fido device foo @@ -1272,8 +1327,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1311,11 +1368,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1353,11 +1411,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -1399,11 +1458,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1441,11 +1501,12 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1483,6 +1544,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result + 2. Regenerate code +Or enter 'r' to go back to select the authentication method +Choose action: +> 1 +PAM Authenticate() for user "user-integration-qr-code-tty-session" exited with success +PAM AcctMgmt() exited with success +> ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_polkit b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_polkit index ae5c76034..32c280f39 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_polkit +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_polkit @@ -12,6 +12,7 @@ Choose your provider: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -23,10 +24,11 @@ Gimme your password: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-polkit@gmail.com 3. Use your fido device foo @@ -35,6 +37,7 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── @@ -45,10 +48,11 @@ Choose your authentication method: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-polkit@gmail.com 3. Use your fido device foo @@ -57,15 +61,17 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -76,10 +82,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-polkit@gmail.com 3. Use your fido device foo @@ -88,24 +95,27 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -116,10 +126,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-polkit@gmail.com 3. Use your fido device foo @@ -128,33 +139,37 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -165,10 +180,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-polkit@gmail.com 3. Use your fido device foo @@ -177,42 +193,47 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -223,10 +244,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-polkit@gmail.com 3. Use your fido device foo @@ -235,51 +257,57 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -290,10 +318,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-polkit@gmail.com 3. Use your fido device foo @@ -302,51 +331,57 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 1 ──────────────────────────────────────────────────────────────────────────────── @@ -357,10 +392,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-polkit@gmail.com 3. Use your fido device foo @@ -369,51 +405,57 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 1 PAM Authenticate() for user "user-integration-qr-code-polkit" exited with success @@ -427,10 +469,11 @@ PAM AcctMgmt() exited with success 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-polkit@gmail.com 3. Use your fido device foo @@ -439,51 +482,57 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 1 PAM Authenticate() for user "user-integration-qr-code-polkit" exited with success diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_screen b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_screen index 8b87406c0..47d7066ce 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_screen +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_screen @@ -12,6 +12,7 @@ Choose your provider: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -23,10 +24,11 @@ Gimme your password: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-screen@gmail.com 3. Use your fido device foo @@ -35,6 +37,7 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── @@ -45,10 +48,11 @@ Choose your authentication method: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-screen@gmail.com 3. Use your fido device foo @@ -57,8 +61,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -96,9 +102,9 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -109,10 +115,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-screen@gmail.com 3. Use your fido device foo @@ -121,8 +128,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -160,11 +169,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -202,9 +212,9 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -215,10 +225,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-screen@gmail.com 3. Use your fido device foo @@ -227,8 +238,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -266,11 +279,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -308,11 +322,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -354,9 +369,9 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -367,10 +382,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-screen@gmail.com 3. Use your fido device foo @@ -379,8 +395,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -418,11 +436,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -460,11 +479,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -506,11 +526,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -548,9 +569,9 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -561,10 +582,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-screen@gmail.com 3. Use your fido device foo @@ -573,8 +595,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -612,11 +636,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -654,11 +679,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -700,11 +726,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -742,11 +769,12 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -784,8 +812,11 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result + 2. Regenerate code +Or enter 'r' to go back to select the authentication method +Choose action: +> ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true @@ -794,10 +825,11 @@ Scan the qrcode or enter the code in the login page 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-screen@gmail.com 3. Use your fido device foo @@ -806,8 +838,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -845,11 +879,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -887,11 +922,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -933,11 +969,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -975,11 +1012,12 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1017,8 +1055,11 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result + 2. Regenerate code +Or enter 'r' to go back to select the authentication method +Choose action: +> 1 ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true @@ -1027,10 +1068,11 @@ Scan the qrcode or enter the code in the login page 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-screen@gmail.com 3. Use your fido device foo @@ -1039,8 +1081,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1078,11 +1122,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1120,11 +1165,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -1166,11 +1212,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1208,11 +1255,12 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1250,8 +1298,14 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result + 2. Regenerate code +Or enter 'r' to go back to select the authentication method +Choose action: +> 1 +PAM Authenticate() for user "user-integration-qr-code-screen" exited with success +PAM AcctMgmt() exited with success +> ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true @@ -1260,10 +1314,11 @@ Scan the qrcode or enter the code in the login page 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-qr-code-screen@gmail.com 3. Use your fido device foo @@ -1272,8 +1327,10 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1311,11 +1368,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1353,11 +1411,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████████████ @@ -1399,11 +1458,12 @@ Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1441,11 +1501,12 @@ Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ ██████████████████████████████████████████████████████████████████ @@ -1483,6 +1544,12 @@ Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result + 2. Regenerate code +Or enter 'r' to go back to select the authentication method +Choose action: +> 1 +PAM Authenticate() for user "user-integration-qr-code-screen" exited with success +PAM AcctMgmt() exited with success +> ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_ssh b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_ssh index d0d4ed6b5..72a2e620f 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_ssh +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_ssh @@ -12,6 +12,7 @@ Choose your provider: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -23,10 +24,11 @@ Gimme your password: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-pre-check-ssh-service-qr-code@gmail.com 3. Use your fido device foo @@ -35,6 +37,7 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── @@ -45,10 +48,11 @@ Choose your authentication method: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-pre-check-ssh-service-qr-code@gmail.com 3. Use your fido device foo @@ -57,15 +61,17 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -76,10 +82,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-pre-check-ssh-service-qr-code@gmail.com 3. Use your fido device foo @@ -88,24 +95,27 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -116,10 +126,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-pre-check-ssh-service-qr-code@gmail.com 3. Use your fido device foo @@ -128,33 +139,37 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -165,10 +180,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-pre-check-ssh-service-qr-code@gmail.com 3. Use your fido device foo @@ -177,42 +193,47 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -223,10 +244,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-pre-check-ssh-service-qr-code@gmail.com 3. Use your fido device foo @@ -235,51 +257,57 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── @@ -290,10 +318,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-pre-check-ssh-service-qr-code@gmail.com 3. Use your fido device foo @@ -302,51 +331,57 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 1 ──────────────────────────────────────────────────────────────────────────────── @@ -357,10 +392,11 @@ Choose action: 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-pre-check-ssh-service-qr-code@gmail.com 3. Use your fido device foo @@ -369,51 +405,57 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 1 PAM Authenticate() for user "user-integration-pre-check-ssh-service-qr-code" exited with success @@ -427,10 +469,11 @@ PAM AcctMgmt() exited with success 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-pre-check-ssh-service-qr-code@gmail.com 3. Use your fido device foo @@ -439,51 +482,57 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 7 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1337 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.fr/ 1338 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntuforum-br.org/ 1339 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://www.ubuntu-it.org/ 1340 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 2 +== Qr Code authentication == Scan the qrcode or enter the code in the login page https://ubuntu.com 1341 -== Qr Code authentication (enter 'r' to go back to select the authentication method) == 1. Wait for the QR code scan result 2. Regenerate code +Or enter 'r' to go back to select the authentication method Choose action: > 1 PAM Authenticate() for user "user-integration-pre-check-ssh-service-qr-code" exited with success diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_with_warnings_on_unsupported_arguments b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_with_warnings_on_unsupported_arguments index b58373509..1e2d7b1f4 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_with_warnings_on_unsupported_arguments +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_with_warnings_on_unsupported_arguments @@ -9,20 +9,23 @@ Username: user2 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} invalid_flag=foo force_nat ive_client=true bar Username: user2 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} invalid_flag=foo force_nat ive_client=true bar Username: user2 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -30,11 +33,13 @@ Gimme your password: > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} invalid_flag=foo force_nat ive_client=true bar Username: user2 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -45,11 +50,13 @@ PAM AcctMgmt() exited with success > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} invalid_flag=foo force_nat ive_client=true bar Username: user2 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/deny_authentication_if_max_attempts_reached b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/deny_authentication_if_max_attempts_reached index d724ab680..8aaa0071f 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/deny_authentication_if_max_attempts_reached +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/deny_authentication_if_max_attempts_reached @@ -6,130 +6,157 @@ Username: user-integration-max-attempts ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-max-attempts -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-max-attempts -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-max-attempts -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-max-attempts -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-max-attempts -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-max-attempts -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-max-attempts -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -139,30 +166,37 @@ PAM Authenticate() for user "user-integration-max-attempts" exited with error (P acct=incomplete PAM AcctMgmt() exited with error (PAM exit code: 25): The return value should be ignored by PAM dispatch +> ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-max-attempts -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -172,4 +206,5 @@ PAM Authenticate() for user "user-integration-max-attempts" exited with error (P acct=incomplete PAM AcctMgmt() exited with error (PAM exit code: 25): The return value should be ignored by PAM dispatch +> ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/deny_authentication_if_newpassword_does_not_match_required_criteria b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/deny_authentication_if_newpassword_does_not_match_required_criteria index 3379633ea..1421d0a4b 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/deny_authentication_if_newpassword_does_not_match_required_criteria +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/deny_authentication_if_newpassword_does_not_match_required_criteria @@ -6,30 +6,35 @@ Username: user-needs-reset ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -38,11 +43,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -54,11 +61,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -73,11 +82,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -95,11 +106,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -119,11 +132,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -146,11 +161,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -176,11 +193,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -208,11 +227,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -243,11 +264,13 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-needs-reset -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/deny_authentication_if_user_does_not_exist b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/deny_authentication_if_user_does_not_exist index a423318e7..673a20592 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/deny_authentication_if_user_does_not_exist +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/deny_authentication_if_user_does_not_exist @@ -6,17 +6,19 @@ Username: user-unexistent ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-unexistent -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-unexistent -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 PAM Error Message: can't select broker: user "user-unexistent" does not exist @@ -28,9 +30,10 @@ dispatch ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-unexistent -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 PAM Error Message: can't select broker: user "user-unexistent" does not exist diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/deny_authentication_if_user_does_not_exist_and_matches_cancel_key b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/deny_authentication_if_user_does_not_exist_and_matches_cancel_key index 50f043741..4faa5fb89 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/deny_authentication_if_user_does_not_exist_and_matches_cancel_key +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/deny_authentication_if_user_does_not_exist_and_matches_cancel_key @@ -6,30 +6,35 @@ Username: r ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: r -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: r -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: r -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -42,11 +47,13 @@ dispatch ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: r -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/exit_authd_if_local_broker_is_selected b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/exit_authd_if_local_broker_is_selected index 6d8bd341d..f7ac441f1 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/exit_authd_if_local_broker_is_selected +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/exit_authd_if_local_broker_is_selected @@ -6,17 +6,19 @@ Username: user-local-broker ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-local-broker -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-local-broker -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 1 auth=incomplete @@ -27,9 +29,10 @@ PAM AcctMgmt() exited with error (PAM exit code: 26): Critical error - immediate ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-local-broker -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 1 auth=incomplete diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/exit_authd_if_user_sigints b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/exit_authd_if_user_sigints index 9c38bbf41..0dc25d31b 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/exit_authd_if_user_sigints +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/exit_authd_if_user_sigints @@ -6,30 +6,35 @@ Username: user-integration-sigint ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-sigint -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-sigint -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-sigint -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -37,11 +42,13 @@ Gimme your password: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-sigint -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/prevent_preset_user_from_switching_username b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/prevent_preset_user_from_switching_username index 10ef75371..837389893 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/prevent_preset_user_from_switching_username +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/prevent_preset_user_from_switching_username @@ -12,9 +12,6 @@ Choose your provider: Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── @@ -25,11 +22,9 @@ Choose your provider: Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -41,15 +36,13 @@ Gimme your password: Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-pam-preset@gmail.com 3. Use your fido device foo @@ -58,6 +51,7 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── @@ -68,15 +62,13 @@ Choose your authentication method: Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-pam-preset@gmail.com 3. Use your fido device foo @@ -85,6 +77,7 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > r == Provider selection == @@ -100,15 +93,13 @@ Choose your provider: Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-pam-preset@gmail.com 3. Use your fido device foo @@ -117,6 +108,7 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > r == Provider selection == @@ -125,9 +117,6 @@ Choose your authentication method: Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── @@ -138,15 +127,13 @@ Choose your provider: Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-pam-preset@gmail.com 3. Use your fido device foo @@ -155,6 +142,7 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > r == Provider selection == @@ -163,15 +151,9 @@ Choose your authentication method: Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── @@ -182,15 +164,13 @@ Choose your provider: Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-pam-preset@gmail.com 3. Use your fido device foo @@ -199,6 +179,7 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > r == Provider selection == @@ -207,17 +188,12 @@ Choose your authentication method: Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -229,15 +205,13 @@ Gimme your password: Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-pam-preset@gmail.com 3. Use your fido device foo @@ -246,6 +220,7 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > r == Provider selection == @@ -254,20 +229,18 @@ Choose your authentication method: Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +PAM Authenticate() for user "user-integration-pam-preset" exited with success +PAM AcctMgmt() exited with success +> ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true == Provider selection == @@ -276,15 +249,13 @@ Gimme your password: Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-pam-preset@gmail.com 3. Use your fido device foo @@ -293,6 +264,7 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > r == Provider selection == @@ -301,18 +273,16 @@ Choose your authentication method: Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > r PAM Error Message: Provided input can't be parsed as integer value -== Provider selection == - 1. local - 2. ExampleBroker Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +PAM Authenticate() for user "user-integration-pam-preset" exited with success +PAM AcctMgmt() exited with success +> ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/remember_last_successful_broker_and_mode b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/remember_last_successful_broker_and_mode index 543d5d160..6f0d31958 100644 --- a/pam/integration-tests/testdata/TestNativeAuthenticate/golden/remember_last_successful_broker_and_mode +++ b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/remember_last_successful_broker_and_mode @@ -6,34 +6,39 @@ Username: user-integration-remember-mode ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-remember-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-remember-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-remember-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-remember-mode@gmail.com 3. Use your fido device foo @@ -42,20 +47,23 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-remember-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-remember-mode@gmail.com 3. Use your fido device foo @@ -64,25 +72,29 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-remember-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-remember-mode@gmail.com 3. Use your fido device foo @@ -91,28 +103,33 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 1 +== Authentication code == Enter 'r' to cancel the request and go back to select the authentication method Enter your one time credential: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-remember-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-remember-mode@gmail.com 3. Use your fido device foo @@ -121,13 +138,16 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 1 +== Authentication code == Enter 'r' to cancel the request and go back to select the authentication method Enter your one time credential: > temporary pass0 @@ -137,15 +157,17 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-remember-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-remember-mode@gmail.com 3. Use your fido device foo @@ -154,13 +176,16 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 1 +== Authentication code == Enter 'r' to cancel the request and go back to select the authentication method Enter your one time credential: > temporary pass0 @@ -171,15 +196,17 @@ Username: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-remember-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-remember-mode@gmail.com 3. Use your fido device foo @@ -188,13 +215,16 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 1 +== Authentication code == Enter 'r' to cancel the request and go back to select the authentication method Enter your one time credential: > temporary pass0 @@ -205,15 +235,17 @@ Username: user-integration-remember-mode ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-remember-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-remember-mode@gmail.com 3. Use your fido device foo @@ -222,13 +254,16 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 1 +== Authentication code == Enter 'r' to cancel the request and go back to select the authentication method Enter your one time credential: > temporary pass0 @@ -236,23 +271,26 @@ PAM Authenticate() for user "user-integration-remember-mode" exited with success PAM AcctMgmt() exited with success > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-remember-mode -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-remember-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-remember-mode@gmail.com 3. Use your fido device foo @@ -261,13 +299,16 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 1 +== Authentication code == Enter 'r' to cancel the request and go back to select the authentication method Enter your one time credential: > temporary pass0 @@ -275,26 +316,30 @@ PAM Authenticate() for user "user-integration-remember-mode" exited with success PAM AcctMgmt() exited with success > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-remember-mode -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 1 +== Authentication code == Enter 'r' to cancel the request and go back to select the authentication method Enter your one time credential: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-remember-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-remember-mode@gmail.com 3. Use your fido device foo @@ -303,13 +348,16 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 1 +== Authentication code == Enter 'r' to cancel the request and go back to select the authentication method Enter your one time credential: > temporary pass0 @@ -317,11 +365,13 @@ PAM Authenticate() for user "user-integration-remember-mode" exited with success PAM AcctMgmt() exited with success > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-remember-mode -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 1 +== Authentication code == Enter 'r' to cancel the request and go back to select the authentication method Enter your one time credential: > temporary pass0 @@ -331,15 +381,17 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-remember-mode -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-integration-remember-mode@gmail.com 3. Use your fido device foo @@ -348,13 +400,16 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 8 -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 1 +== Authentication code == Enter 'r' to cancel the request and go back to select the authentication method Enter your one time credential: > temporary pass0 @@ -362,11 +417,13 @@ PAM Authenticate() for user "user-integration-remember-mode" exited with success PAM AcctMgmt() exited with success > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true Username: user-integration-remember-mode -== Authentication code (enter 'r' to go back to select the authentication method) == +== Authentication code == 1. Proceed with Authentication code 2. Resend sms +Or enter 'r' to go back to select the authentication method Choose action: > 1 +== Authentication code == Enter 'r' to cancel the request and go back to select the authentication method Enter your one time credential: > temporary pass0 diff --git a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/change_passwd_after_mfa_auth b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/change_passwd_after_mfa_auth index a77134931..531149f48 100644 --- a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/change_passwd_after_mfa_auth +++ b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/change_passwd_after_mfa_auth @@ -6,34 +6,39 @@ Username: user-mfa ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -42,20 +47,23 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -64,23 +72,27 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -89,11 +101,14 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: @@ -101,15 +116,17 @@ Plug your fido device and press with your thumb: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -118,33 +135,39 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -153,21 +176,26 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: @@ -175,15 +203,17 @@ Plug your fido device and press with your thumb: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -192,21 +222,26 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: @@ -214,15 +249,17 @@ Plug your fido device and press with your thumb: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -231,25 +268,31 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: @@ -257,15 +300,17 @@ Unlock your phone +33… or accept request on web interface: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -274,46 +319,55 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your phone +33… 2. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -322,34 +376,42 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your phone +33… 2. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: @@ -357,15 +419,17 @@ Unlock your phone +33… or accept request on web interface: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -374,34 +438,42 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your phone +33… 2. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: @@ -409,15 +481,17 @@ Unlock your phone +33… or accept request on web interface: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -426,34 +500,42 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your phone +33… 2. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: @@ -463,15 +545,17 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -480,34 +564,42 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your phone +33… 2. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: @@ -519,15 +611,17 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -536,34 +630,42 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your phone +33… 2. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: @@ -575,15 +677,17 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -592,34 +696,42 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your phone +33… 2. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: @@ -634,15 +746,17 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-mfa -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Password authentication 2. Send URL to user-mfa@gmail.com 3. Use your fido device foo @@ -651,34 +765,42 @@ Gimme your password: 6. Pin code 7. Use a QR code 8. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your fido device foo 2. Use your phone +33… 3. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your fido device foo == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Plug your fido device and press with your thumb: > +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: > r -== Authentication method selection (enter 'r' to go back to choose the provider) == +== Authentication method selection == 1. Use your phone +33… 2. Authentication code +Or enter 'r' to go back to choose the provider Choose your authentication method: > 1 +== Use your phone +33… == Press Enter to wait for authentication or enter 'r' to go back to select the authentication meth od Unlock your phone +33… or accept request on web interface: diff --git a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/change_password_successfully_and_authenticate_with_new_one b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/change_password_successfully_and_authenticate_with_new_one index a36186963..d4d42462b 100644 --- a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/change_password_successfully_and_authenticate_with_new_one +++ b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/change_password_successfully_and_authenticate_with_new_one @@ -6,30 +6,35 @@ Username: user1 ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user1 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user1 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user1 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -38,11 +43,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user1 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -53,11 +60,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user1 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -68,11 +77,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user1 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -86,11 +97,13 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user1 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -105,11 +118,13 @@ Username: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user1 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -124,11 +139,13 @@ Username: user1 ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user1 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -140,17 +157,20 @@ PAM ChangeAuthTok() for user "user1" exited with success PAM AcctMgmt() exited with success > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user1 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -162,6 +182,7 @@ PAM ChangeAuthTok() for user "user1" exited with success PAM AcctMgmt() exited with success > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -171,11 +192,13 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user1 -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -187,6 +210,7 @@ PAM ChangeAuthTok() for user "user1" exited with success PAM AcctMgmt() exited with success > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user1 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/exit_authd_if_local_broker_is_selected b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/exit_authd_if_local_broker_is_selected index 8f9c23ac9..4f3b87c4b 100644 --- a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/exit_authd_if_local_broker_is_selected +++ b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/exit_authd_if_local_broker_is_selected @@ -6,17 +6,19 @@ Username: user-local-broker ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-local-broker -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-local-broker -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 1 chauthtok=incomplete @@ -27,9 +29,10 @@ PAM AcctMgmt() exited with error (PAM exit code: 26): Critical error - immediate ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-local-broker -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 1 chauthtok=incomplete diff --git a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/exit_authd_if_user_sigints b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/exit_authd_if_user_sigints index 557bfd839..3535ffe35 100644 --- a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/exit_authd_if_user_sigints +++ b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/exit_authd_if_user_sigints @@ -6,30 +6,35 @@ Username: user-integration-sigint ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-sigint -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-sigint -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-sigint -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -37,11 +42,13 @@ Gimme your password: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-sigint -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/prevent_change_password_if_auth_fails b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/prevent_change_password_if_auth_fails index b0e7ba166..72df04232 100644 --- a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/prevent_change_password_if_auth_fails +++ b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/prevent_change_password_if_auth_fails @@ -6,130 +6,157 @@ Username: user-integration-max-attempts ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-max-attempts -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-max-attempts -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-max-attempts -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-max-attempts -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-max-attempts -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-max-attempts -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-max-attempts -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -139,30 +166,37 @@ PAM ChangeAuthTok() for user "user-integration-max-attempts" exited with error ( acct=incomplete PAM AcctMgmt() exited with error (PAM exit code: 25): The return value should be ignored by PAM dispatch +> ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-max-attempts -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > PAM Error Message: invalid password 'wrongpass', should be 'goodpass' +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -172,4 +206,5 @@ PAM ChangeAuthTok() for user "user-integration-max-attempts" exited with error ( acct=incomplete PAM AcctMgmt() exited with error (PAM exit code: 25): The return value should be ignored by PAM dispatch +> ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/prevent_change_password_if_user_does_not_exist b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/prevent_change_password_if_user_does_not_exist index 5ab63649e..ce7b2ef08 100644 --- a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/prevent_change_password_if_user_does_not_exist +++ b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/prevent_change_password_if_user_does_not_exist @@ -6,17 +6,19 @@ Username: user-unexistent ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-unexistent -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-unexistent -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 PAM Error Message: can't select broker: user "user-unexistent" does not exist @@ -29,9 +31,10 @@ dispatch ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-unexistent -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 PAM Error Message: can't select broker: user "user-unexistent" does not exist diff --git a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/retry_if_new_password_does_not_match_quality_criteria b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/retry_if_new_password_does_not_match_quality_criteria index d5b5f4f25..45617abb6 100644 --- a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/retry_if_new_password_does_not_match_quality_criteria +++ b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/retry_if_new_password_does_not_match_quality_criteria @@ -6,30 +6,35 @@ Username: user-integration-bad-password ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-bad-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-bad-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-bad-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -38,11 +43,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-bad-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -54,11 +61,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-bad-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -73,11 +82,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-bad-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -95,11 +106,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-bad-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -119,11 +132,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-bad-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -146,11 +161,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-bad-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -176,11 +193,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-bad-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -208,11 +227,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-bad-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -243,11 +264,13 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-bad-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/retry_if_new_password_is_rejected_by_broker b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/retry_if_new_password_is_rejected_by_broker index c1c06d98e..a1836e55d 100644 --- a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/retry_if_new_password_is_rejected_by_broker +++ b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/retry_if_new_password_is_rejected_by_broker @@ -6,30 +6,35 @@ Username: user-integration-invalid-new-password ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -38,11 +43,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -53,11 +60,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -68,11 +77,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -86,11 +97,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -106,11 +119,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -129,11 +144,13 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -153,11 +170,13 @@ Username: ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -177,11 +196,13 @@ Username: user-integration-invalid-new-password ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -198,17 +219,20 @@ PAM ChangeAuthTok() for user "user-integration-invalid-new-password" exited with PAM AcctMgmt() exited with success > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -225,6 +249,7 @@ PAM ChangeAuthTok() for user "user-integration-invalid-new-password" exited with PAM AcctMgmt() exited with success > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -233,11 +258,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -254,6 +281,7 @@ PAM ChangeAuthTok() for user "user-integration-invalid-new-password" exited with PAM AcctMgmt() exited with success > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -264,11 +292,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -285,6 +315,7 @@ PAM ChangeAuthTok() for user "user-integration-invalid-new-password" exited with PAM AcctMgmt() exited with success > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -295,11 +326,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -316,6 +349,7 @@ PAM ChangeAuthTok() for user "user-integration-invalid-new-password" exited with PAM AcctMgmt() exited with success > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -329,11 +363,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -350,6 +386,7 @@ PAM ChangeAuthTok() for user "user-integration-invalid-new-password" exited with PAM AcctMgmt() exited with success > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -365,11 +402,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -386,6 +425,7 @@ PAM ChangeAuthTok() for user "user-integration-invalid-new-password" exited with PAM AcctMgmt() exited with success > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-invalid-new-password +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/retry_if_new_password_is_same_of_previous b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/retry_if_new_password_is_same_of_previous index 75035d532..55d599f7a 100644 --- a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/retry_if_new_password_is_same_of_previous +++ b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/retry_if_new_password_is_same_of_previous @@ -6,30 +6,35 @@ Username: user-integration-same-new-password ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-same-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-same-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-same-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -38,11 +43,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-same-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -51,11 +58,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-same-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -67,11 +76,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-same-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -85,11 +96,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-same-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -103,11 +116,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-same-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -124,11 +139,13 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-same-new-password -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/retry_if_password_confirmation_is_not_the_same b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/retry_if_password_confirmation_is_not_the_same index 2fb84d919..247fc3a4e 100644 --- a/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/retry_if_password_confirmation_is_not_the_same +++ b/pam/integration-tests/testdata/TestNativeChangeAuthTok/golden/retry_if_password_confirmation_is_not_the_same @@ -6,30 +6,35 @@ Username: user-integration-wrong-confirmation ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-wrong-confirmation -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-wrong-confirmation -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-wrong-confirmation -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -38,11 +43,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-wrong-confirmation -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -53,11 +60,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-wrong-confirmation -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -68,11 +77,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-wrong-confirmation -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -86,11 +97,13 @@ Enter your new password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-wrong-confirmation -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -106,11 +119,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-wrong-confirmation -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -126,11 +141,13 @@ Confirm password (or enter 'r' to go back to choose the provider): ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-wrong-confirmation -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > @@ -149,11 +166,13 @@ PAM AcctMgmt() exited with success ──────────────────────────────────────────────────────────────────────────────── > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK} force_native_client=true Username: user-integration-wrong-confirmation -== Provider selection (enter 'r' to go back to user selection) == +== Provider selection == 1. local 2. ExampleBroker +Or enter 'r' to go back to user selection Choose your provider: > 2 +== Password authentication == Enter 'r' to cancel the request and go back to select the authentication method Gimme your password: > diff --git a/pam/internal/adapter/nativemodel.go b/pam/internal/adapter/nativemodel.go index 8cf7061d6..6a5d015ed 100644 --- a/pam/internal/adapter/nativemodel.go +++ b/pam/internal/adapter/nativemodel.go @@ -392,20 +392,29 @@ type choicePair struct { label string } -func (m nativeModel) promptForChoice(title string, choices []choicePair, prompt string) (string, error) { - if m.canGoBack() { - title = fmt.Sprintf("%s (enter '%s' to %s)", title, nativeCancelKey, - m.goBackActionLabel()) +func (m nativeModel) promptForChoiceWithMessage(title string, message string, choices []choicePair, prompt string) (string, error) { + msg := fmt.Sprintf("== %s ==\n", title) + if message != "" { + msg += message + "\n" } - msg := fmt.Sprintf("== %s ==\n", title) for i, choice := range choices { - msg += fmt.Sprintf(" %d. %s\n", i+1, choice.label) + msg += fmt.Sprintf(" %d. %s", i+1, choice.label) + if i < len(choices)-1 { + msg += "\n" + } + } + + if m.canGoBack() { + msg += fmt.Sprintf("\nOr enter '%s' to %s", nativeCancelKey, + m.goBackActionLabel()) } - msg += prompt for { - idx, err := m.promptForNumericInputUntilValid(pam.PromptEchoOn, msg) + if err := m.sendInfo(msg); err != nil { + return "", err + } + idx, err := m.promptForNumericInputUntilValid(pam.PromptEchoOn, prompt) if err != nil { return "", err } @@ -422,6 +431,10 @@ func (m nativeModel) promptForChoice(title string, choices []choicePair, prompt } } +func (m nativeModel) promptForChoice(title string, choices []choicePair, prompt string) (string, error) { + return m.promptForChoiceWithMessage(title, "", choices, prompt) +} + func (m nativeModel) startAsyncOp(cmd func() tea.Cmd) (nativeModel, tea.Cmd) { m.busy = true return m, func() tea.Msg { @@ -543,14 +556,15 @@ func (m nativeModel) startChallenge() tea.Cmd { } func (m nativeModel) handleFormChallenge(hasWait bool) tea.Cmd { + authMode := "Chosen authentication method" + authModeIdx := slices.IndexFunc(m.authModes, func(mode *authd.GAMResponse_AuthenticationMode) bool { + return mode.Id == m.selectedAuthMode + }) + if authModeIdx > -1 { + authMode = m.authModes[authModeIdx].Label + } + if buttonLabel := m.uiLayout.GetButton(); buttonLabel != "" { - authMode := "chosen authentication method" - authModeIdx := slices.IndexFunc(m.authModes, func(mode *authd.GAMResponse_AuthenticationMode) bool { - return mode.Id == m.selectedAuthMode - }) - if authModeIdx > -1 { - authMode = m.authModes[authModeIdx].Label - } choices := []choicePair{ {id: "continue", label: fmt.Sprintf("Proceed with %s", authMode)}, } @@ -595,7 +609,8 @@ func (m nativeModel) handleFormChallenge(hasWait bool) tea.Cmd { } } - if cmd := maybeSendPamError(m.sendInfo(instructions, nativeCancelKey, m.goBackActionLabel())); cmd != nil { + instructions = fmt.Sprintf(instructions, nativeCancelKey, m.goBackActionLabel()) + if cmd := maybeSendPamError(m.sendInfo("== %s ==\n%s", authMode, instructions)); cmd != nil { return cmd } @@ -715,10 +730,6 @@ func (m nativeModel) handleQrCode() tea.Cmd { // Ass some extra vertical space to improve readability qrcodeView = append(qrcodeView, " ") - if cmd := maybeSendPamError(m.sendInfo(strings.Join(qrcodeView, "\n"))); cmd != nil { - return cmd - } - choices := []choicePair{ {id: "wait", label: "Wait for the QR code scan result"}, } @@ -726,7 +737,8 @@ func (m nativeModel) handleQrCode() tea.Cmd { choices = append(choices, choicePair{id: "button", label: buttonLabel}) } - id, err := m.promptForChoice("Qr Code authentication", choices, "Choose action") + id, err := m.promptForChoiceWithMessage("Qr Code authentication", + strings.Join(qrcodeView, "\n"), choices, "Choose action") if errors.Is(err, errGoBack) { return sendEvent(nativeGoBack{}) }