bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-06-13 01:37:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

revised auth procedure to support 4eyes auth

Browse Source
This commit is contained in:
SJ
2015-02-19 15:17:20 +01:00
parent c1e525b931
commit bc8d264778
3 changed files with 121 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
webui/controller/login/ga.php
View File

@ -37,13 +37,25 @@ class ControllerLoginGA extends Controller {
$GA = new PHPGangsta_GoogleAuthenticator();
$settings = $this->model_user_prefs->get_ga_settings($session->get('username'));
$data = $session->get("auth_data");
if(!isset($data['username'])) {
header("Location: " . SITE_URL . "/login.php");
exit;
}
$settings = $this->model_user_prefs->get_ga_settings($data['username']);
if(strlen($this->request->post['ga_code']) > 5 && $GA->verifyCode($settings['ga_secret'], $this->request->post['ga_code'], 2)) {
syslog(LOG_INFO, "GA auth successful for " . $data['username']);
$session->set("ga_block", "");
$this->model_user_prefs->get_user_preferences($session->get('username'));
$this->model_user_auth->apply_user_auth_session($data);
$session->remove("auth_data");
$this->model_user_prefs->get_user_preferences($session->get($data['username']));
if(ENABLE_SAAS == 1) {
$this->model_saas_customer->online($session->get('email'));

4
webui/controller/login/login.php
View File

@ -48,6 +48,10 @@ class ControllerLoginLogin extends Controller {
exit;
}
else {
$data = $session->get("auth_data");
$this->model_user_auth->apply_user_auth_session($data);
$session->remove("auth_data");
$this->model_user_prefs->get_user_preferences($session->get('username'));
if(ENABLE_SAAS == 1) {