From b4180172a55e40ee50536e9de4e7e0ec95471dc6 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Mon, 27 May 2024 17:03:43 +0800 Subject: [PATCH 01/13] minor tweaks to script files --- dockerbuild/run-idp.sh | 19 +++++++++---------- dockerbuild/run-integration-tests.sh | 5 ++++- dockerbuild/run-metadata-tests.sh | 5 ++++- dockerbuild/run-tests.sh | 5 ++++- dockerbuild/run.sh | 6 ++++++ 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dockerbuild/run-idp.sh b/dockerbuild/run-idp.sh index f2faa512..d08922d0 100755 --- a/dockerbuild/run-idp.sh +++ b/dockerbuild/run-idp.sh @@ -1,17 +1,16 @@ #!/usr/bin/env bash -# Try to run database migrations -cd /data/vendor/simplesamlphp/simplesamlphp/modules/silauth -chmod a+x ./lib/Auth/Source/yii +# echo script commands to stdout +set -x + +# exit if any command fails +set -e -output=$(./lib/Auth/Source/yii migrate --interactive=0 2>&1) +# Try to run database migrations +cd /data/vendor/simplesamlphp/simplesamlphp/modules/silauth/lib/Auth/Source +chmod a+x ./yii -# If they failed, exit. -rc=$?; -if [[ $rc != 0 ]]; then - logger --priority user.err --stderr "Migrations failed with status ${rc} and output: ${output}" - exit $rc; -fi +./yii migrate --interactive=0 cd /data ./run.sh diff --git a/dockerbuild/run-integration-tests.sh b/dockerbuild/run-integration-tests.sh index f4ca4aa3..b3d92545 100755 --- a/dockerbuild/run-integration-tests.sh +++ b/dockerbuild/run-integration-tests.sh @@ -1,8 +1,11 @@ #!/usr/bin/env bash -set -e +# echo script commands to stdout set -x +# exit if any command fails +set -e + cd /data export COMPOSER_ALLOW_SUPERUSER=1; composer install diff --git a/dockerbuild/run-metadata-tests.sh b/dockerbuild/run-metadata-tests.sh index e8bb0678..f052741c 100755 --- a/dockerbuild/run-metadata-tests.sh +++ b/dockerbuild/run-metadata-tests.sh @@ -1,8 +1,11 @@ #!/usr/bin/env bash -set -e +# echo script commands to stdout set -x +# exit if any command fails +set -e + cd /data export COMPOSER_ALLOW_SUPERUSER=1; composer install diff --git a/dockerbuild/run-tests.sh b/dockerbuild/run-tests.sh index e17edd55..37c21ec7 100755 --- a/dockerbuild/run-tests.sh +++ b/dockerbuild/run-tests.sh @@ -1,8 +1,11 @@ #!/usr/bin/env bash -set -e +# echo script commands to stdout set -x +# exit if any command fails +set -e + /data/run-metadata-tests.sh ./vendor/bin/phpunit -v tests/AnnouncementTest.php diff --git a/dockerbuild/run.sh b/dockerbuild/run.sh index 748fc0b6..4d7ff730 100755 --- a/dockerbuild/run.sh +++ b/dockerbuild/run.sh @@ -1,5 +1,11 @@ #!/usr/bin/env bash +# echo script commands to stdout +set -x + +# exit if any command fails +set -e + # This is a temporary fix (bug workaround) until ssp 2.0 is in use sed -i 's_\(\\SimpleSAML\\Error\\Assertion::installHandler()\)_// \1 _' /data/vendor/simplesamlphp/simplesamlphp/www/_include.php From 44baf140d46ad7d7c65d238c7b9a5b91f35ac74e Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Wed, 29 May 2024 16:26:44 +0800 Subject: [PATCH 02/13] Google analytics4 https://github.com/silinternational/simplesamlphp-module-material/pull/119 --- README.md | 2 +- .../themes/material/common-head-elements.php | 28 ++++++++----------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 922fd98d..3f908f36 100644 --- a/README.md +++ b/README.md @@ -214,7 +214,7 @@ The login page looks for `/simplesamlphp/www/logo.png` which is **NOT** provided Update `/simplesamlphp/config/config.php`: ``` -'analytics.trackingId' => 'UA-some-unique-id-for-your-site' +'analytics.trackingId' => 'G-some-unique-id-for-your-site' ``` This project provides a convenience by loading this config with whatever is in the environment variable `ANALYTICS_ID`._ diff --git a/modules/material/themes/material/common-head-elements.php b/modules/material/themes/material/common-head-elements.php index 140d0899..ceb5690d 100644 --- a/modules/material/themes/material/common-head-elements.php +++ b/modules/material/themes/material/common-head-elements.php @@ -8,26 +8,20 @@ configuration->getValue('analytics.trackingId')); if (! empty($trackingId)) { -?> - - - - - + + + + - configuration->getValue('theme.color-scheme') ?: 'indigo-purple'); ?> From 9d1d0296f4043104497b1cd19a778fc55684e246 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Wed, 29 May 2024 16:31:46 +0800 Subject: [PATCH 03/13] input color was too light https://github.com/silinternational/simplesamlphp-module-material/pull/136 --- modules/material/themes/material/core/loginuserpass.php | 4 ++-- .../themes/material/mfa/prompt-for-mfa-backupcode.php | 2 +- .../material/themes/material/mfa/prompt-for-mfa-manager.php | 2 +- modules/material/themes/material/mfa/prompt-for-mfa-totp.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/material/themes/material/core/loginuserpass.php b/modules/material/themes/material/core/loginuserpass.php index bc4a62af..afea971b 100644 --- a/modules/material/themes/material/core/loginuserpass.php +++ b/modules/material/themes/material/core/loginuserpass.php @@ -82,7 +82,7 @@ function onRecaptchaLoad() { data['username'] ?? null); ?> - id="username"/> @@ -91,7 +91,7 @@ function onRecaptchaLoad() { t('{material:login:label_password}') ?> - + id="password"/> diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-backupcode.php b/modules/material/themes/material/mfa/prompt-for-mfa-backupcode.php index a621d002..7520467a 100644 --- a/modules/material/themes/material/mfa/prompt-for-mfa-backupcode.php +++ b/modules/material/themes/material/mfa/prompt-for-mfa-backupcode.php @@ -39,7 +39,7 @@ - diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-manager.php b/modules/material/themes/material/mfa/prompt-for-mfa-manager.php index a385a082..e9899947 100644 --- a/modules/material/themes/material/mfa/prompt-for-mfa-manager.php +++ b/modules/material/themes/material/mfa/prompt-for-mfa-manager.php @@ -38,7 +38,7 @@ - + diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-totp.php b/modules/material/themes/material/mfa/prompt-for-mfa-totp.php index 4b861524..c85c6718 100644 --- a/modules/material/themes/material/mfa/prompt-for-mfa-totp.php +++ b/modules/material/themes/material/mfa/prompt-for-mfa-totp.php @@ -39,7 +39,7 @@ class="icon"> - From 3f9a018045dcdee81b20b27d9406dc4d710983fa Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Wed, 29 May 2024 16:48:10 +0800 Subject: [PATCH 04/13] PHP 8 update https://github.com/silinternational/simplesamlphp-module-material/pull/108 --- docs/material_tests.md | 1 + modules/material/themes/material/mfa/low-on-backup-codes.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/material_tests.md b/docs/material_tests.md index a2cc2247..87a2fed0 100644 --- a/docs/material_tests.md +++ b/docs/material_tests.md @@ -115,6 +115,7 @@ _Note: This nag only works once since choosing later will simply set the nag da 1. Goto [SP 1](http://ssp-sp1.local:8081/module.php/core/authenticate.php?as=ssp-hub-custom-port) 1. Click **idp4** (third one) 1. Login as a "totp" user: `username=`**has_totp** `password=`**a** +1. You should see the form to enter a totp code. 1. Set up an app using this secret, `JVRXKYTMPBEVKXLS` 1. Enter code from app to verify 1. Click **Logout** diff --git a/modules/material/themes/material/mfa/low-on-backup-codes.php b/modules/material/themes/material/mfa/low-on-backup-codes.php index 152207dd..9f148a1c 100644 --- a/modules/material/themes/material/mfa/low-on-backup-codes.php +++ b/modules/material/themes/material/mfa/low-on-backup-codes.php @@ -29,7 +29,7 @@

