Merge pull request ltb-project#874 from ltb-project/860-sms-encrypt-o…

…ption Test crypt_tokens parameter if SMS feature is enabled
Worteks · Mar 19, 2024 · 9ec3ad9 · 9ec3ad9
2 parents e80727d + 1b4ea59
commit 9ec3ad9
Show file tree

Hide file tree

Showing 30 changed files with 32 additions and 1 deletion.
diff --git a/htdocs/index.php b/htdocs/index.php
@@ -75,6 +75,9 @@
 # Check PHP xml presence
 if ( ! function_exists('utf8_decode') ) { $dependency_check_results[] = "nophpxml"; }
 
+# Check crypt_tokens option
+if ( $use_sms and !$crypt_tokens ) { $dependency_check_results[] = "nocrypttokens"; }
+
 # Check keyphrase setting
 if ( ( ( $use_tokens and $crypt_tokens ) or $use_sms or $crypt_answers ) and ( empty($keyphrase) or $keyphrase == "secret") ) { $dependency_check_results[] = "nokeyphrase"; }
 

diff --git a/lang/ar.inc.php b/lang/ar.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "PHP LDAP لاستعمال هذه الأداة يجب تنزيل";
 $messages['nophpmhash'] = "PHP mhash يجب عليك تثبيت Samba لاستخدام وضع";
 $messages['nokeyphrase'] = "keyphrase يتطلب تشفير الرمز سلسلة عشوائية في إعداد";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "LDAP يتعذر الوصول إلى دليل";
 $messages['loginrequired'] = "يجب إدخال اسم المستخدم الخاص بك";

diff --git a/lang/ca.inc.php b/lang/ca.inc.php
@@ -29,6 +29,7 @@
 $messages['nophpldap'] = "Cal instal·lar PHP LDAP per fer servir aquesta eina";
 $messages['nophpmhash'] = "Cal instal·lar PHP mhash per fer servir el mode Samba";
 $messages['nokeyphrase'] = "El xifrat per testimoni requereix una cadena aleatòria a la configuració de la frase clau";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "No es pot accedir al servidor LDAP";
 $messages['loginrequired'] = "Cal el nom d'usuari";

diff --git a/lang/cn.inc.php b/lang/cn.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "使用该工具需要安装PHP-Ldap";
 $messages['nophpmhash'] = "使用Samba模式需要安装PHP mhash";
 $messages['nokeyphrase'] = "Token encryption requires a random string in keyphrase setting";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "无法访问LDAP目录";
 $messages['loginrequired'] = "请先登录";

diff --git a/lang/cs.inc.php b/lang/cs.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Pro použití tohoto nástroje nainstalujte PHP LDAP";
 $messages['nophpmhash'] = "Pro použití režimu Samba nainstalujte PHP mhash";
 $messages['nokeyphrase'] = "Token encryption requires a random string in keyphrase setting";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Nelze se přihlásit k LDAP adresáři";
 $messages['loginrequired'] = "Je vyžadováno přihlašovací jméno";

diff --git a/lang/de.inc.php b/lang/de.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Sie benötigen die PHP LDAP Erweiterung um dieses Tool zu nutzen";
 $messages['nophpmhash'] = "Sie benötigen die PHP mhash Erweiterung um den Samba Modus zu nutzen";
 $messages['nokeyphrase'] = "Die Token Verschlüsselung erfordert eine zufällige Zeichenfolge in der Konfigurationsvariable 'keyphrase'";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Kein Zugriff auf den LDAP-Server möglich";
 $messages['loginrequired'] = "Ihr Benutzername wird benötigt";

diff --git a/lang/ee.inc.php b/lang/ee.inc.php
@@ -28,6 +28,7 @@
 $messages['nophpldap'] = "Sul on vaja paigaldada PHP LDAP, et kasutada seda tööriista";
 $messages['nophpmhash'] = "Sul on vaja paigaldada PHP mhash, et kasutada Samba režiimi";
 $messages['nokeyphrase'] = "Tokeni krüpteerimine nõuab juhuslikku märgijada võtmejada seadistuses";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Ei ole võimalik saada ühendust LDAP kataloogiga";
 $messages['loginrequired'] = "Sinu kasutajanimi on kohustuslik";

