Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support 2FA #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support 2FA #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22e5716
Initial draft of 2FA support
ShadowKyogre Feb 27, 2021
fa1492b
Redirect to failed login if 2FA failed to start
ShadowKyogre Feb 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 92 additions & 32 deletions PageProtector.module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,43 +288,102 @@ public function protectedCheck(HookEvent $event) {
}
elseif($this->wire('input')->post->username && $this->wire('input')->post->pass) {
$username = $this->wire('sanitizer')->username($this->wire('input')->post->username);
$user = $this->wire('session')->login($username, $this->wire('input')->post->pass);
if(!$user) $this->wire('session')->loginFailed = true;
$this->wire('session')->redirect(htmlspecialchars($_SERVER['REQUEST_URI']));
$user = $this->wire('users')->get($username);
$has_tfa = false;

// if the user exist, override the $has_tfa var with a not dummy value
if ($user->id) {
$has_tfa = $user->hasTfa();
}

if (!empty($has_tfa)) {
// $tfa = $this->wire('modules')->get('ProcessLogin')->getTfa();
$tfa = $user->hasTfa(true);
// get the actual Tfa instance we need
$this->wire('session')->loginFailed = !$tfa->start($username, $this->wire('input')->post->pass);
if ($this->wire('session')->loginFailed) {
$this->wire('session')->redirect(htmlspecialchars($_SERVER['REQUEST_URI']));
}
//tfa login supercedes normal login function
}
else {
$user = $this->wire('session')->login($username, $this->wire('input')->post->pass);
if(!$user) $this->wire('session')->loginFailed = true;
$this->wire('session')->redirect(htmlspecialchars($_SERVER['REQUEST_URI']));
}
}
else {
$loginForm = "
<style>
{$this->data['logincss']}
</style>
<form class='PageProtectorForm' action='".htmlspecialchars($_SERVER['REQUEST_URI'])."' method='post'>
<legend>" . ($this->wire('session')->loginFailed ? "<p>" . __("Login Failed, please try again!") . "</p>" : "") . nl2br($this->getMessage($p, 'message', $lang)) . "</legend>
<input type='text' name='username' placeholder='".($this->data['usernamePlaceholder'.$lang] ? $this->data['usernamePlaceholder'.$lang] : $this->data['usernamePlaceholder'])."' required />
<input type='password' name='pass' placeholder='".($this->data['passwordPlaceholder'.$lang] ? $this->data['passwordPlaceholder'.$lang] : $this->data['passwordPlaceholder'])."' required />
<p><button type='submit' name='login'>".($this->data['loginButtonText'.$lang] ? $this->data['loginButtonText'.$lang] : $this->data['loginButtonText'])."</button></p>
</form>
";
$tfa = $this->wire('modules')->get('ProcessLogin')->getTfa();

if($this->wire('session')->loginFailed) $this->wire('session')->loginFailed = false;

if($this->data['login_template'] == '') {
$event->return = "
<!DOCTYPE html>
<head>
<meta charset='utf-8' />
<meta name='viewport' content='width=device-width, initial-scale=1'>
</head>
<body>
<div class='page-protector-container'>
$loginForm
</div>
</body>
</html>
";
if (!empty($tfa) && $tfa->active()) {
if ($tfa->success()) {
//do nothing?
//TFA Session success;
}
else {
//Put TFA form in template for completion
if ($this->data['login_template'] != '') {
$p->loginForm = "
<style>
{$this->data['logincss']}
</style>" .
'<div class="page-protector-container">' .
$tfa->render() .
'</div>'; $p->template->filename = $this->wire('config')->paths->templates . $this->data['login_template'];
} else {
$event->return = "
<!DOCTYPE html>
<head>
<meta charset='utf-8' />
<meta name='viewport' content='width=device-width, initial-scale=1'>
<style>
{$this->data['logincss']}
</style>
</head>
<body>
<div class='page-protector-container'>
<p>" . $tfa->render() .
"</p>
</div>
</body>
</html>";
}
}
}
else {
$p->loginForm = $loginForm;
$p->template->filename = $this->wire('config')->paths->templates . $this->data['login_template'];
$loginForm = "
<style>
{$this->data['logincss']}
</style>
<form class='PageProtectorForm' action='".htmlspecialchars($_SERVER['REQUEST_URI'])."' method='post'>
<legend>" . ($this->wire('session')->loginFailed ? "<p>" . __("Login Failed, please try again!") . "</p>" : "") . nl2br($this->getMessage($p, 'message', $lang)) . "</legend>
<input type='text' name='username' placeholder='".($this->data['usernamePlaceholder'.$lang] ? $this->data['usernamePlaceholder'.$lang] : $this->data['usernamePlaceholder'])."' required />
<input type='password' name='pass' placeholder='".($this->data['passwordPlaceholder'.$lang] ? $this->data['passwordPlaceholder'.$lang] : $this->data['passwordPlaceholder'])."' required />
<p><button type='submit' name='login'>".($this->data['loginButtonText'.$lang] ? $this->data['loginButtonText'.$lang] : $this->data['loginButtonText'])."</button></p>
</form>
";

if($this->wire('session')->loginFailed) $this->wire('session')->loginFailed = false;

if($this->data['login_template'] == '') {
$event->return = "
<!DOCTYPE html>
<head>
<meta charset='utf-8' />
<meta name='viewport' content='width=device-width, initial-scale=1'>
</head>
<body>
<div class='page-protector-container'>
$loginForm
</div>
</body>
</html>
";
}
else {
$p->loginForm = $loginForm;
$p->template->filename = $this->wire('config')->paths->templates . $this->data['login_template'];
}
}
}
}
Expand Down Expand Up @@ -751,3 +810,4 @@ public function getModuleConfigInputfields(array $data) {
}

}