pam/integration-tests: Do not use utf-8 ellipses in broker messages

These are not supported by some SSH clients, so better to be reliable and support characters that are visible the same ways in all the known cases
ubuntu · Nov 14, 2024 · a51f412 · a51f412
1 parent 439868d
commit a51f412
Show file tree

Hide file tree

Showing 41 changed files with 1,378 additions and 1,379 deletions.
diff --git a/examplebroker/broker.go b/examplebroker/broker.go
@@ -95,19 +95,18 @@ type userInfoBroker struct {
 var (
 	exampleUsersMu = sync.RWMutex{}
 	exampleUsers   = map[string]userInfoBroker{
-		"user1":                 {Password: "goodpass"},
-		"user2":                 {Password: "goodpass"},
-		"user3":                 {Password: "goodpass"},
-		"user-mfa":              {Password: "goodpass"},
-		"user-mfa-with-reset":   {Password: "goodpass"},
-		"user-needs-reset":      {Password: "goodpass"},
-		"user-needs-reset2":     {Password: "goodpass"},
-		"user-can-reset":        {Password: "goodpass"},
-		"user-can-reset2":       {Password: "goodpass"},
-		"user-local-groups":     {Password: "goodpass"},
-		"user-pre-check":        {Password: "goodpass"},
-		"user-sudo":             {Password: "goodpass"},
-		"user-mismatching-name": {Password: "goodpass"},
+		"user1":               {Password: "goodpass"},
+		"user2":               {Password: "goodpass"},
+		"user3":               {Password: "goodpass"},
+		"user-mfa":            {Password: "goodpass"},
+		"user-mfa-with-reset": {Password: "goodpass"},
+		"user-needs-reset":    {Password: "goodpass"},
+		"user-needs-reset2":   {Password: "goodpass"},
+		"user-can-reset":      {Password: "goodpass"},
+		"user-can-reset2":     {Password: "goodpass"},
+		"user-local-groups":   {Password: "goodpass"},
+		"user-pre-check":      {Password: "goodpass"},
+		"user-sudo":           {Password: "goodpass"},
 	}
 )
 
@@ -342,7 +341,7 @@ func getSupportedModes(sessionInfo sessionInfo, supportedUILayouts []map[string]
 				if layout["button"] == "optional" {
 					allModes["totp_with_button"] = map[string]string{
 						"selection_label": "Authentication code",
-						"phone":           "+33…",
+						"phone":           "+33...",
 						"wantedCode":      "temporary pass",
 						"ui": mapToJSON(map[string]string{
 							"type":   "form",
@@ -354,7 +353,7 @@ func getSupportedModes(sessionInfo sessionInfo, supportedUILayouts []map[string]
 				} else {
 					allModes["totp"] = map[string]string{
 						"selection_label": "Authentication code",
-						"phone":           "+33…",
+						"phone":           "+33...",
 						"wantedCode":      "temporary pass",
 						"ui": mapToJSON(map[string]string{
 							"type":  "form",
@@ -365,21 +364,21 @@ func getSupportedModes(sessionInfo sessionInfo, supportedUILayouts []map[string]
 				}
 
 				allModes["phoneack1"] = map[string]string{
-					"selection_label": "Use your phone +33…",
-					"phone":           "+33…",
+					"selection_label": "Use your phone +33...",
+					"phone":           "+33...",
 					"ui": mapToJSON(map[string]string{
 						"type":  "form",
-						"label": "Unlock your phone +33… or accept request on web interface:",
+						"label": "Unlock your phone +33... or accept request on web interface:",
 						"wait":  "true",
 					}),
 				}
 
 				allModes["phoneack2"] = map[string]string{
-					"selection_label": "Use your phone +1…",
-					"phone":           "+1…",
+					"selection_label": "Use your phone +1...",
+					"phone":           "+1...",
 					"ui": mapToJSON(map[string]string{
 						"type":  "form",
-						"label": "Unlock your phone +1… or accept request on web interface",
+						"label": "Unlock your phone +1... or accept request on web interface",
 						"wait":  "true",
 					}),
 				}

diff --git a/pam/integration-tests/gdm_test.go b/pam/integration-tests/gdm_test.go
@@ -103,7 +103,7 @@ var testFidoDeviceUILayout = authd.UILayout{
 
 var testPhoneAckUILayout = authd.UILayout{
 	Type:    "form",
-	Label:   ptrValue("Unlock your phone +33… or accept request on web interface:"),
+	Label:   ptrValue("Unlock your phone +33... or accept request on web interface:"),
 	Content: ptrValue(""),
 	Wait:    ptrValue("true"),
 	Button:  ptrValue(""),

diff --git a/...tegration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_switching_auth_mode b/...tegration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_switching_auth_mode
@@ -20,8 +20,8 @@ Gimme your password
 > 1. Password authentication
   2. Send URL to [email protected]
   3. Use your fido device foo
-  4. Use your phone +33…
-  5. Use your phone +1…
+  4. Use your phone +33...
+  5. Use your phone +1...
   6. Use a QR code
   7. Authentication code
 ────────────────────────────────────────────────────────────────────────────────
@@ -35,8 +35,8 @@ Click on the link received at [email protected] or enter th
   1. Password authentication
 > 2. Send URL to [email protected]
   3. Use your fido device foo
-  4. Use your phone +33…
-  5. Use your phone +1…
+  4. Use your phone +33...
+  5. Use your phone +1...
   6. Use a QR code
   7. Authentication code
 ────────────────────────────────────────────────────────────────────────────────
@@ -49,8 +49,8 @@ Plug your fido device and press with your thumb
   1. Password authentication
   2. Send URL to [email protected]
 > 3. Use your fido device foo
-  4. Use your phone +33…
-  5. Use your phone +1…
+  4. Use your phone +33...
+  5. Use your phone +1...
   6. Use a QR code
   7. Authentication code
 ────────────────────────────────────────────────────────────────────────────────

diff --git a/...ion-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_switching_to_local_broker b/...ion-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_switching_to_local_broker
@@ -20,8 +20,8 @@ Gimme your password
 > 1. Password authentication
   2. Send URL to [email protected]
   3. Use your fido device foo
-  4. Use your phone +33…
-  5. Use your phone +1…
+  4. Use your phone +33...
+  5. Use your phone +1...
   6. Use a QR code
   7. Authentication code
 ────────────────────────────────────────────────────────────────────────────────

diff --git a/...on-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_form_mode_with_button b/...on-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_form_mode_with_button
@@ -20,8 +20,8 @@ Gimme your password
 > 1. Password authentication
   2. Send URL to [email protected]
   3. Use your fido device foo
-  4. Use your phone +33…
-  5. Use your phone +1…
+  4. Use your phone +33...
+  5. Use your phone +1...
   6. Use a QR code
   7. Authentication code
 ────────────────────────────────────────────────────────────────────────────────

diff --git a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_mfa b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_mfa
@@ -20,8 +20,8 @@ Gimme your password
 > 1. Password authentication
   2. Send URL to [email protected]
   3. Use your fido device foo
-  4. Use your phone +33…
-  5. Use your phone +1…
+  4. Use your phone +33...
+  5. Use your phone +1...
   6. Use a QR code
   7. Authentication code
 ────────────────────────────────────────────────────────────────────────────────
@@ -40,23 +40,23 @@ Plug your fido device and press with your thumb
   Select your authentication method
 
 > 1. Use your fido device foo
-  2. Use your phone +33…
+  2. Use your phone +33...
   3. Authentication code
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Plug your fido device and press with your thumb
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
-Unlock your phone +33… or accept request on web interface:
+Unlock your phone +33... or accept request on web interface:
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
   Select your authentication method
 
-> 1. Use your phone +33…
+> 1. Use your phone +33...
   2. Authentication code
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
-Unlock your phone +33… or accept request on web interface:
+Unlock your phone +33... or accept request on web interface:
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 PAM Authenticate() for user "user-mfa" exited with success

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
@@ -16,8 +16,8 @@ Gimme your password
 > 1. Password authentication
   2. Send URL to [email protected]
   3. Use your fido device foo
-  4. Use your phone +33…
-  5. Use your phone +1…
+  4. Use your phone +33...
+  5. Use your phone +1...
   6. Use a QR code
   7. Authentication code
 ────────────────────────────────────────────────────────────────────────────────

diff --git a/...stdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_after_many_regenerations b/...stdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_after_many_regenerations
@@ -20,8 +20,8 @@ Gimme your password
 > 1. Password authentication
   2. Send URL to [email protected]
   3. Use your fido device foo
-  4. Use your phone +33…
-  5. Use your phone +1…
+  4. Use your phone +33...
+  5. Use your phone +1...
   6. Use a QR code
   7. Authentication code
 ────────────────────────────────────────────────────────────────────────────────

diff --git a/...gration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty b/...gration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty
@@ -16,8 +16,8 @@ Gimme your password
 > 1. Password authentication
   2. Send URL to [email protected]
   3. Use your fido device foo
-  4. Use your phone +33…
-  5. Use your phone +1…
+  4. Use your phone +33...
+  5. Use your phone +1...
   6. Use a QR code
   7. Authentication code
 ────────────────────────────────────────────────────────────────────────────────

diff --git a/...tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty_session b/...tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_a_tty_session
@@ -16,8 +16,8 @@ Gimme your password
 > 1. Password authentication
   2. Send URL to [email protected]
   3. Use your fido device foo
-  4. Use your phone +33…
-  5. Use your phone +1…
+  4. Use your phone +33...
+  5. Use your phone +1...
   6. Use a QR code
   7. Authentication code
 ────────────────────────────────────────────────────────────────────────────────

diff --git a/...ration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_screen b/...ration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_with_qr_code_in_screen
@@ -16,8 +16,8 @@ Gimme your password
 > 1. Password authentication
   2. Send URL to [email protected]
   3. Use your fido device foo
-  4. Use your phone +33…
-  5. Use your phone +1…
+  4. Use your phone +33...
+  5. Use your phone +1...
   6. Use a QR code
   7. Authentication code
 ────────────────────────────────────────────────────────────────────────────────

diff --git a/...ntegration-tests/testdata/TestCLIAuthenticate/golden/prevent_user_from_switching_username b/...ntegration-tests/testdata/TestCLIAuthenticate/golden/prevent_user_from_switching_username
@@ -20,8 +20,8 @@ Gimme your password
 > 1. Password authentication
   2. Send URL to [email protected]
   3. Use your fido device foo
-  4. Use your phone +33…
-  5. Use your phone +1…
+  4. Use your phone +33...
+  5. Use your phone +1...
   6. Use a QR code
   7. Authentication code
 ────────────────────────────────────────────────────────────────────────────────

diff --git a/...ration-tests/testdata/TestCLIAuthenticate/golden/remember_last_successful_broker_and_mode b/...ration-tests/testdata/TestCLIAuthenticate/golden/remember_last_successful_broker_and_mode
@@ -16,8 +16,8 @@ Username: user-integration-remember-mode
 > 1. Password authentication
   2. Send URL to [email protected]
   3. Use your fido device foo
-  4. Use your phone +33…
-  5. Use your phone +1…
+  4. Use your phone +33...
+  5. Use your phone +1...
   6. Use a QR code
   7. Authentication code
 ────────────────────────────────────────────────────────────────────────────────

diff --git a/pam/integration-tests/testdata/TestCLIChangeAuthTok/golden/change_passwd_after_mfa_auth b/pam/integration-tests/testdata/TestCLIChangeAuthTok/golden/change_passwd_after_mfa_auth
@@ -20,8 +20,8 @@ Gimme your password
 > 1. Password authentication
   2. Send URL to [email protected]
   3. Use your fido device foo
-  4. Use your phone +33…
-  5. Use your phone +1…
+  4. Use your phone +33...
+  5. Use your phone +1...
   6. Use a QR code
   7. Authentication code
 ────────────────────────────────────────────────────────────────────────────────
@@ -40,23 +40,23 @@ Plug your fido device and press with your thumb
   Select your authentication method
 
 > 1. Use your fido device foo
-  2. Use your phone +33…
+  2. Use your phone +33...
   3. Authentication code
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK}
 Plug your fido device and press with your thumb
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK}
-Unlock your phone +33… or accept request on web interface:
+Unlock your phone +33... or accept request on web interface:
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK}
   Select your authentication method
 
-> 1. Use your phone +33…
+> 1. Use your phone +33...
   2. Authentication code
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK}
-Unlock your phone +33… or accept request on web interface:
+Unlock your phone +33... or accept request on web interface:
 ────────────────────────────────────────────────────────────────────────────────
 > ./pam_authd passwd socket=${AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK}
 Enter your new password