diff --git a/lang/el.inc.php b/lang/el.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Απαιτείται η εγκατάσταση του πρόσθετου PHP LDAP για τη λειτουργία αυτής της εφαρμογής";
 $messages['nophpmhash'] = "Απαιτείται η εγκατάσταση του πρόσθετου PHP mhash για τη χρήση Samba";
 $messages['nokeyphrase'] = "Token encryption requires a random string in keyphrase setting";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Αδυναμία πρόσβασης στην υπηρεσία καταλόγου";
 $messages['loginrequired'] = "Απαιτείται η καταχώρηση του ονόματος χρήστη";

diff --git a/lang/en.inc.php b/lang/en.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "You should install PHP LDAP to use this tool";
 $messages['nophpmhash'] = "You should install PHP mhash to use Samba mode";
 $messages['nokeyphrase'] = "Token encryption requires a random string in keyphrase setting";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Cannot access LDAP directory";
 $messages['loginrequired'] = "Your login is required";

diff --git a/lang/es.inc.php b/lang/es.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Debe instalar PHP LDAP para utilizar esta herramienta";
 $messages['nophpmhash'] = "Debe instalar PHP mhash para utilizar el modo Samba";
 $messages['nokeyphrase'] = "El cifrado de token requiere una cadena aleatoria en la configuración de frase de clave";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "No es posible acceder al directorio LDAP";
 $messages['loginrequired'] = "Su nombre de usuario es necesario";

diff --git a/lang/eu.inc.php b/lang/eu.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Webgune hau erabiltzeko PHP LDAP instalatu beharko duzu";
 $messages['nophpmhash'] = "Samba erabiltzeko PHP-ren mhash moduloa instalatu behar da";
 $messages['nokeyphrase'] = "Token-ak zifratzeko konfigurazioan ausazko esaldi bat idatzi behar duzu";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Ezin da LDAP direktorioa atzitu";
 $messages['loginrequired'] = "Ez duzu erabiltzaile izena idatzi";

diff --git a/lang/fr.inc.php b/lang/fr.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Vous devriez installer PHP LDAP pour utiliser cet outil";
 $messages['nophpmhash'] = "Vous devriez installer PHP mhash pour utiliser le mode Samba";
 $messages['nokeyphrase'] = "Vous devez configurer keyphrase pour que le chiffrement fonctionne";
+$messages['nocrypttokens'] = "Les jetons chiffrés sont requis pour la fonctionnalité de réinitialisation par SMS";
 $messages['noreseturl'] = "La fonction de réinitialisation par mail nécessite de configurer l'URL de réinitialisation";
 $messages['ldaperror'] = "Erreur d'accès à l'annuaire";
 $messages['loginrequired'] = "Vous devez indiquer votre identifiant";

diff --git a/lang/hu.inc.php b/lang/hu.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "A program használatához telepíteni kell a PHP LDAP csomagot";
 $messages['nophpmhash'] = "A Samba üzemmód használatához telepíteni kell a PHP mhash csomagot";
 $messages['nokeyphrase'] = "A token titkosításához random stringre van szükség";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Nem érhető el az LDAP szolgáltatás";
 $messages['loginrequired'] = "A felhasználónév megadása kötelező!";

diff --git a/lang/it.inc.php b/lang/it.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Devi installare PHP LDAP per usare questo strumento";
 $messages['nophpmhash'] = "Devi installare PHP mhash per usare il modo Samba";
 $messages['nokeyphrase'] = "La cifratura del token richiede una stringa generata casualmente nelle impostazioni del keyphrase";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Non posso accedere alla directory LDAP";
 $messages['loginrequired'] = "Nome utente obbligatorio";

diff --git a/lang/ja.inc.php b/lang/ja.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "このツールを使うにはPHP LDAPをインストールしてください";
 $messages['nophpmhash'] = "Sambaモードを使うにはPHP mhashをインストールしてください";
 $messages['nokeyphrase'] = "Token encryption requires a random string in keyphrase setting";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "LDAPディレクトリーにアクセスできません";
 $messages['loginrequired'] = "ログインIDを入力してください";

