pam/nativemodel: Improve wording and consistency of strings

Use the same terminology and similar behavior of the CLI mode
ubuntu · Oct 22, 2024 · 5de61a1 · 5de61a1
1 parent fcb5642
commit 5de61a1
Show file tree

Hide file tree

Showing 41 changed files with 5,709 additions and 5,991 deletions.
diff --git a/...-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_accept_password_reset b/...-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_accept_password_reset
@@ -3,122 +3,113 @@ Username:
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-can-reset2
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker:
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider:
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-can-reset2
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker: 2
-Insert 'r' to cancel the request and go back
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
+Enter 'r' to cancel the request and go back
 Gimme your password:
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-can-reset2
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker: 2
-Insert 'r' to cancel the request and go back
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
+Enter 'r' to cancel the request and go back
 Gimme your password:
-== Password Update (use 'r' to go back) ==
-1 - Proceed with password update
-2 - Skip
-Select action:
+== Password Update (enter 'r' to go back) ==
+  1. Proceed with password update
+  2. Skip
+Choose action:
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-can-reset2
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker: 2
-Insert 'r' to cancel the request and go back
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
+Enter 'r' to cancel the request and go back
 Gimme your password:
-== Password Update (use 'r' to go back) ==
-1 - Proceed with password update
-2 - Skip
-Select action: 1
-Insert 'r' to cancel the request and go back
-Enter your new password (3 days until mandatory):
+== Password Update (enter 'r' to go back) ==
+  1. Proceed with password update
+  2. Skip
+Choose action: 1
+Enter your new password (3 days until mandatory) (or enter 'r' to go back):
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-can-reset2
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker: 2
-Insert 'r' to cancel the request and go back
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
+Enter 'r' to cancel the request and go back
 Gimme your password:
-== Password Update (use 'r' to go back) ==
-1 - Proceed with password update
-2 - Skip
-Select action: 1
-Insert 'r' to cancel the request and go back
-Enter your new password (3 days until mandatory):
-Repeat the previously inserted password or insert 'r' to cancel the request and go back
-Enter your new password (3 days until mandatory):
+== Password Update (enter 'r' to go back) ==
+  1. Proceed with password update
+  2. Skip
+Choose action: 1
+Enter your new password (3 days until mandatory) (or enter 'r' to go back):
+Confirm password (or enter 'r' to go back):
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-can-reset2
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker: 2
-Insert 'r' to cancel the request and go back
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
+Enter 'r' to cancel the request and go back
 Gimme your password:
-== Password Update (use 'r' to go back) ==
-1 - Proceed with password update
-2 - Skip
-Select action: 1
-Insert 'r' to cancel the request and go back
-Enter your new password (3 days until mandatory):
-Repeat the previously inserted password or insert 'r' to cancel the request and go back
-Enter your new password (3 days until mandatory):
+== Password Update (enter 'r' to go back) ==
+  1. Proceed with password update
+  2. Skip
+Choose action: 1
+Enter your new password (3 days until mandatory) (or enter 'r' to go back):
+Confirm password (or enter 'r' to go back):
 PAM Authenticate() for user "user-can-reset2" exited with success
 PAM AcctMgmt() exited with success
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-can-reset2
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker: 2
-Insert 'r' to cancel the request and go back
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
+Enter 'r' to cancel the request and go back
 Gimme your password:
-== Password Update (use 'r' to go back) ==
-1 - Proceed with password update
-2 - Skip
-Select action: 1
-Insert 'r' to cancel the request and go back
-Enter your new password (3 days until mandatory):
-Repeat the previously inserted password or insert 'r' to cancel the request and go back
-Enter your new password (3 days until mandatory):
+== Password Update (enter 'r' to go back) ==
+  1. Proceed with password update
+  2. Skip
+Choose action: 1
+Enter your new password (3 days until mandatory) (or enter 'r' to go back):
+Confirm password (or enter 'r' to go back):
 PAM Authenticate() for user "user-can-reset2" exited with success
 PAM AcctMgmt() exited with success
 >
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-can-reset2
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker: 2
-Insert 'r' to cancel the request and go back
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
+Enter 'r' to cancel the request and go back
 Gimme your password:
-== Password Update (use 'r' to go back) ==
-1 - Proceed with password update
-2 - Skip
-Select action: 1
-Insert 'r' to cancel the request and go back
-Enter your new password (3 days until mandatory):
-Repeat the previously inserted password or insert 'r' to cancel the request and go back
-Enter your new password (3 days until mandatory):
+== Password Update (enter 'r' to go back) ==
+  1. Proceed with password update
+  2. Skip
+Choose action: 1
+Enter your new password (3 days until mandatory) (or enter 'r' to go back):
+Confirm password (or enter 'r' to go back):
 PAM Authenticate() for user "user-can-reset2" exited with success
 PAM AcctMgmt() exited with success
 >

diff --git a/...-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_add_it_to_local_group b/...-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_add_it_to_local_group
@@ -6,39 +6,39 @@ Username: user-local-groups
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-local-groups
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker:
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider:
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-local-groups
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker: 2
-Insert 'r' to cancel the request and go back
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
+Enter 'r' to cancel the request and go back
 Gimme your password:
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-local-groups
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker: 2
-Insert 'r' to cancel the request and go back
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
+Enter 'r' to cancel the request and go back
 Gimme your password:
 PAM Authenticate() for user "user-local-groups" exited with success
 PAM AcctMgmt() exited with success
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-local-groups
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker: 2
-Insert 'r' to cancel the request and go back
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
+Enter 'r' to cancel the request and go back
 Gimme your password:
 PAM Authenticate() for user "user-local-groups" exited with success
 PAM AcctMgmt() exited with success

diff --git a/...n-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_offer_password_reset b/...n-tests/testdata/TestNativeAuthenticate/golden/authenticate_user_and_offer_password_reset
@@ -3,61 +3,61 @@ Username:
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-can-reset
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker:
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider:
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-can-reset
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker: 2
-Insert 'r' to cancel the request and go back
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
+Enter 'r' to cancel the request and go back
 Gimme your password:
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-can-reset
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker: 2
-Insert 'r' to cancel the request and go back
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
+Enter 'r' to cancel the request and go back
 Gimme your password:
-== Password Update (use 'r' to go back) ==
-1 - Proceed with password update
-2 - Skip
-Select action:
+== Password Update (enter 'r' to go back) ==
+  1. Proceed with password update
+  2. Skip
+Choose action:
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-can-reset
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker: 2
-Insert 'r' to cancel the request and go back
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
+Enter 'r' to cancel the request and go back
 Gimme your password:
-== Password Update (use 'r' to go back) ==
-1 - Proceed with password update
-2 - Skip
-Select action: 2
+== Password Update (enter 'r' to go back) ==
+  1. Proceed with password update
+  2. Skip
+Choose action: 2
 PAM Authenticate() for user "user-can-reset" exited with success
 PAM AcctMgmt() exited with success
 >
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK} force_native_client=true
 Username: user-can-reset
-== Broker selection (use 'r' to go back) ==
-1 - local
-2 - ExampleBroker
-Select broker: 2
-Insert 'r' to cancel the request and go back
+== Provider selection (enter 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
+Enter 'r' to cancel the request and go back
 Gimme your password:
-== Password Update (use 'r' to go back) ==
-1 - Proceed with password update
-2 - Skip
-Select action: 2
+== Password Update (enter 'r' to go back) ==
+  1. Proceed with password update
+  2. Skip
+Choose action: 2
 PAM Authenticate() for user "user-can-reset" exited with success
 PAM AcctMgmt() exited with success
 >