- t('{material:mfa:running_out_info}', ['{numBackupCodesRemaining}' => (int)$this->data['numBackupCodesRemaining']]) ?> + t('{material:mfa:running_out_info}', ['{numBackupCodesRemaining}' => (string)(int)$this->data['numBackupCodesRemaining']]) ?>

From 5671793b693ba0307515edb823a1d1097cb9b9ff Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Wed, 29 May 2024 16:56:15 +0800 Subject: [PATCH 05/13] fixed bug with float type sent to translate, added manual testing scen https://github.com/silinternational/simplesamlphp-module-material/pull/113 --- development/idp-local/config/authsources.php | 14 ++++++++++++++ docs/material_tests.md | 16 ++++++++++++++-- .../material/expirychecker/about2expire.php | 2 +- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/development/idp-local/config/authsources.php b/development/idp-local/config/authsources.php index b03e4fcb..9971fe63 100644 --- a/development/idp-local/config/authsources.php +++ b/development/idp-local/config/authsources.php @@ -43,6 +43,20 @@ 'mfa' => [ 'prompt' => 'no', ], + 'schacExpiryDate' => [ + gmdate('YmdHis\Z', strtotime('+3 days')), // Soon but not tomorrow + ], + ], + + // expirychecker test user whose password expires in one day + 'next_day:a' => [ + 'eduPersonPrincipalName' => ['NEXT_DAY@ssp-hub-idp2.local'], + 'eduPersonTargetID' => ['22888888-2222-2222-2222-222222222222'], + 'sn' => ['Day'], + 'givenName' => ['Next'], + 'mail' => ['next_day@example.com'], + 'employeeNumber' => ['22888'], + 'cn' => ['NEXT_DAY'], 'schacExpiryDate' => [ gmdate('YmdHis\Z', strtotime('+1 day')), // Very soon ], diff --git a/docs/material_tests.md b/docs/material_tests.md index 87a2fed0..5e287bd1 100644 --- a/docs/material_tests.md +++ b/docs/material_tests.md @@ -54,9 +54,21 @@ See [Local Testing](../README.md#local-testing) for instructions to set up your ## Expiry functionality -### About to expire page +### About to expire page (expires in one day) -_Note: This nag only works once since choosing later will simply set the nag date into the future a little._ +_Note: This nag only works once since choosing later will simply set the nag date into the future a little. +If needed, use a new private/incognito browser window to retry.__ + +1. Goto [SP 1](http://ssp-sp1.local:8081/module.php/core/authenticate.php?as=ssp-hub-custom-port) +1. Click **idp2** (second one) +1. Login as an "about to expire" user: `username=`**next_day** `password=`**a** +1. Click **Later** +1. Click **Logout** + +### About to expire page (expires in three days) + +_Note: This nag only works once since choosing later will simply set the nag date into the future a little. +If needed, use a new private/incognito browser window to retry.__ 1. Goto [SP 1](http://ssp-sp1.local:8081/module.php/core/authenticate.php?as=ssp-hub-custom-port) 1. Click **idp2** (second one) diff --git a/modules/material/themes/material/expirychecker/about2expire.php b/modules/material/themes/material/expirychecker/about2expire.php index 59e8f0fe..6ef67783 100644 --- a/modules/material/themes/material/expirychecker/about2expire.php +++ b/modules/material/themes/material/expirychecker/about2expire.php @@ -31,7 +31,7 @@ $expiringMessage = $daysLeft < 2 ? $this->t('{material:about2expire:expiring_in_a_day}') : $this->t('{material:about2expire:expiring_soon}', - ['{daysLeft}' => $daysLeft]); + ['{daysLeft}' => (string)$daysLeft]); ?>

