pam/nativemodel: Improve wording and consistency of strings

Use the same terminology and similar behavior of the CLI mode
ubuntu · Oct 22, 2024 · 07cc197 · 07cc197
1 parent 2ff47eb
commit 07cc197
Show file tree

Hide file tree

Showing 41 changed files with 5,473 additions and 5,478 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
@@ -33,10 +33,10 @@ 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 (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider:
 
 
 
@@ -66,10 +66,10 @@ Select broker:
 ────────────────────────────────────────────────────────────────────────────────
 > ./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
+== Provider selection (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
 Insert 'r' to cancel the request and go back
 Gimme your password:
 
@@ -99,16 +99,16 @@ 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
+== Provider selection (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
 Insert '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 (type 'r' to go back) ==
+  1. Proceed with password update
+  2. Skip
+Choose action:
 
 
 
@@ -132,18 +132,18 @@ Select 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
+== Provider selection (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
 Insert '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 (type 'r' to go back) ==
+  1. Proceed with password update
+  2. Skip
+Choose action: 1
+Enter your new password (3 days until mandatory) (or type 'r' to go back):
+
 
 
 
@@ -165,20 +165,20 @@ Enter your new password (3 days until mandatory):
 ────────────────────────────────────────────────────────────────────────────────
 > ./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
+== Provider selection (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
 Insert '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 (type 'r' to go back) ==
+  1. Proceed with password update
+  2. Skip
+Choose action: 1
+Enter your new password (3 days until mandatory) (or type 'r' to go back):
+Confirm password (or type 'r' to go back):
+
+
 
 
 
@@ -198,20 +198,18 @@ Enter your new password (3 days until mandatory):
 ────────────────────────────────────────────────────────────────────────────────
 > ./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
+== Provider selection (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
 Insert '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 (type 'r' to go back) ==
+  1. Proceed with password update
+  2. Skip
+Choose action: 1
+Enter your new password (3 days until mandatory) (or type 'r' to go back):
+Confirm password (or type 'r' to go back):
 PAM Authenticate() for user "user-can-reset2" exited with success
 PAM AcctMgmt() exited with success
 >
@@ -228,23 +226,23 @@ 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
+== Provider selection (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
 Insert '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 (type 'r' to go back) ==
+  1. Proceed with password update
+  2. Skip
+Choose action: 1
+Enter your new password (3 days until mandatory) (or type 'r' to go back):
+Confirm password (or type 'r' to go back):
 PAM Authenticate() for user "user-can-reset2" exited with success
 PAM AcctMgmt() exited with success
 >
@@ -261,23 +259,23 @@ 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
+== Provider selection (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
 Insert '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 (type 'r' to go back) ==
+  1. Proceed with password update
+  2. Skip
+Choose action: 1
+Enter your new password (3 days until mandatory) (or type 'r' to go back):
+Confirm password (or type 'r' to go back):
 PAM Authenticate() for user "user-can-reset2" exited with success
 PAM AcctMgmt() exited with success
 >
@@ -294,4 +292,6 @@ 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
@@ -66,10 +66,10 @@ 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 (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider:
 
 
 
@@ -99,10 +99,10 @@ Select broker:
 ────────────────────────────────────────────────────────────────────────────────
 > ./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
+== Provider selection (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
 Insert 'r' to cancel the request and go back
 Gimme your password:
 
@@ -132,10 +132,10 @@ 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
+== Provider selection (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
 Insert 'r' to cancel the request and go back
 Gimme your password:
 PAM Authenticate() for user "user-local-groups" exited with success
@@ -165,10 +165,10 @@ 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
+== Provider selection (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
 Insert 'r' to cancel the request and go back
 Gimme your password:
 PAM Authenticate() for user "user-local-groups" 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
@@ -33,10 +33,10 @@ 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 (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider:
 
 
 
@@ -66,10 +66,10 @@ Select broker:
 ────────────────────────────────────────────────────────────────────────────────
 > ./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
+== Provider selection (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
 Insert 'r' to cancel the request and go back
 Gimme your password:
 
@@ -99,16 +99,16 @@ 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
+== Provider selection (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
 Insert '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 (type 'r' to go back) ==
+  1. Proceed with password update
+  2. Skip
+Choose action:
 
 
 
@@ -132,16 +132,16 @@ Select 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
+== Provider selection (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
 Insert '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 (type '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
 >
@@ -165,16 +165,16 @@ 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
+== Provider selection (type 'r' to go back) ==
+  1. local
+  2. ExampleBroker
+Choose your provider: 2
 Insert '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 (type '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
 >