From 389d33d542fb87c489b4dd6395ed7f4a90001c32 Mon Sep 17 00:00:00 2001 From: Maxime Besson Date: Fri, 2 Sep 2022 17:40:36 +0200 Subject: [PATCH] Rename Yubikey 2FA type to Yubico OTP to avoid confusion --- doc/sources/admin/authyubikey.rst | 2 +- doc/sources/admin/cli_examples.rst | 2 +- doc/sources/admin/extendedfunctions.rst | 5 +++-- doc/sources/admin/parameterlist.rst | 16 +++++++------- doc/sources/admin/secondfactor.rst | 14 ++++++------ doc/sources/admin/start.rst | 4 ++-- doc/sources/admin/writingrulesand_headers.rst | 5 ++--- doc/sources/admin/yubikey2f.rst | 22 ++++++++++++------- .../site/htdocs/static/languages/ar.json | 6 ++--- .../site/htdocs/static/languages/en.json | 4 ++-- .../site/htdocs/static/languages/es.json | 6 ++--- .../site/htdocs/static/languages/fr.json | 6 ++--- .../site/htdocs/static/languages/he.json | 6 ++--- .../site/htdocs/static/languages/it.json | 6 ++--- .../site/htdocs/static/languages/pl.json | 6 ++--- .../site/htdocs/static/languages/tr.json | 6 ++--- .../site/htdocs/static/languages/vi.json | 6 ++--- .../site/htdocs/static/languages/zh.json | 6 ++--- .../site/htdocs/static/languages/zh_TW.json | 6 ++--- .../lib/Lemonldap/NG/Portal/2F/Yubikey.pm | 4 ++-- 20 files changed, 72 insertions(+), 66 deletions(-) diff --git a/doc/sources/admin/authyubikey.rst b/doc/sources/admin/authyubikey.rst index 4224efb54..ec465b63d 100644 --- a/doc/sources/admin/authyubikey.rst +++ b/doc/sources/admin/authyubikey.rst @@ -5,4 +5,4 @@ Yubikey .. attention:: This module has been replaced by - :doc:`Yubikey Second Factor`\ + :doc:`Yubico OTP Second Factor`\ diff --git a/doc/sources/admin/cli_examples.rst b/doc/sources/admin/cli_examples.rst index b07d341fa..2b8c8b44e 100644 --- a/doc/sources/admin/cli_examples.rst +++ b/doc/sources/admin/cli_examples.rst @@ -608,7 +608,7 @@ List second factors of a user :: lemonldap-ng-sessions secondfactors get dwho -Deregister Yubikey of a user :: +Deregister Yubico OTP for a user :: lemonldap-ng-sessions secondfactors delType dwho UBK diff --git a/doc/sources/admin/extendedfunctions.rst b/doc/sources/admin/extendedfunctions.rst index 6dd1a9c95..c932d6286 100644 --- a/doc/sources/admin/extendedfunctions.rst +++ b/doc/sources/admin/extendedfunctions.rst @@ -260,11 +260,12 @@ has2f .. versionadded:: 2.0.10 -This function tests if the current user has registered a second factor. The following types are supported: +This function tests if the current user has registered a second factor. The following types are supported out of the box: * :doc:`TOTP` * :doc:`U2F` * :doc:`UBK` +* :doc:`WebAuthn` Example:: @@ -457,4 +458,4 @@ Simple usage example: :: - unicode2isoSafe($name) \ No newline at end of file + unicode2isoSafe($name) diff --git a/doc/sources/admin/parameterlist.rst b/doc/sources/admin/parameterlist.rst index 8ed2dab24..fb1010e00 100644 --- a/doc/sources/admin/parameterlist.rst +++ b/doc/sources/admin/parameterlist.rst @@ -657,17 +657,17 @@ webauthnDisplayNameAttr Session attribute contai webauthnRpName WebAuthn Relying Party display name ✔ whatToTrace Session parameter used to fill REMOTE_USER ✔ ✔ wsdlServer Enable /portal.wsdl server ✔ -yubikey2fActivation Yubikey second factor activation ✔ -yubikey2fAuthnLevel Authentication level for users authentified by Yubikey second factor ✔ +yubikey2fActivation Yubico OTP second factor activation ✔ +yubikey2fAuthnLevel Authentication level for users authentified by Yubico OTP second factor ✔ yubikey2fClientID Yubico client ID ✔ -yubikey2fFromSessionAttribute Provision yubikey from the given session variable ✔ -yubikey2fLabel Portal label for Yubikey second factor ✔ -yubikey2fLogo Custom logo for Yubikey 2F ✔ +yubikey2fFromSessionAttribute Provision Yubico OTP ID from the given session variable ✔ +yubikey2fLabel Portal label for Yubico OTP second factor ✔ +yubikey2fLogo Custom logo for Yubico OTP 2F ✔ yubikey2fNonce Yubico nonce ✔ -yubikey2fPublicIDSize Yubikey public ID size ✔ +yubikey2fPublicIDSize Yubico public ID size ✔ yubikey2fSecretKey Yubico secret key ✔ -yubikey2fSelfRegistration Yubikey self registration activation ✔ -yubikey2fTTL Yubikey device time to live ✔ +yubikey2fSelfRegistration Yubico self registration activation ✔ +yubikey2fTTL Yubico device time to live ✔ yubikey2fUrl Yubico server ✔ yubikey2fUserCanRemoveKey Authorize users to remove existing Yubikey ✔ zimbraAccountKey Zimbra account session key ✔ ✔ diff --git a/doc/sources/admin/secondfactor.rst b/doc/sources/admin/secondfactor.rst index 4373e9454..7e4418cc2 100644 --- a/doc/sources/admin/secondfactor.rst +++ b/doc/sources/admin/secondfactor.rst @@ -103,30 +103,30 @@ Providing tokens from an external source ---------------------------------------- If you do not want to use self-registration features for U2F, TOTP and so -on, you can set tokens by yourself *(in your LDAP server for example)* +on, you can set devices by yourself *(in your LDAP server for example)* and map it to ``_2fDevices`` attribute. ``_2fDevices`` is a JSON array -that contains token descriptions : +that contains device descriptions : .. code:: - [ {"type" : "TOTP", "name" : "MyTOTP", …}, {}, …] + [ {"type" : "TOTP", "name" : "MyTOTP", …}, {}, …] -U2F Tokens +U2F Device ~~~~~~~~~~ .. code-block:: json {"name" : "MyU2FKey" , "type" : "U2F" , "_userKey" : "########" , "_keyHandle":"########" , "epoch":"1524078936"} -TOTP Tokens +TOTP Device ~~~~~~~~~~~ .. code-block:: json {"name" : "MyTOTP" , "type" : "TOTP" , "_secret" : "########" , "epoch" : "1523817955"} -Yubikey Tokens -~~~~~~~~~~~~~~ +Yubico OTP Device +~~~~~~~~~~~~~~~~~ .. code-block:: json diff --git a/doc/sources/admin/start.rst b/doc/sources/admin/start.rst index de2ddf996..e8385a66b 100644 --- a/doc/sources/admin/start.rst +++ b/doc/sources/admin/start.rst @@ -157,7 +157,7 @@ Official Backends Authenticat :doc:`SSL` ✔ :doc:`Twitter` ✔ :doc:`WebID` ✔ ✔ -:doc:`Yubikey` |deprecated| *Replaced by* :doc:`yubikey2f` +:doc:`Yubico OTP` |deprecated| *Replaced by* :doc:`yubikey2f` :doc:`Custom modules` |new| ✔ ✔ ✔ ==================================================================== =============================================== ======== ======== @@ -182,7 +182,7 @@ Second factor (:doc:`documentation`) Authenticat :doc:`TOTP` *(Google Authenticator,...)* |new| ✔ ✔ :doc:`WebAuthn` |new| ✔ ✔ :doc:`E-mail Second Factor` |new| ✔ -:doc:`Yubikey` |new| ✔ ✔ +:doc:`Yubico OTP` |new| ✔ ✔ :doc:`External Second Factor` *(OTP, SMS,...)* |new| ✔ :doc:`REST Second Factor` |new| ✔ :doc:`Radius Second Factor` |new| [3]_ ✔ diff --git a/doc/sources/admin/writingrulesand_headers.rst b/doc/sources/admin/writingrulesand_headers.rst index 63db04798..6ad15cb5e 100644 --- a/doc/sources/admin/writingrulesand_headers.rst +++ b/doc/sources/admin/writingrulesand_headers.rst @@ -119,12 +119,11 @@ level depends on authentication backend used by this user. Default values are: - 0 for :doc:`Null` -- 1 for :doc:`CAS`, :doc:`old OpenID-2`, +- 1 for :doc:`CAS`, :doc:`OpenID Connect`, :doc:`Facebook`,… - 2 for web-form based authentication (:doc:`LDAP`, :doc:`DBI`,…) -- 3 for :doc:`Yubikey` -- 4 for :doc:`Kerberos` +- 3 for :doc:`Kerberos` - 5 for :doc:`SSL` There are three ways to impose users a higher authentication level: diff --git a/doc/sources/admin/yubikey2f.rst b/doc/sources/admin/yubikey2f.rst index b359414cd..ea9123dfd 100644 --- a/doc/sources/admin/yubikey2f.rst +++ b/doc/sources/admin/yubikey2f.rst @@ -1,9 +1,13 @@ -Yubikey Second Factor -===================== +Yubico OTP Second Factor +======================== -A `Yubikey `__ is a small material token -manufactured by `Yubico `__. It sends an OTP, -which is validated via Yubico server. +Yubico OTP is a type of One-Time-Password authentication based on a +keyboard-emulating hardware device (Yubikey). OTPs are validated against an +external server, either on the cloud or on premices. + +|deprecated| Almost all Yubikeys sold by Yubico now support :doc:`FIDO2 `. +You are encouraged to use this type of second factor instead, since it is +compatible with a much broader range of devices, and also more secure. Prerequisites and dependencies ------------------------------ @@ -50,9 +54,9 @@ In the manager (second factors), you just have to enable it: If you want to use a custom rule for "activation" and want to keep self-registration, you must include this in your rule: - ``$_2fDevices =~ /"type":\s*"UBK"/s``, else Yubikey will be required - even if users are not registered. This is automatically done when - "activation" is simply set to "on". + ``has2f('UBK')``, else Yubico OTP will be required even if users are not + registered. This is automatically done when "activation" is simply set to + "on". Provisioning ------------ @@ -71,3 +75,5 @@ Enrollment If you have enabled self registration, users can register their U2F keys using https://portal/2fregisters + +.. |deprecated| image:: /documentation/deprecated.png diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json index 0bcad904b..c86d8b062 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json @@ -896,8 +896,8 @@ "requireToken":"يتطلب توكن للإستمارة", "rest2f":"REST second factor", "rest2fActivation":"تفعيل", -"rest2fCodeActivation":"Code regex", "rest2fAuthnLevel":"مستوى إثبات الهوية", +"rest2fCodeActivation":"Code regex", "rest2fInitArgs":"Init arguments", "rest2fInitUrl":"Init URL", "rest2fLabel":"Label", @@ -1248,7 +1248,7 @@ "whatToTrace":"المستخدم_البعيد", "whiteList":"القائمة البيضاء", "wsdlServer":"WSDL server", -"yubikey2f":"Yubikey", +"yubikey2f":"Yubico OTP", "yubikey2fActivation":"تفعيل", "yubikey2fAuthnLevel":"مستوى إثبات الهوية", "yubikey2fClientID":"API العميل ID", @@ -1263,4 +1263,4 @@ "yubikey2fUrl":"خدمة أل يو أر ل", "yubikey2fUserCanRemoveKey":"Allow user to remove Yubikey", "zeroConfExplanations":"لا يحتوي الخادم على إعدادات. استخدام قالب لحفظ الأول" -} \ No newline at end of file +} diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/en.json b/lemonldap-ng-manager/site/htdocs/static/languages/en.json index 8f1df8377..a1cf9760d 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/en.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/en.json @@ -896,8 +896,8 @@ "requireToken":"Require token for forms", "rest2f":"REST second factor", "rest2fActivation":"Activation", -"rest2fCodeActivation":"Code regex", "rest2fAuthnLevel":"Authentication level", +"rest2fCodeActivation":"Code regex", "rest2fInitArgs":"Init arguments", "rest2fInitUrl":"Init URL", "rest2fLabel":"Label", @@ -1248,7 +1248,7 @@ "whatToTrace":"REMOTE_USER", "whiteList":"White list", "wsdlServer":"WSDL server", -"yubikey2f":"Yubikey", +"yubikey2f":"Yubico OTP", "yubikey2fActivation":"Activation", "yubikey2fAuthnLevel":"Authentication level", "yubikey2fClientID":"API client ID", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/es.json b/lemonldap-ng-manager/site/htdocs/static/languages/es.json index dead6527b..30a425387 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/es.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/es.json @@ -896,8 +896,8 @@ "requireToken":"Require token for forms", "rest2f":"Previo", "rest2fActivation":"Activación", -"rest2fCodeActivation":"Regex", "rest2fAuthnLevel":"Nivel de autentificación", +"rest2fCodeActivation":"Regex", "rest2fInitArgs":"Argumentos de inicio", "rest2fInitUrl":"URL de inicio", "rest2fLabel":"Etiqueta", @@ -1248,7 +1248,7 @@ "whatToTrace":"REMOTE_USER", "whiteList":"White list", "wsdlServer":"WSDL server", -"yubikey2f":"Yubikey", +"yubikey2f":"Yubico OTP", "yubikey2fActivation":"Activación", "yubikey2fAuthnLevel":"Nivel de autentificación", "yubikey2fClientID":"API client ID", @@ -1263,4 +1263,4 @@ "yubikey2fUrl":"URL de servicio", "yubikey2fUserCanRemoveKey":"Allow user to remove Yubikey", "zeroConfExplanations":"Server has no configuration. Use template to save the first." -} \ No newline at end of file +} diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json index 7e261dbea..544ac7f2e 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json @@ -896,8 +896,8 @@ "requireToken":"Exiger un jeton pour les formulaires", "rest2f":"Second facteur REST", "rest2fActivation":"Activation", -"rest2fCodeActivation":"Expression régulière pour la génération du code", "rest2fAuthnLevel":"Niveau d'authentification", +"rest2fCodeActivation":"Expression régulière pour la génération du code", "rest2fInitArgs":"Arguments d'initialisation", "rest2fInitUrl":"URL d'initialisation", "rest2fLabel":"Label", @@ -1133,8 +1133,8 @@ "stayConnectedCookieName":"Nom du cookie", "stayConnectedTimeout":"Durée de validité", "storePassword":"Stocke le mot de passe de l'utilisateur en session", -"string":"Chaîne", "strictTransportSecurityMax_Age":"Age maximum Strict-Transport-Security", +"string":"Chaîne", "subtitle":"Sous-titre", "successLoginNumber":"Nombre de connexions mémorisées", "successfullySaved":"Sauvegarde effectuée", @@ -1248,7 +1248,7 @@ "whatToTrace":"REMOTE_USER", "whiteList":"Liste blanche", "wsdlServer":"Serveur WSDL", -"yubikey2f":"Yubikey", +"yubikey2f":"Yubico OTP", "yubikey2fActivation":"Activation", "yubikey2fAuthnLevel":"Niveau d'authentification", "yubikey2fClientID":"Identifiant client de l'API", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/he.json b/lemonldap-ng-manager/site/htdocs/static/languages/he.json index 96ca4a4af..362e4c182 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/he.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/he.json @@ -896,8 +896,8 @@ "requireToken":"דרישת אסימון לטפסים", "rest2f":"אימות דו־שלבי ב־REST", "rest2fActivation":"הפעלה", -"rest2fCodeActivation":"Code regex", "rest2fAuthnLevel":"דרגת אימות", +"rest2fCodeActivation":"Code regex", "rest2fInitArgs":"Init arguments", "rest2fInitUrl":"כתובת אתחול", "rest2fLabel":"תווית", @@ -1248,7 +1248,7 @@ "whatToTrace":"REMOTE_USER", "whiteList":"רשימת היתר", "wsdlServer":"שרת WSDL", -"yubikey2f":"Yubikey", +"yubikey2f":"Yubico OTP", "yubikey2fActivation":"הפעלה", "yubikey2fAuthnLevel":"דרגת אימות", "yubikey2fClientID":"API client ID", @@ -1263,4 +1263,4 @@ "yubikey2fUrl":"כתובת שירות", "yubikey2fUserCanRemoveKey":"לאפשר למשתמש להסיר Yubikey", "zeroConfExplanations":"Server has no configuration. Use template to save the first." -} \ No newline at end of file +} diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/it.json b/lemonldap-ng-manager/site/htdocs/static/languages/it.json index a81ec7cbb..c2dfec4e6 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/it.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/it.json @@ -896,8 +896,8 @@ "requireToken":"Richiede il token per i moduli", "rest2f":"REST secondo fattore", "rest2fActivation":"Attivazione", -"rest2fCodeActivation":"Codice regex", "rest2fAuthnLevel":"Livello di autenticazione", +"rest2fCodeActivation":"Codice regex", "rest2fInitArgs":"Argomenti di init", "rest2fInitUrl":"URL iniziale", "rest2fLabel":"Label", @@ -1248,7 +1248,7 @@ "whatToTrace":"\nREMOTE_USER", "whiteList":"Lista bianca", "wsdlServer":"Server WSDL", -"yubikey2f":"Yubikey", +"yubikey2f":"Yubico OTP", "yubikey2fActivation":"Attivazione", "yubikey2fAuthnLevel":"Livello di autenticazione", "yubikey2fClientID":"ID client API", @@ -1263,4 +1263,4 @@ "yubikey2fUrl":"URL del servizio", "yubikey2fUserCanRemoveKey":"Autorizza l'utente a rimuovere la Yubikey", "zeroConfExplanations":"Il server non ha alcuna configurazione. Utilizza il modello per salvare il primo." -} \ No newline at end of file +} diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json index ac2814055..8c3b31628 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json @@ -896,8 +896,8 @@ "requireToken":"Wymagaj tokena do formularzy", "rest2f":"Drugi czynnik REST", "rest2fActivation":"Aktywacja", -"rest2fCodeActivation":"Wyrażenie regularne kodu", "rest2fAuthnLevel":"Poziom uwierzytelnienia", +"rest2fCodeActivation":"Wyrażenie regularne kodu", "rest2fInitArgs":"Początkowe argumenty", "rest2fInitUrl":"Początkowy adres URL", "rest2fLabel":"Etykieta", @@ -1248,7 +1248,7 @@ "whatToTrace":"REMOTE_USER", "whiteList":"Biała lista", "wsdlServer":"Serwer WSDL", -"yubikey2f":"Yubikey", +"yubikey2f":"Yubico OTP", "yubikey2fActivation":"Aktywacja", "yubikey2fAuthnLevel":"Poziom uwierzytelnienia", "yubikey2fClientID":"Identyfikator klienta API", @@ -1263,4 +1263,4 @@ "yubikey2fUrl":"URL usługi", "yubikey2fUserCanRemoveKey":"Pozwól użytkownikowi usunąć Yubikey", "zeroConfExplanations":"Serwer nie ma konfiguracji. Użyj szablonu, aby zapisać pierwszy." -} \ No newline at end of file +} diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json index 8eb82490b..da37e00e0 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json @@ -896,8 +896,8 @@ "requireToken":"Formlar için jeton gerekir", "rest2f":"REST ile ikinci faktör", "rest2fActivation":"Aktivasyon", -"rest2fCodeActivation":"Düzenli ifade kodla", "rest2fAuthnLevel":"Doğrulama seviyesi", +"rest2fCodeActivation":"Düzenli ifade kodla", "rest2fInitArgs":"Başlangıç argümanları", "rest2fInitUrl":"Başlangıç URL", "rest2fLabel":"Etiket", @@ -1248,7 +1248,7 @@ "whatToTrace":"REMOTE_USER", "whiteList":"Beyaz liste", "wsdlServer":"WSDL sunucusu", -"yubikey2f":"Yubikey", +"yubikey2f":"Yubico OTP", "yubikey2fActivation":"Aktivasyon", "yubikey2fAuthnLevel":"Doğrulama seviyesi", "yubikey2fClientID":"API istemci ID", @@ -1263,4 +1263,4 @@ "yubikey2fUrl":"Servis URL'si", "yubikey2fUserCanRemoveKey":"Yubikey'i kaldırmak için kullanıcıya izin ver", "zeroConfExplanations":"Sunucunun yapılandırması yok. Şimdi bir tane kaydetmek için şablonu kullanın." -} \ No newline at end of file +} diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json index fab9f81cc..1b73c4805 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json @@ -896,8 +896,8 @@ "requireToken":"Yêu cầu token cho các biểu mẫu", "rest2f":"REST second factor", "rest2fActivation":"Kích hoạt", -"rest2fCodeActivation":"Code regex", "rest2fAuthnLevel":"Mức xác thực", +"rest2fCodeActivation":"Code regex", "rest2fInitArgs":"Init arguments", "rest2fInitUrl":"Init URL", "rest2fLabel":"Label", @@ -1248,7 +1248,7 @@ "whatToTrace":"REMOTE_USER", "whiteList":"Danh sách trắng", "wsdlServer":"Địa chỉ WSDL", -"yubikey2f":"Yubikey", +"yubikey2f":"Yubico OTP", "yubikey2fActivation":"Kích hoạt", "yubikey2fAuthnLevel":"Mức xác thực", "yubikey2fClientID":"ID ứng dụng khách API", @@ -1263,4 +1263,4 @@ "yubikey2fUrl":"Dịch vụ URL", "yubikey2fUserCanRemoveKey":"Allow user to remove Yubikey", "zeroConfExplanations":"Máy chủ không có cấu hình. Sử dụng mẫu để lưu đầu tiên. " -} \ No newline at end of file +} diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json index 62d2fa88b..25c2e8c33 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json @@ -896,8 +896,8 @@ "requireToken":"需要表單權杖", "rest2f":"REST 第二因素", "rest2fActivation":"激活", -"rest2fCodeActivation":"代碼正規表示式", "rest2fAuthnLevel":"认证等级", +"rest2fCodeActivation":"代碼正規表示式", "rest2fInitArgs":"初始化參數", "rest2fInitUrl":"初始化 URL", "rest2fLabel":"標籤", @@ -1248,7 +1248,7 @@ "whatToTrace":"REMOTE_USER", "whiteList":"白名單", "wsdlServer":"WSDL 服务器", -"yubikey2f":"Yubikey", +"yubikey2f":"Yubico OTP", "yubikey2fActivation":"激活", "yubikey2fAuthnLevel":"认证等级", "yubikey2fClientID":"API 客戶端 ID", @@ -1263,4 +1263,4 @@ "yubikey2fUrl":"服务 URL", "yubikey2fUserCanRemoveKey":"允許使用者移除 Yubikey", "zeroConfExplanations":"伺服器未設定。使用飯本來儲存第一個。" -} \ No newline at end of file +} diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json b/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json index e10e9db5b..f1f65fcee 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json @@ -896,8 +896,8 @@ "requireToken":"需要表單權杖", "rest2f":"REST 第二因素", "rest2fActivation":"啟用", -"rest2fCodeActivation":"代碼正規表示式", "rest2fAuthnLevel":"驗證等級", +"rest2fCodeActivation":"代碼正規表示式", "rest2fInitArgs":"初始化參數", "rest2fInitUrl":"初始化 URL", "rest2fLabel":"標籤", @@ -1248,7 +1248,7 @@ "whatToTrace":"REMOTE_USER", "whiteList":"白名單", "wsdlServer":"WSDL 伺服器", -"yubikey2f":"Yubikey", +"yubikey2f":"Yubico OTP", "yubikey2fActivation":"啟用", "yubikey2fAuthnLevel":"驗證等級", "yubikey2fClientID":"API 客戶端 ID", @@ -1263,4 +1263,4 @@ "yubikey2fUrl":"服務 URL", "yubikey2fUserCanRemoveKey":"允許使用者移除 Yubikey", "zeroConfExplanations":"伺服器未設定。使用飯本來儲存第一個。" -} \ No newline at end of file +} diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Yubikey.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Yubikey.pm index 15909872d..5d35eee3d 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Yubikey.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Yubikey.pm @@ -1,7 +1,7 @@ -# Yubikey second factor authentication +# Yubico OTP second factor authentication # # This plugin handle authentications to ask Yubikey second factor for users that -# have registered their Yubikey +# have registered their Yubikey using legacy OTP mode package Lemonldap::NG::Portal::2F::Yubikey; use strict;