From 6ccbb260255d716c80ab0dac50620255d4035fcc Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Wed, 29 May 2024 17:06:46 +0800 Subject: [PATCH 06/13] add logo caption https://github.com/silinternational/simplesamlphp-module-material/pull/115 https://github.com/silinternational/simplesamlphp-module-material/pull/121 https://github.com/silinternational/simplesamlphp-module-material/pull/123 --- .../material/default/selectidp-links.php | 62 ++++++++++++++++--- 1 file changed, 53 insertions(+), 9 deletions(-) diff --git a/modules/material/themes/material/default/selectidp-links.php b/modules/material/themes/material/default/selectidp-links.php index a5d6df67..d40d4f18 100644 --- a/modules/material/themes/material/default/selectidp-links.php +++ b/modules/material/themes/material/default/selectidp-links.php @@ -82,10 +82,14 @@ function clickedAnyway(idpName) { ?>
-
@@ -101,11 +105,15 @@ function clickedAnyway(idpName) { ?>
-
- +
+
+
+ +
+ ': htmlentities($idp['logoCaption']) ?> +
+ From 3ae33b2a8440afee076f61b1c1bf2c81199f3453 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Wed, 29 May 2024 17:12:57 +0800 Subject: [PATCH 07/13] IDP-103 Have the browser require the username and password on login page https://github.com/silinternational/simplesamlphp-module-material/pull/125 --- modules/material/themes/material/core/loginuserpass.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/material/themes/material/core/loginuserpass.php b/modules/material/themes/material/core/loginuserpass.php index afea971b..dd950c80 100644 --- a/modules/material/themes/material/core/loginuserpass.php +++ b/modules/material/themes/material/core/loginuserpass.php @@ -82,7 +82,7 @@ function onRecaptchaLoad() { data['username'] ?? null); ?> - id="username"/> @@ -91,7 +91,7 @@ function onRecaptchaLoad() { t('{material:login:label_password}') ?> - + id="password"/> From cee96f3fdf0b1c80c1491754cedadac0da17bcd4 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Wed, 29 May 2024 17:14:13 +0800 Subject: [PATCH 08/13] Add width related styling to the header in order to allow the word wrap to styling to function https://github.com/silinternational/simplesamlphp-module-material/pull/127/files --- modules/material/themes/material/default/selectidp-links.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/material/themes/material/default/selectidp-links.php b/modules/material/themes/material/default/selectidp-links.php index d40d4f18..44a3d00b 100644 --- a/modules/material/themes/material/default/selectidp-links.php +++ b/modules/material/themes/material/default/selectidp-links.php @@ -28,7 +28,7 @@ function clickedAnyway(idpName) {
- + data['spName'] ?? null; if (empty($spName)) { From e147782f6f757b047b28569d1dc0b7d3f5516a5c Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Wed, 29 May 2024 17:15:52 +0800 Subject: [PATCH 09/13] Tell user which IdP the smartphone app is needed for https://github.com/silinternational/simplesamlphp-module-material/pull/129 --- .../material/themes/material/mfa/prompt-for-mfa-totp.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-totp.php b/modules/material/themes/material/mfa/prompt-for-mfa-totp.php index c85c6718..303c0d55 100644 --- a/modules/material/themes/material/mfa/prompt-for-mfa-totp.php +++ b/modules/material/themes/material/mfa/prompt-for-mfa-totp.php @@ -28,6 +28,13 @@ class="icon">
+
+ configuration->getValue('idp_display_name', $this->configuration->getValue('idp_name', '—'))); + ?> + (t('{material:mfa:account}', ['{idpName}' => $idpName]) ?>) +
+

t('{material:mfa:totp_instructions}') ?> From 31e3cfc166d77ffe3ab11f60b204735ca2313962 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Wed, 29 May 2024 17:20:11 +0800 Subject: [PATCH 10/13] idp name reminder on TOTP form https://github.com/silinternational/simplesamlphp-module-material/pull/131/files --- modules/material/dictionaries/mfa.definition.json | 8 ++++---- .../material/themes/material/mfa/prompt-for-mfa-totp.php | 8 +------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/modules/material/dictionaries/mfa.definition.json b/modules/material/dictionaries/mfa.definition.json index 1d992b32..7d87e71c 100644 --- a/modules/material/dictionaries/mfa.definition.json +++ b/modules/material/dictionaries/mfa.definition.json @@ -37,10 +37,10 @@ "ko": "코드 입력" }, "totp_header": { - "en": "Smartphone app", - "es": "Aplicación de teléfono inteligente", - "fr": "Application pour smartphone", - "ko": "스마트폰 앱" + "en": "Get a code from your smartphone app", + "es": "Obtenga un código de la aplicación de su teléfono inteligente", + "fr": "Obtenez un code depuis l'application sur votre smartphone", + "ko": "스마트폰 앱에서 코드 받기" }, "totp_icon": { "en": "Smartphone app icon", diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-totp.php b/modules/material/themes/material/mfa/prompt-for-mfa-totp.php index 303c0d55..b0d10248 100644 --- a/modules/material/themes/material/mfa/prompt-for-mfa-totp.php +++ b/modules/material/themes/material/mfa/prompt-for-mfa-totp.php @@ -31,14 +31,8 @@ class="icon">

configuration->getValue('idp_display_name', $this->configuration->getValue('idp_name', '—'))); + echo $this->t('{material:mfa:account}', ['{idpName}' => $idpName]); ?> - (t('{material:mfa:account}', ['{idpName}' => $idpName]) ?>) -
- -
-

