Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This commit fixes a login issue which occurred when the update information could not be retrieved. - Restructured AuthController for readability and optimization - Use the ZF2 Session Container instead of $_SESSION - Introduce AuthController method checkAPIStatusDIRD - Introduce AuthController method checkACLStatusDIRD - Introduce AuthController method checkUpdateStatusDIRD The commit also fixes a minor issue with the UpdateAlert ViewHelper. Fixes #1039: Can not login in webui (cherry picked from commit 0691180)
- Loading branch information
1 parent
d714824
commit 3faf221
Showing
3 changed files
with
200 additions
and
124 deletions.
There are no files selected for viewing
54 changes: 39 additions & 15 deletions
54
webui/module/Application/src/Application/Controller/Plugin/SessionTimeoutPlugin.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,44 +1,68 @@ | ||
<?php | ||
|
||
/** | ||
* | ||
* bareos-webui - Bareos Web-Frontend | ||
* | ||
* @link https://github.com/bareos/bareos for the canonical source repository | ||
* @copyright Copyright (c) 2013-2020 Bareos GmbH & Co. KG (http://www.bareos.org/) | ||
* @license GNU Affero General Public License (http://www.gnu.org/licenses/) | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as published by | ||
* the Free Software Foundation, either version 3 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
* | ||
*/ | ||
|
||
namespace Application\Controller\Plugin; | ||
|
||
use Zend\Mvc\Controller\Plugin\AbstractPlugin; | ||
use Zend\Session\Container; | ||
|
||
class SessionTimeoutPlugin extends AbstractPlugin | ||
{ | ||
protected $session = null; | ||
|
||
public function timeout() | ||
{ | ||
$configuration = $this->getController()->getServiceLocator()->get('config'); | ||
$timeout = $configuration['configuration']['session']['timeout']; | ||
|
||
if($timeout === 0) { | ||
return true; | ||
} | ||
else { | ||
if($_SESSION['bareos']['idletime'] + $timeout > time()) { | ||
$_SESSION['bareos']['idletime'] = time(); | ||
return true; | ||
} | ||
else { | ||
session_destroy(); | ||
return false; | ||
} else { | ||
if(($this->session->offsetGet('idletime') + $timeout) > time()) { | ||
$this->session->offsetSet('idletime', time()); | ||
return false; | ||
} else { | ||
$this->session->getManager()->destroy(); | ||
return true; | ||
} | ||
} | ||
} | ||
|
||
public function isValid() | ||
{ | ||
if($_SESSION['bareos']['authenticated']) { | ||
$this->session = new Container('bareos'); | ||
|
||
if($this->session->offsetGet('authenticated')) { | ||
if($this->timeout()) { | ||
return true; | ||
} | ||
else { | ||
return false; | ||
} else { | ||
return true; | ||
} | ||
} | ||
else { | ||
} else { | ||
return false; | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.