diff --git a/lang/nb-NO.inc.php b/lang/nb-NO.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Du burde installera PHP LDAP for å anvenda detta verktøyet";
 $messages['nophpmhash'] = "Du burde installera PHP mhash for att använda Samba mode";
 $messages['nokeyphrase'] = "Token kryptering krever en tilfeldig generert streng i keyphrase innstilling";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Kan ikke koble til LDAP katalogen";
 $messages['loginrequired'] = "Du må angi ditt brukernavn";

diff --git a/lang/nl.inc.php b/lang/nl.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "PHP LDAP moet geinstalleerd zijn om deze tool te kunnen gebruiken";
 $messages['nophpmhash'] = "PHP mhash moet geinstalleerd zijn om Samba mode te kunnen gebruiken";
 $messages['nokeyphrase'] = "Token encryptie vereist een willekeurige string in de keyphrase setting";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Kan geen toegang tot de LDAP directory verkrijgen";
 $messages['loginrequired'] = "Gebruikersnaam is vereist";

diff --git a/lang/pl.inc.php b/lang/pl.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Wymagane jest zainstalowanie PHP-LDAP zanim użyjesz tego narzędzia";
 $messages['nophpmhash'] = "Wymagane jest zainstalowanie PHP-mhash przed użyciem trybu Samba";
 $messages['nokeyphrase'] = "Szyfrowanie Tokena wymaga losowego ciągu keyphrase w konfiguracji";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Nie można połączyć się z bazą LDAP";
 $messages['loginrequired'] = "Wymagany jest Twój login";

diff --git a/lang/pt-BR.inc.php b/lang/pt-BR.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Você deve instalar o PHP LDAP para utilizar esta ferramenta";
 $messages['nophpmhash'] = "Você deve instalar o PHP mhash para utilizar o modo Samba";
 $messages['nokeyphrase'] = "Criptografia do Token necessita de uma string aleatória nas configuração de keyphrase";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Não foi possível acessar o diretório LDAP";
 $messages['loginrequired'] = "O seu nome de usuário é necessário";

diff --git a/lang/pt-PT.inc.php b/lang/pt-PT.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Necessitas de instalar o PHP LDAP para utilizares esta ferramenta.";
 $messages['nophpmhash'] = "Necessitas de instalar o PHP mhash para utilizares o Samba mode.";
 $messages['nokeyphrase'] = "Token encryption requires a random string in keyphrase setting";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Não foi possivel aceder à pasta LDAP.";
 $messages['loginrequired'] = "O teu username é necessário.";

diff --git a/lang/rs.inc.php b/lang/rs.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Potrebno je instalirati PHP LDAP da bi ste koristili ovu alatku";
 $messages['nophpmhash'] = "Potrebno je instalirati PHP mhash da bi ste koristili SAMBA mod";
 $messages['nokeyphrase'] = "Enkripcija Tokena zahteva nasumičan niz karaktera u podešavanju keyphrase-a";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Ne mogu da pristupim LDAP direktorijumu";
 $messages['loginrequired'] = "Potrebno je vaše korisničko ime";

diff --git a/lang/ru.inc.php b/lang/ru.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Для использования данной программы Вам необходимо установить PHP-Ldap";
 $messages['nophpmhash'] = "Для использования Samba mode установите сначала PHP mhash";
 $messages['nokeyphrase'] = "Token encryption requires a random string in keyphrase setting";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Нет доступа к LDAP directory";
 $messages['loginrequired'] = "Введите Ваш login";

diff --git a/lang/sk.inc.php b/lang/sk.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Mali by ste nainštalovať PHP LDAP";
 $messages['nophpmhash'] = "Mali by ste nainštalovať PHP mhash pri používaní Samba režimu";
 $messages['nokeyphrase'] = "Token encryption requires a random string in keyphrase setting";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Nemožno získať prístup k adresáru LDAP";
 $messages['loginrequired'] = "Zadanie prihlasovacieho mena je povinné";

diff --git a/lang/sl.inc.php b/lang/sl.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Namestiti morate PHP LDAP";
 $messages['nophpmhash'] = "Za način Samba morate namestiti PHP mhash";
 $messages['nokeyphrase'] = "Token encryption requires a random string in keyphrase setting";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Dostop do LDAP ni mogoč";
 $messages['loginrequired'] = "Vnesti morate uporabniško ime";

