From 37f6d560e115a85a78495a18f56fa5629b139f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 2 Jul 2024 18:58:00 +0200 Subject: [PATCH 1/2] pam/integration-test/cli: Increase terminal height to support bigger QR's When using the qrcode for tty the vertical space is not enough to show all the view items, so increase the vertical space so that both the button and the exit message are shown --- .../golden/authenticate_user_with_qr_code | 24 +++++++++++++++++++ .../authenticate_user_with_qr_code_in_a_tty | 24 +++++++++++++++++++ ...nticate_user_with_qr_code_in_a_tty_session | 24 +++++++++++++++++++ .../authenticate_user_with_qr_code_in_screen | 24 +++++++++++++++++++ .../testdata/tapes/cli/qr_code.tape | 2 +- 5 files changed, 97 insertions(+), 1 deletion(-) diff --git a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code index c93499864..d18d347cc 100644 --- a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code +++ b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code @@ -32,6 +32,9 @@ + + + @@ -72,6 +75,9 @@ Gimme your password + + + @@ -112,6 +118,9 @@ Gimme your password + + + @@ -156,6 +165,9 @@ Scan the qrcode or enter the code in the login page + + + ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} @@ -196,6 +208,9 @@ Scan the qrcode or enter the code in the login page + + + ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} @@ -236,6 +251,9 @@ Scan the qrcode or enter the code in the login page + + + ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} @@ -276,6 +294,9 @@ 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} @@ -316,4 +337,7 @@ PAM AcctMgmt() exited with success + + + ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty index bbf90c276..4b7719cae 100644 --- a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty +++ b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty @@ -32,6 +32,9 @@ + + + @@ -72,6 +75,9 @@ Gimme your password + + + @@ -112,6 +118,9 @@ Gimme your password + + + @@ -156,6 +165,9 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 + [ regenerate QR code ] + + ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} @@ -196,6 +208,9 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 + [ regenerate QR code ] + + ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} @@ -236,6 +251,9 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 + [ regenerate QR code ] + + ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} @@ -276,6 +294,9 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 +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} @@ -316,4 +337,7 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 +PAM Authenticate() for user "user-integration-qr-code-tty" exited with success +PAM AcctMgmt() exited with success +> ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty_session b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty_session index ddb74840b..0328c8bc5 100644 --- a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty_session +++ b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty_session @@ -32,6 +32,9 @@ + + + @@ -72,6 +75,9 @@ Gimme your password + + + @@ -112,6 +118,9 @@ Gimme your password + + + @@ -156,6 +165,9 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 + [ regenerate QR code ] + + ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} @@ -196,6 +208,9 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 + [ regenerate QR code ] + + ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} @@ -236,6 +251,9 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 + [ regenerate QR code ] + + ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} @@ -276,6 +294,9 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 +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} @@ -316,4 +337,7 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 +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/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_screen b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_screen index 4dbfd8d6a..7c6b059d9 100644 --- a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_screen +++ b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_screen @@ -32,6 +32,9 @@ + + + @@ -72,6 +75,9 @@ Gimme your password + + + @@ -112,6 +118,9 @@ Gimme your password + + + @@ -156,6 +165,9 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 + [ regenerate QR code ] + + ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} @@ -196,6 +208,9 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 + [ regenerate QR code ] + + ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} @@ -236,6 +251,9 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 + [ regenerate QR code ] + + ──────────────────────────────────────────────────────────────────────────────── > if [ -v AUTHD_PAM_CLI_TERM ]; then export TERM=${AUTHD_PAM_CLI_TERM}; fi > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} @@ -276,6 +294,9 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 +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} @@ -316,4 +337,7 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 +PAM Authenticate() for user "user-integration-qr-code-screen" exited with success +PAM AcctMgmt() exited with success +> ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/tapes/cli/qr_code.tape b/pam/integration-tests/testdata/tapes/cli/qr_code.tape index 1d81cf8e9..839c8b41b 100644 --- a/pam/integration-tests/testdata/tapes/cli/qr_code.tape +++ b/pam/integration-tests/testdata/tapes/cli/qr_code.tape @@ -4,7 +4,7 @@ Output qr_code.gif # If we don't specify a .gif output, it will create a default # Configuration header to standardize the output. # Does not work with the "Source" command. Set Width 800 -Set Height 600 +Set Height 650 # TODO: Ideally, we should use Ubuntu Mono. However, the github runner is still on Jammy, which does not have it. # We should update this to use Ubuntu Mono once the runner is updated. Set FontFamily "Monospace" From 88dc05e4de9435881f6fd4b7a0afc43f2459846b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 2 Jul 2024 19:01:22 +0200 Subject: [PATCH 2/2] examplebroker: Improve wording for the regenerate code button label The user is allowed to regenerate the login code not the QR code, so improve the wording here. Regenerate the golden files based on that --- examplebroker/broker.go | 2 +- .../golden/authenticate_user_with_qr_code | 6 +++--- .../authenticate_user_with_qr_code_in_a_tty | 6 +++--- ...enticate_user_with_qr_code_in_a_tty_session | 6 +++--- .../authenticate_user_with_qr_code_in_screen | 6 +++--- .../authenticate_user_switching_auth_mode | 18 +++++++++--------- .../golden/authenticate_user_with_qr_code | 18 +++++++++--------- .../authenticate_user_with_qr_code_in_a_tty | 18 +++++++++--------- ...enticate_user_with_qr_code_in_a_tty_session | 18 +++++++++--------- .../authenticate_user_with_qr_code_in_screen | 18 +++++++++--------- 10 files changed, 58 insertions(+), 58 deletions(-) diff --git a/examplebroker/broker.go b/examplebroker/broker.go index 4b9ec83b0..4f4787113 100644 --- a/examplebroker/broker.go +++ b/examplebroker/broker.go @@ -350,7 +350,7 @@ func getSupportedModes(sessionInfo sessionInfo, supportedUILayouts []map[string] "type": "qrcode", "label": modeLabel, "wait": "true", - "button": "regenerate QR code", + "button": "Regenerate code", }), } diff --git a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code index d18d347cc..d82e68e06 100644 --- a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code +++ b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code @@ -149,7 +149,7 @@ Scan the qrcode or enter the code in the login page ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ 1337 - [ regenerate QR code ] + [ Regenerate code ] @@ -192,7 +192,7 @@ Scan the qrcode or enter the code in the login page ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ 1337 - [ regenerate QR code ] + [ Regenerate code ] @@ -235,7 +235,7 @@ Scan the qrcode or enter the code in the login page ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ 1337 - [ regenerate QR code ] + [ Regenerate code ] diff --git a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty index 4b7719cae..c8f9d72bb 100644 --- a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty +++ b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty @@ -165,7 +165,7 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 - [ regenerate QR code ] + [ Regenerate code ] ──────────────────────────────────────────────────────────────────────────────── @@ -208,7 +208,7 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 - [ regenerate QR code ] + [ Regenerate code ] ──────────────────────────────────────────────────────────────────────────────── @@ -251,7 +251,7 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 - [ regenerate QR code ] + [ Regenerate code ] ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty_session b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty_session index 0328c8bc5..14d16e725 100644 --- a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty_session +++ b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty_session @@ -165,7 +165,7 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 - [ regenerate QR code ] + [ Regenerate code ] ──────────────────────────────────────────────────────────────────────────────── @@ -208,7 +208,7 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 - [ regenerate QR code ] + [ Regenerate code ] ──────────────────────────────────────────────────────────────────────────────── @@ -251,7 +251,7 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 - [ regenerate QR code ] + [ Regenerate code ] ──────────────────────────────────────────────────────────────────────────────── diff --git a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_screen b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_screen index 7c6b059d9..b4e5df5b3 100644 --- a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_screen +++ b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_screen @@ -165,7 +165,7 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 - [ regenerate QR code ] + [ Regenerate code ] ──────────────────────────────────────────────────────────────────────────────── @@ -208,7 +208,7 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 - [ regenerate QR code ] + [ Regenerate code ] ──────────────────────────────────────────────────────────────────────────────── @@ -251,7 +251,7 @@ Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ 1337 - [ regenerate QR code ] + [ Regenerate code ] ──────────────────────────────────────────────────────────────────────────────── 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 8350ef5c7..89826709c 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 @@ -2453,7 +2453,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: @@ -2610,7 +2610,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: r == Authentication mode selection (use 'r' to go back) == 1 - Password authentication @@ -2767,7 +2767,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: r == Authentication mode selection (use 'r' to go back) == 1 - Password authentication @@ -2924,7 +2924,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: r == Authentication mode selection (use 'r' to go back) == 1 - Password authentication @@ -3081,7 +3081,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: r == Authentication mode selection (use 'r' to go back) == 1 - Password authentication @@ -3238,7 +3238,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: r == Authentication mode selection (use 'r' to go back) == 1 - Password authentication @@ -3395,7 +3395,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: r == Authentication mode selection (use 'r' to go back) == 1 - Password authentication @@ -3552,7 +3552,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: r == Authentication mode selection (use 'r' to go back) == 1 - Password authentication @@ -3709,7 +3709,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: r == Authentication mode selection (use 'r' to go back) == 1 - Password authentication 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 60af54b16..5214c58b4 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 @@ -358,7 +358,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: @@ -465,7 +465,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 2 Scan the qrcode or enter the code in the login page █████████████████████████████████ @@ -489,7 +489,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: @@ -572,7 +572,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 2 Scan the qrcode or enter the code in the login page █████████████████████████████████ @@ -596,7 +596,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 1 @@ -679,7 +679,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 2 Scan the qrcode or enter the code in the login page █████████████████████████████████ @@ -703,7 +703,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 1 PAM Authenticate() for user "user-integration-qr-code" exited with success PAM AcctMgmt() exited with success @@ -786,7 +786,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 2 Scan the qrcode or enter the code in the login page █████████████████████████████████ @@ -810,7 +810,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 1 PAM Authenticate() for user "user-integration-qr-code" 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 b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty index f7d264537..2a2291a34 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 @@ -374,7 +374,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: @@ -481,7 +481,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 2 Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ @@ -521,7 +521,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: @@ -588,7 +588,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 2 Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ @@ -628,7 +628,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 1 @@ -695,7 +695,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 2 Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ @@ -735,7 +735,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 1 PAM Authenticate() for user "user-integration-qr-code-tty" exited with success PAM AcctMgmt() exited with success @@ -802,7 +802,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 2 Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ @@ -842,7 +842,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select 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 22d46566e..81805b2ac 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 @@ -374,7 +374,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: @@ -481,7 +481,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 2 Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ @@ -521,7 +521,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: @@ -588,7 +588,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 2 Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ @@ -628,7 +628,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 1 @@ -695,7 +695,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 2 Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ @@ -735,7 +735,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 1 PAM Authenticate() for user "user-integration-qr-code-tty-session" exited with success PAM AcctMgmt() exited with success @@ -802,7 +802,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 2 Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ @@ -842,7 +842,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select 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_screen b/pam/integration-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_with_qr_code_in_screen index 7f59316eb..68340ef00 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 @@ -374,7 +374,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: @@ -481,7 +481,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 2 Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ @@ -521,7 +521,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: @@ -588,7 +588,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 2 Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ @@ -628,7 +628,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 1 @@ -695,7 +695,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 2 Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ @@ -735,7 +735,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 1 PAM Authenticate() for user "user-integration-qr-code-screen" exited with success PAM AcctMgmt() exited with success @@ -802,7 +802,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 2 Scan the qrcode or enter the code in the login page ██████████████████████████████████████████████████████████████████ @@ -842,7 +842,7 @@ Scan the qrcode or enter the code in the login page == Qr Code authentication (use 'r' to go back) == 1 - Wait for the QR code scan result -2 - regenerate QR code +2 - Regenerate code Select action: 1 PAM Authenticate() for user "user-integration-qr-code-screen" exited with success PAM AcctMgmt() exited with success