diff --git a/core/authentication/app_languages.php b/core/authentication/app_languages.php index d3a31e1a73..94a8fffa8c 100644 --- a/core/authentication/app_languages.php +++ b/core/authentication/app_languages.php @@ -78,4 +78,30 @@ $text['label-email_description']['zh-cn'] = "查阅您的核查文件。"; $text['label-email_description']['ja-jp'] = "認証コードのメールをご確認ください。"; $text['label-email_description']['ko-kr'] = "인증 코드의 이메일 확인."; +$text['description-totp']['en-us'] = "Scan the code with an authentication application or password manager. Then use it to generate the token for the login."; +$text['description-totp']['en-gb'] = "Scan the code with an authentication application or password manager. Then use it to generate the token for the login."; +$text['description-totp']['ar-eg'] = "مسح الرمز مع تطبيق التوثيق أو مدير كلمة السر ثم استخدامه لتوليد الضباب لقطع الخشب."; +$text['description-totp']['de-at'] = "Scannen Sie den Code mit einer Authentifizierungs-Anwendung oder einem Passwort-Manager. Dann verwenden Sie es, um das Token für den Login zu generieren."; +$text['description-totp']['de-ch'] = "Scannen Sie den Code mit einer Authentifizierungs-Anwendung oder einem Passwort-Manager. Dann verwenden Sie es, um das Token für den Login zu generieren."; +$text['description-totp']['de-de'] = "Scannen Sie den Code mit einer Authentifizierungs-Anwendung oder einem Passwort-Manager. Dann verwenden Sie es, um das Token für den Login zu generieren."; +$text['description-totp']['el-gr'] = "Βάλτε τον κωδικό με μια εφαρμογή πιστοποίησης ή password manager. Στη συνέχεια χρησιμοποιήστε το για να δημιουργήσετε το token για τη σύνδεση."; +$text['description-totp']['es-cl'] = "Analice el código con una aplicación de autenticación o gestor de contraseñas. A continuación, utilizarlo para generar la ficha para el login."; +$text['description-totp']['es-mx'] = "Analice el código con una aplicación de autenticación o gestor de contraseñas. A continuación, utilizarlo para generar la ficha para el login."; +$text['description-totp']['fr-ca'] = "Scannez le code avec une application d'authentification ou un gestionnaire de mot de passe. Ensuite, utilisez-le pour générer le jeton pour le login."; +$text['description-totp']['fr-fr'] = "Scannez le code avec une application d'authentification ou un gestionnaire de mot de passe. Ensuite, utilisez-le pour générer le jeton pour le login."; +$text['description-totp']['he-il'] = "לסרוק את הקוד עם יישום אימות או מנהל סיסמאות. לאחר מכן השתמש בו כדי ליצור את האסימון עבור הכניסה."; +$text['description-totp']['it-it'] = "Scansiona il codice con un'applicazione di autenticazione o un gestore di password. Quindi utilizzare per generare il token per il login."; +$text['description-totp']['nl-nl'] = "Scan de code met een authenticatie aanvraag of wachtwoordmanager. Gebruik het dan om het teken voor het login te genereren."; +$text['description-totp']['pl-pl'] = "Skanowanie kodu z zastosowaniem uwierzytelnia lub menedżerem haseł. Zastosowanie go do generowania tokenu dla loginu."; +$text['description-totp']['pt-br'] = "Digitalize o código com um aplicativo de autenticação ou gerenciador de senha. Em seguida, use-o para gerar o token para o login."; +$text['description-totp']['pt-pt'] = "Digitalize o código com um aplicativo de autenticação ou gerenciador de senha. Em seguida, use-o para gerar o token para o login."; +$text['description-totp']['ro-ro'] = "Scanați codul cu o aplicație de autentificare sau un manager de parole. Apoi utilizați-l pentru a genera simbolul pentru autentificare."; +$text['description-totp']['ru-ru'] = "Сканировать код с приложением аутентификации или менеджером паролей. Затем используйте его для создания токена для входа."; +$text['description-totp']['sv-se'] = "Skanna koden med en autentiseringsapplikation eller lösenordshanterare. Använd sedan den för att generera token för inloggningen."; +$text['description-totp']['uk-ua'] = "Сканування коду за допомогою програми автентифікації або пароля. Потім використовуйте його для створення токени для входу."; +$text['description-totp']['tr-tr'] = "Kodu bir doğrulama uygulama veya şifre yöneticisi ile tarayın. Sonra giriş için token oluşturmak için kullanın."; +$text['description-totp']['zh-cn'] = "载有认证申请或密码管理员的编码。 然后使用该标识生成标识。"; +$text['description-totp']['ja-jp'] = "認証アプリケーションまたはパスワードマネージャでコードをスキャンします。 ログイン時にトークンを生成します。"; +$text['description-totp']['ko-kr'] = "인증 신청서 또는 비밀번호 관리자로 코드를 스캔합니다. 그런 다음 로그인 토큰을 생성합니다."; + ?> diff --git a/core/authentication/resources/classes/plugins/totp.php b/core/authentication/resources/classes/plugins/totp.php index b7b04bcf4c..b157757688 100644 --- a/core/authentication/resources/classes/plugins/totp.php +++ b/core/authentication/resources/classes/plugins/totp.php @@ -25,8 +25,16 @@ class plugin_totp { */ function totp() { + //get the username + if (isset($_SESSION["username"])) { + $this->username = $_SESSION["username"]; + } + if (isset($_POST['username'])) { + $this->username = $_POST['username']; + } + //request the username - if (!isset($_POST['username']) && !isset($_POST['authentication_code'])) { + if (!$this->username && !isset($_POST['authentication_code'])) { //set a default template $_SESSION['domain']['template']['name'] = 'default'; @@ -62,7 +70,7 @@ class plugin_totp { $view->assign("login_logo_height", $login_logo_height); $view->assign("login_logo_source", $login_logo_source); $view->assign("button_login", $text['button-login']); - + //show the views $content = $view->render('username.htm'); echo $content; @@ -130,16 +138,80 @@ class plugin_totp { $view->cache_dir = $_SESSION['server']['temp']['dir']; $view->init(); - //assign default values to the template + //assign values to the template $view->assign("login_title", $text['label-verify']); $view->assign("login_authentication_code", $text['label-authentication_code']); $view->assign("login_logo_width", $login_logo_width); $view->assign("login_logo_height", $login_logo_height); $view->assign("login_logo_source", $login_logo_source); - $view->assign("button_verify", $text['label-verify']); //show the views - $content = $view->render('totp.htm'); + if ($_SESSION['authentication']['plugin']['database']['authorized'] && empty($this->user_totp_secret)) { + + //create the totp secret + $base32 = new base2n(5, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567', FALSE, TRUE, TRUE); + $user_totp_secret = $base32->encode(generate_password(20,3)); + $this->user_totp_secret = $user_totp_secret; + + //add user setting to array for update + $x = 0; + $array['users'][$x]['user_uuid'] = $this->user_uuid; + $array['users'][$x]['domain_uuid'] = $this->domain_uuid; + $array['users'][$x]['user_totp_secret'] = $this->user_totp_secret; + + //add the user_edit permission + $p = new permissions; + $p->add("user_edit", "temp"); + + //save the data + $database = new database; + $database->app_name = 'users'; + $database->app_uuid = '112124b3-95c2-5352-7e9d-d14c0b88f207'; + $database->save($array); + + //remove the temporary permission + $p->delete("user_edit", "temp"); + + //qr code includes + require_once 'resources/qr_code/QRErrorCorrectLevel.php'; + require_once 'resources/qr_code/QRCode.php'; + require_once 'resources/qr_code/QRCodeImage.php'; + + //build the otp authentication url + $otpauth = "otpauth://totp/".$this->username; + $otpauth .= "?secret=".$this->user_totp_secret; + $otpauth .= "&issuer=".$_SESSION['domain_name']; + + //build the qr code image + try { + $code = new QRCode (- 1, QRErrorCorrectLevel::H); + $code->addData($otpauth); + $code->make(); + $img = new QRCodeImage ($code, $width=210, $height=210, $quality=50); + $img->draw(); + $image = $img->getImage(); + $img->finish(); + } + catch (Exception $error) { + echo $error; + } + + //assign values to the template + $view->assign("totp_secret", $this->user_totp_secret); + $view->assign("totp_image", base64_encode($image)); + $view->assign("totp_description", $text['description-totp']); + $view->assign("button_next", $text['button-next']); + + //render the template + $content = $view->render('totp_secret.htm'); + } + else { + //assign values to the template + $view->assign("button_verify", $text['label-verify']); + + //render the template + $content = $view->render('totp.htm'); + } echo $content; exit; } @@ -245,7 +317,6 @@ class plugin_totp { //retun the array return $result; - //$_SESSION['authentication']['plugin']['totp']['plugin'] = "totp"; //$_SESSION['authentication']['plugin']['totp']['domain_name'] = $_SESSION["domain_name"]; //$_SESSION['authentication']['plugin']['totp']['username'] = $row['username']; diff --git a/core/authentication/resources/views/email.htm b/core/authentication/resources/views/email.htm index b051e92ef4..87571c93e8 100644 --- a/core/authentication/resources/views/email.htm +++ b/core/authentication/resources/views/email.htm @@ -1,36 +1,28 @@ - - - - - - -{$login_title} - -
-
- -
-
- {$login_email_description} -

- -

-
-
- - -
-
+ + + + + + + {$login_title} + + +
+
+
+
+ {$login_email_description} +

+ +

+
+
+ +
+
+
-
- - - \ No newline at end of file + + diff --git a/core/authentication/resources/views/login.htm b/core/authentication/resources/views/login.htm index 716964e2dc..cddbe648bb 100644 --- a/core/authentication/resources/views/login.htm +++ b/core/authentication/resources/views/login.htm @@ -1,32 +1,27 @@ - - - - - - -{$login_title} - -
-
-
-
-
-
-
-
-
- - -
-
+ + + + + + + {$login_title} + + +
+
+
+
+
+
+
+
+
+ +
+
+
-
- - + diff --git a/core/authentication/resources/views/totp.htm b/core/authentication/resources/views/totp.htm index 89bded1325..c403ae1f7c 100644 --- a/core/authentication/resources/views/totp.htm +++ b/core/authentication/resources/views/totp.htm @@ -1,44 +1,27 @@ - - - - - - -{$login_title} - - -
-
-
-
-
- -

- -
-
- - -
-
-
-
- - + diff --git a/core/authentication/resources/views/totp_secret.htm b/core/authentication/resources/views/totp_secret.htm new file mode 100644 index 0000000000..a7a9e86315 --- /dev/null +++ b/core/authentication/resources/views/totp_secret.htm @@ -0,0 +1,28 @@ + + + + + + + + + {$login_title} + + +
+
+
+
+
+ {$totp_secret}

+

+ {$totp_description}

+
+
+ +
+
+
+
+ + diff --git a/core/authentication/resources/views/username.htm b/core/authentication/resources/views/username.htm index 0240f492eb..4ea58db288 100644 --- a/core/authentication/resources/views/username.htm +++ b/core/authentication/resources/views/username.htm @@ -1,31 +1,26 @@ - - - - - - -{$login_title} - -
-
-
-
-
-
-
-
- - -
-
+ + + + + + + {$login_title} + + +
+
+
+
+
+
+
+
+ +
+
+
-
- - +