diff --git a/lang/sv.inc.php b/lang/sv.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Du borde installera PHP LDAP för att använda detta verktyg";
 $messages['nophpmhash'] = "Du borde installera PHP mhash för att använda Samba mode";
 $messages['nokeyphrase'] = "Token encryption requires a random string in keyphrase setting";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Kan inte komma åt LDAPkatalogen";
 $messages['loginrequired'] = "Du måste ange ditt användarnamn";

diff --git a/lang/tr.inc.php b/lang/tr.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "Bu aracı kullanabilmek için PHP LDAP yüklemelisiniz";
 $messages['nophpmhash'] = "Samba modunu kullanmak için PHP mhash yüklemelisiniz";
 $messages['nokeyphrase'] = "Belirteç şifrelemesi için keyphrase ayarında rastgele bir metin olması gerekir";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "LDAP dizinine ulaşılamıyor";
 $messages['loginrequired'] = "Kullanıcı adınız gereklidir";

diff --git a/lang/uk.inc.php b/lang/uk.inc.php
@@ -27,6 +27,7 @@
 $messages['nophpldap'] = "Для використання цієї програми Вам потрібно встановити PHP ldap";
 $messages['nophpmhash'] = "Для використання Samba режиму, спочатку встановіть PHP mhash";
 $messages['nokeyphrase'] = "Token encryption requires a random string in keyphrase setting";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "Немає доступу до LDAP директорії";
 $messages['loginrequired'] = "Введіть Ваш логін";

diff --git a/lang/zh-CN.inc.php b/lang/zh-CN.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "您需要安装 PHP LDAP 才能使用本工具";
 $messages['nophpmhash'] = "您需要安装 PHP mhash 才能使用 Samba 模式";
 $messages['nokeyphrase'] = "在使用凭据加密前，需要在 keyphrase 设置中填写一个随机字符串";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "不能访问 LDAP 目录服务";
 $messages['loginrequired'] = "请输入您的用户名";

diff --git a/lang/zh-TW.inc.php b/lang/zh-TW.inc.php
@@ -26,6 +26,7 @@
 $messages['nophpldap'] = "您需要安裝 PHP LDAP 才能使用此工具";
 $messages['nophpmhash'] = "您需要安裝 PHP mhash 才能使用 Samba 模式";
 $messages['nokeyphrase'] = "Token encryption requires a random string in keyphrase setting";
+$messages['nocrypttokens'] = "Crypted tokens are mandatory for reset by SMS feature";
 $messages['noreseturl'] = "Reset by mail tokens feature requires configuration of reset URL";
 $messages['ldaperror'] = "無法連接至 LDAP 伺服器";
 $messages['loginrequired'] = "請輸入帳號";

diff --git a/lib/functions.inc.php b/lib/functions.inc.php
@@ -182,7 +182,7 @@ function generate_sms_token( $sms_token_length ) {
 # Get message criticity
 function get_criticity( $msg ) {
 
-    if ( preg_match( "/nophpldap|phpupgraderequired|nophpmhash|nokeyphrase|ldaperror|nomatch|badcredentials|passworderror|tooshort|toobig|minlower|minupper|mindigit|minspecial|forbiddenchars|sameasold|answermoderror|answernomatch|mailnomatch|tokennotsent|tokennotvalid|notcomplex|smsnonumber|smscrypttokensrequired|nophpmbstring|nophpxml|smsnotsent|sameaslogin|pwned|invalidsshkey|sshkeyerror|specialatends|forbiddenwords|forbiddenldapfields|diffminchars|badquality|tooyoung|inhistory|throttle|attributesmoderror|insufficiententropy|noreseturl/" , $msg ) ) {
+    if ( preg_match( "/nophpldap|phpupgraderequired|nophpmhash|nokeyphrase|ldaperror|nomatch|badcredentials|passworderror|tooshort|toobig|minlower|minupper|mindigit|minspecial|forbiddenchars|sameasold|answermoderror|answernomatch|mailnomatch|tokennotsent|tokennotvalid|notcomplex|smsnonumber|smscrypttokensrequired|nophpmbstring|nophpxml|smsnotsent|sameaslogin|pwned|invalidsshkey|sshkeyerror|specialatends|forbiddenwords|forbiddenldapfields|diffminchars|badquality|tooyoung|inhistory|throttle|attributesmoderror|insufficiententropy|noreseturl|nocrypttokens/" , $msg ) ) {
     return "danger";
     }