- t('{material:mfa:totp_instructions}') ?> -

From 92f26dda03aa7c92ea556b30e5f5025139ac240e Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Wed, 29 May 2024 17:25:40 +0800 Subject: [PATCH 11/13] Improve English "Send code to manager" wording https://github.com/silinternational/simplesamlphp-module-material/pull/107/files --- .../material/dictionaries/mfa.definition.json | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/material/dictionaries/mfa.definition.json b/modules/material/dictionaries/mfa.definition.json index 7d87e71c..a212a988 100644 --- a/modules/material/dictionaries/mfa.definition.json +++ b/modules/material/dictionaries/mfa.definition.json @@ -134,15 +134,15 @@ }, "webauthn_error_abort": { "en": "It looks like you clicked cancel. Would you like us to try again?", - "es": "It looks like you clicked cancel. Would you like us to try again?", + "es": "Parece que has hecho clic en cancelar. ¿Quieres que lo intentemos de nuevo?", "fr": "Il semble que vous ayez cliqué sur annuler. Souhaitez-vous que nous essayions à nouveau ?", - "ko": "It looks like you clicked cancel. Would you like us to try again?" + "ko": "취소를 클릭하신 것 같습니다. 다시 시도해 보시겠어요?" }, "webauthn_error_not_allowed": { "en": "Something about that didn't work. Please ensure that your security key is plugged in and that you touch it within 60 seconds when it blinks.", - "es": "Something about that didn't work. Please ensure that your security key is plugged in and that you touch it within 60 seconds when it blinks.", + "es": "Algo de eso no funcionó. Por favor, asegúrese de que su clave de seguridad está conectada y de que la toca en un plazo de 60 segundos cuando parpadea.", "fr": "Quelque chose n'a pas fonctionné avec ça. Veuillez vous assurer que votre clé de sécurité est insérée et que vous la touchez dans les 60 secondes lorsqu'elle clignote.", - "ko": "Something about that didn't work. Please ensure that your security key is plugged in and that you touch it within 60 seconds when it blinks." + "ko": "문제가 해결되지 않았습니다. 보안 키가 연결되어 있고 깜박일 때 60초 이내에 터치했는지 확인하세요." }, "manager_icon": { "en": "Recovery contact icon", @@ -151,16 +151,16 @@ "ko": "복구 연락처 아이콘" }, "manager_header": { - "en": "Recovery contact help", - "es": "Ayuda de contacto de recuperación", - "fr": "Aide de contact de récupération", - "ko": "복구 연락처" + "en": "Ask Your Recovery Contact for Help", + "es": "Pida ayuda de contacto de recuperación", + "fr": "Demandez de l'aide à votre contact de récupération", + "ko": "복구 담당자에게 도움을 요청하십시오" }, "manager_info": { - "en": "We can send a code to your recovery contact which can be used as a temporary 2-Step Verification option. The email address on file (masked for privacy) is {managerEmail}.", - "es": "Podemos enviar un código a su contacto de recuperación que puede usarse como una opción de Verificación temporal de 2 pasos. La dirección de correo electrónico en el archivo (enmascarada por privacidad) es {managerEmail}.", - "fr": "Nous pouvons envoyer un code à votre contact de récupération, qui peut être utilisé comme option de vérification temporaire en deux étapes. L'adresse électronique au dossier (masquée pour la confidentialité) est {managerEmail}.", - "ko": "\n임시 2 단계 인증 옵션으로 사용할 수있는 코드를 복구 담당자에게 보낼 수 있습니다. 파일의 이메일 주소 (개인 정보 보호를 위해 마스크 됨)는 {managerEmail}입니다." + "en": "You can send a 2-step verification code to your recovery contact (usually your supervisor). The email we have for your recovery contact is:

{managerEmail}

We've hidden most of the letters for your contact's protection.", + "es": "Puede enviar un código de verificación de dos pasos a su contacto de recuperación (normalmente su supervisor). La dirección de correo electrónico que tenemos para su contacto de recuperación es:

{managerEmail}

Ocultamos la mayoría de las letras para proteger a su contacto.", + "fr": "Vous pouvez envoyer un code de vérification en deux étapes à votre contact de récupération (en général votre superviseur). L'adresse électronique que nous avons pour votre contact de récupération est:

{managerEmail}

. Nous avons caché la plupart des lettres pour la protection de votre contact.", + "ko": "2단계 인증 코드를 복구 연락처(보통 상사)에게 보낼 수 있습니다. 복구 연락처에 대한 이메일은 다음과 같습니다.

{managerEmail}

연락처 보호를 위해 대부분의 편지를 숨겼습니다." }, "manager_sent": { "en": "A temporary code was sent your recovery contact at {managerEmail}.", @@ -367,10 +367,10 @@ "ko": "사본" }, "button_send": { - "en": "Send", - "es": "Enviar", - "fr": "Envoyer", - "ko": "보내다" + "en": "Send code", + "es": "Enviar código", + "fr": "Envoyer code", + "ko": "코드 보내기" }, "button_cancel": { "en": "Cancel", From 5301b6992fdc809dea5f1d7651c83ef09ee6066b Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Wed, 29 May 2024 17:27:13 +0800 Subject: [PATCH 12/13] replace smartphone with authenticator IDP-24 https://github.com/silinternational/simplesamlphp-module-material/pull/134 --- .../material/dictionaries/mfa.definition.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/material/dictionaries/mfa.definition.json b/modules/material/dictionaries/mfa.definition.json index a212a988..287648eb 100644 --- a/modules/material/dictionaries/mfa.definition.json +++ b/modules/material/dictionaries/mfa.definition.json @@ -37,22 +37,22 @@ "ko": "코드 입력" }, "totp_header": { - "en": "Get a code from your smartphone app", - "es": "Obtenga un código de la aplicación de su teléfono inteligente", - "fr": "Obtenez un code depuis l'application sur votre smartphone", - "ko": "스마트폰 앱에서 코드 받기" + "en": "Get a code from your authenticator app", + "es": "Obtenga un código de su aplicación de autenticación", + "fr": "Obtenez un code depuis votre application d'authentification", + "ko": "인증 앱에서 코드 받기" }, "totp_icon": { - "en": "Smartphone app icon", + "en": "Authenticator app icon", "es": "Icono de aplicación de teléfono inteligente", "fr": "Icône de l'application Smartphone", - "ko": "스마트폰 응용 프로그램 아이콘" + "ko": "인증 응용 프로그램 아이콘" }, "totp_instructions": { - "en": "You will need to check your smartphone app for the current code.", - "es": "Deberá verificar la aplicación de su teléfono inteligente para ver el código actual.", - "fr": "Vous devriez vérifier l'application sur votre smartphone pour voir le code actuel.", - "ko": "스마트폰 앱에서 현재 코드를 확인해야합니다." + "en": "You will need to check your authenticator app for the current code.", + "es": "Deberá verificar la aplicación de autenticación para ver el código actual.", + "fr": "Vous devriez vérifier l'application d'authentification pour voir le code actuel.", + "ko": "인증 앱에서 현재 코드를 확인해야합니다." }, "totp_input": { "en": "Enter 6-digit code", @@ -283,10 +283,10 @@ "ko": "내 보안키 사용" }, "use_totp": { - "en": "Use my smartphone app instead", - "es": "Use la aplicación de mi teléfono inteligente en su lugar", - "fr": "Utiliser plutôt mon application smartphone", - "ko": "내 스마트폰 앱 사용" + "en": "Use my authenticator app instead", + "es": "Use la aplicación autenticación en su lugar", + "fr": "Utiliser plutôt mon application d'authentification", + "ko": "내 인증 앱 사용" }, "use_backupcode": { "en": "Use a printable code instead", From be25acad767401aff3dd53dc886bd515ad022cf3 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Wed, 29 May 2024 18:49:55 +0800 Subject: [PATCH 13/13] update match strings in mfa tests --- features/bootstrap/MfaContext.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/features/bootstrap/MfaContext.php b/features/bootstrap/MfaContext.php index d23d1592..988f1fb6 100644 --- a/features/bootstrap/MfaContext.php +++ b/features/bootstrap/MfaContext.php @@ -171,7 +171,7 @@ public function iShouldSeeAPromptForATotpCode() { $page = $this->session->getPage(); $pageHtml = $page->getHtml(); - Assert::assertContains('Smartphone app', $pageHtml); + Assert::assertContains('Authenticator app', $pageHtml); Assert::assertContains('Enter 6-digit code', $pageHtml); } @@ -659,7 +659,7 @@ public function iShouldSeeAPromptForAManagerRescueCode() { $page = $this->session->getPage(); $pageHtml = $page->getHtml(); - Assert::assertContains('Recovery contact help', $pageHtml); + Assert::assertContains('Ask Your Recovery Contact for Help', $pageHtml); Assert::assertContains('Enter code', $pageHtml); }