mirror of
https://github.com/OpenXE-org/OpenXE.git
synced 2024-12-25 14:10:28 +01:00
bugfix TOTP, additional database entries needed: login_password_check_otp (hook), TOTPCheckLogin (hook_register)
This commit is contained in:
OpenXE
parent
94f3fb0261
commit
5ad57e2fc8
@ -270,7 +270,7 @@ class TOTPLoginService
|
|||||||
$secret = $this->getTOTPSecret($userId);
|
$secret = $this->getTOTPSecret($userId);
|
||||||
}
|
}
|
||||||
|
|
||||||
$query = "otpauth://totp/{$label}?secret=" . $secret . '&issuer=Xentral&algorithm=SHA1&digits=6&period=30';
|
$query = "otpauth://totp/{$label}?secret=" . $secret . '&issuer=OpenXE&algorithm=SHA1&digits=6&period=30';
|
||||||
|
|
||||||
return $this->barcodeService->createQrCode($query);
|
return $this->barcodeService->createQrCode($query);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -616,7 +616,7 @@ class TemplateParser {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(count($this->VARARRAY)>0)
|
if(!empty($this->VARARRAY))
|
||||||
foreach($this->VARARRAY as $key=>$value)
|
foreach($this->VARARRAY as $key=>$value)
|
||||||
{
|
{
|
||||||
if($key!="")
|
if($key!="")
|
||||||
|
|||||||
@ -1,134 +1,133 @@
|
|||||||
<?php
|
<?php
|
||||||
/*
|
/*
|
||||||
**** COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE ****
|
**** COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE ****
|
||||||
*
|
*
|
||||||
* Xentral (c) Xentral ERP Sorftware GmbH, Fuggerstrasse 11, D-86150 Augsburg, * Germany 2019
|
* Xentral (c) Xentral ERP Sorftware GmbH, Fuggerstrasse 11, D-86150 Augsburg, * Germany 2019
|
||||||
*
|
*
|
||||||
* This file is licensed under the Embedded Projects General Public License *Version 3.1.
|
* This file is licensed under the Embedded Projects General Public License *Version 3.1.
|
||||||
*
|
*
|
||||||
* You should have received a copy of this license from your vendor and/or *along with this file; If not, please visit www.wawision.de/Lizenzhinweis
|
* You should have received a copy of this license from your vendor and/or *along with this file; If not, please visit www.wawision.de/Lizenzhinweis
|
||||||
* to obtain the text of the corresponding license version.
|
* to obtain the text of the corresponding license version.
|
||||||
*
|
*
|
||||||
**** END OF COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE ****
|
**** END OF COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE ****
|
||||||
*/
|
*/
|
||||||
?>
|
?>
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
use Xentral\Components\Http\JsonResponse;
|
use Xentral\Components\Http\JsonResponse;
|
||||||
use Xentral\Modules\TOTPLogin\TOTPLoginService;
|
use Xentral\Modules\TOTPLogin\TOTPLoginService;
|
||||||
|
|
||||||
class Totp
|
class Totp
|
||||||
{
|
{
|
||||||
/** @var Application */
|
/** @var Application */
|
||||||
private $app;
|
private $app;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Totp constructor.
|
* Totp constructor.
|
||||||
*
|
*
|
||||||
* @param Application $app
|
* @param Application $app
|
||||||
* @param bool $intern
|
* @param bool $intern
|
||||||
*/
|
*/
|
||||||
public function __construct($app, $intern = false)
|
public function __construct($app, $intern = false)
|
||||||
{
|
{
|
||||||
$this->app = $app;
|
$this->app = $app;
|
||||||
|
|
||||||
if($intern) return;
|
if($intern) return;
|
||||||
|
|
||||||
$app->ActionHandlerInit($this);
|
$app->ActionHandlerInit($this);
|
||||||
|
|
||||||
$app->ActionHandler('generate', 'TOTPGenerateSecretJSON');
|
$app->ActionHandler('generate', 'TOTPGenerateSecretJSON');
|
||||||
$app->ActionHandler('enable', 'TOTPEnable');
|
$app->ActionHandler('enable', 'TOTPEnable');
|
||||||
$app->ActionHandler('disable', 'TOTPDisable');
|
$app->ActionHandler('disable', 'TOTPDisable');
|
||||||
|
|
||||||
$app->ActionHandlerListen($app);
|
$app->ActionHandlerListen($app);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function Install()
|
public function Install()
|
||||||
{
|
{
|
||||||
$tableName = 'user_totp';
|
$tableName = 'user_totp';
|
||||||
$this->app->erp->CheckTable($tableName);
|
$this->app->erp->CheckTable($tableName);
|
||||||
$this->app->erp->CheckColumn('id', 'UNSIGNED INT', $tableName, 'NOT NULL AUTO_INCREMENT');
|
$this->app->erp->CheckColumn('id', 'UNSIGNED INT', $tableName, 'NOT NULL AUTO_INCREMENT');
|
||||||
$this->app->erp->CheckColumn('user_id', 'INT', $tableName, 'UNSIGNED NOT NULL');
|
$this->app->erp->CheckColumn('user_id', 'INT', $tableName, 'UNSIGNED NOT NULL');
|
||||||
$this->app->erp->CheckColumn('active', 'TINYINT(1)', $tableName, 'UNSIGNED DEFAULT 0');
|
$this->app->erp->CheckColumn('active', 'TINYINT(1)', $tableName, 'UNSIGNED DEFAULT 0');
|
||||||
$this->app->erp->CheckColumn('secret', 'VARCHAR(100)', $tableName, 'NOT NULL');
|
$this->app->erp->CheckColumn('secret', 'VARCHAR(100)', $tableName, 'NOT NULL');
|
||||||
$this->app->erp->CheckColumn('created_at', 'TIMESTAMP', $tableName, 'DEFAULT NOW()');
|
$this->app->erp->CheckColumn('created_at', 'TIMESTAMP', $tableName, 'DEFAULT NOW()');
|
||||||
$this->app->erp->CheckColumn('modified_at', 'TIMESTAMP', $tableName);
|
$this->app->erp->CheckColumn('modified_at', 'TIMESTAMP', $tableName);
|
||||||
$this->app->erp->CheckIndex($tableName, 'user_id', true);
|
$this->app->erp->CheckIndex($tableName, 'user_id', true);
|
||||||
|
|
||||||
$this->app->erp->RegisterHook('login_password_check_otp', 'totp', 'TOTPCheckLogin', 1, false, null, 3);
|
$this->app->erp->RegisterHook('login_password_check_otp', 'totp', 'TOTPCheckLogin', 1, false, null, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
function TOTPDisable(){
|
function TOTPDisable(){
|
||||||
$action = $this->app->Secure->GetPOST('action');
|
$action = $this->app->Secure->GetPOST('action');
|
||||||
|
|
||||||
if($action !== 'disable'){
|
if($action !== 'disable'){
|
||||||
return new JsonResponse(['status' => 'error', 'msg' => 'muss POST sein'], 400);
|
return new JsonResponse(['status' => 'error', 'msg' => 'muss POST sein'], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @var TOTPLoginService $totpLoginService */
|
/** @var TOTPLoginService $totpLoginService */
|
||||||
$totpLoginService = $this->app->Container->get('TOTPLoginService');
|
$totpLoginService = $this->app->Container->get('TOTPLoginService');
|
||||||
|
|
||||||
$userId = $this->app->User->GetID();
|
$userId = $this->app->User->GetID();
|
||||||
|
|
||||||
$totpLoginService->disableTotp($userId);
|
$totpLoginService->disableTotp($userId);
|
||||||
|
|
||||||
return new JsonResponse(['status' => 'success']);
|
return new JsonResponse(['status' => 'success']);
|
||||||
}
|
}
|
||||||
|
|
||||||
function TOTPEnable(){
|
function TOTPEnable(){
|
||||||
$secret = $this->app->Secure->GetPOST('secret');
|
$secret = $this->app->Secure->GetPOST('secret');
|
||||||
|
|
||||||
if(empty($secret)){
|
if(empty($secret)){
|
||||||
return new JsonResponse(['status' => 'error', 'msg' => 'Secret Empty'], 400);
|
return new JsonResponse(['status' => 'error', 'msg' => 'Secret Empty'], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @var TOTPLoginService $totpLoginService */
|
/** @var TOTPLoginService $totpLoginService */
|
||||||
$totpLoginService = $this->app->Container->get('TOTPLoginService');
|
$totpLoginService = $this->app->Container->get('TOTPLoginService');
|
||||||
|
|
||||||
$userId = $this->app->User->GetID();
|
$userId = $this->app->User->GetID();
|
||||||
|
|
||||||
$totpLoginService->enableTotp($userId);
|
$totpLoginService->enableTotp($userId);
|
||||||
$totpLoginService->setUserSecret($userId, $secret);
|
$totpLoginService->setUserSecret($userId, $secret);
|
||||||
|
|
||||||
return new JsonResponse(['status' => 'success']);
|
return new JsonResponse(['status' => 'success']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $userID
|
* @param $userID
|
||||||
* @param $token
|
* @param $token
|
||||||
* @param $passwordValid
|
* @param $passwordValid
|
||||||
*
|
*
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function TOTPCheckLogin($userID, $token, &$passwordValid)
|
public function TOTPCheckLogin($userID, $token, &$passwordValid)
|
||||||
{
|
{
|
||||||
/** @var TOTPLoginService $totpLoginService */
|
/** @var TOTPLoginService $totpLoginService */
|
||||||
$totpLoginService = $this->app->Container->get('TOTPLoginService');
|
$totpLoginService = $this->app->Container->get('TOTPLoginService');
|
||||||
|
if(!$totpLoginService->isTOTPEnabled($userID)){
|
||||||
if(!$totpLoginService->isTOTPEnabled($userID)){
|
return;
|
||||||
return;
|
}
|
||||||
}
|
$passwordValid = $totpLoginService->isTokenValid($userID, $token);
|
||||||
$passwordValid = $totpLoginService->isTokenValid($userID, $token);
|
}
|
||||||
}
|
|
||||||
|
public function TOTPGenerateSecretJSON(){
|
||||||
public function TOTPGenerateSecretJSON(){
|
/** @var TOTPLoginService $totpLoginService */
|
||||||
/** @var TOTPLoginService $totpLoginService */
|
$totpLoginService = $this->app->Container->get('TOTPLoginService');
|
||||||
$totpLoginService = $this->app->Container->get('TOTPLoginService');
|
|
||||||
|
/** @var \Xentral\Components\Token\TOTPTokenManager $tokenManager */
|
||||||
/** @var \Xentral\Components\Token\TOTPTokenManager $tokenManager */
|
$tokenManager = $this->app->Container->get('TOTPTokenManager');
|
||||||
$tokenManager = $this->app->Container->get('TOTPTokenManager');
|
|
||||||
|
$secret = $tokenManager->generateBase32Secret();
|
||||||
$secret = $tokenManager->generateBase32Secret();
|
|
||||||
|
$label = 'OpenXE' . ':' . $this->app->User->Getname();
|
||||||
$label = 'Xentral' . ' | ' . $this->app->erp->GetFirmaName();
|
|
||||||
|
$qr = $totpLoginService->generatePairingQrCode($this->app->User->GetID(), $label, $secret);
|
||||||
$qr = $totpLoginService->generatePairingQrCode($this->app->User->GetID(), $label, $secret);
|
|
||||||
|
return new JsonResponse(
|
||||||
return new JsonResponse(
|
[
|
||||||
[
|
'secret' => $secret,
|
||||||
'secret' => $secret,
|
'qr' => $qr->toHtml(4, 4)
|
||||||
'qr' => $qr->toHtml(4, 4)
|
]
|
||||||
]
|
);
|
||||||
);
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user