Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dubbele-authenticatie-IN-TEST' into develop

Browse Source
This commit is contained in:
Liesbeth ter Schure
2024-08-22 09:57:29 +02:00
parent d66dadd11f e35926b594
commit f2c8449f48
21 changed files with 628 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/Login.php
+115 -47
View File
@@ -1,9 +1,10 @@
<?php
use Mailgun\Mailgun;
use \Sonata\GoogleAuthenticator\GoogleAuthenticator;
class Login extends MY_Controller {
function __construct()
{
@@ -14,80 +15,69 @@ class Login extends MY_Controller {
'shared/Orgusers_model',
"shared/Autorisaties_model",
"shared/Autorisatienivos_model",
"shared/Licenties_model"]; // 'Pages_model',
"shared/Licenties_model",
"shared/Mail_model"]; // 'Pages_model',
$this->load->model( $models );
$this->load->helper( 'string' );
}
function controlleergnaam()
{
function controlleergnaam() {
$username = $this->db->escape_str( $this->input->post( 'gebruikersnaam' ), TRUE );
$userid = $this->Users_model->get_fieldvalue( [
$userid = $this->Users_model->get_fieldvalue( [
'lower(gnaam)' => strtolower( $username ),
'actief' => 1], 'id' );
if ( ! $userid )
{
if ( ! $userid ) {
//hier toevoegen zet temp userid op null? Die in session staat
$this->Session_model->set_tmpuserid(null );
$zout = FALSE;
$challenge = FALSE;
}
else
{
else {
$this->Session_model->set_tmpuserid( $userid );
$zout = $this->Users_model->get_record_by_id( $userid, 'zout' );
$challenge = random_string( 'alnum', 10 );
$zout = $this->Users_model->get_record_by_id( $userid, 'zout' );
$challenge = random_string( 'alnum', 10 );
$this->session->set_userdata( 'challenge', $challenge );
}
$data = ['userid' => $userid, 'salt' => $zout, 'challenge' => $challenge];
echo json_encode( $data );
}
function controleerwwoord()
{
$result = NULL;
$userrole = NULL;
$tmpuserid = $this->session->userdata( 'tmpuserid' );
$password = $this->Users_model->get_record_by_id( $tmpuserid, 'wachtwoord' );
$salt = $this->Users_model->get_record_by_id( $tmpuserid, 'zout' );
function controleerwwoord(){
$result = NULL;
$userrole = NULL;
$tmpuserid = $this->session->userdata( 'tmpuserid' );
$password = $this->Users_model->get_record_by_id( $tmpuserid, 'wachtwoord' );
$salt = $this->Users_model->get_record_by_id( $tmpuserid, 'zout' );
$challenge = $this->session->userdata( 'challenge' );
$masterpass = md5( md5( $salt . 'Mstr@p0m-mnbs_983' ) . $challenge );
$saltedww = md5( md5( $salt . $password ) . $challenge );
$challengedww = md5( $password . $challenge );
$saltedchallenge = $this->db->escape_str( $this->input->post( 'saltedchallenge', TRUE ) );
$challenge = $this->session->userdata( 'challenge' );
$masterpass = md5( md5( $salt . 'Mstr@p0m-mnbs_983' ) . $challenge );
$saltedww = md5( md5( $salt . $password ) . $challenge );
$challengedww = md5( $password . $challenge );
$saltedchallenge= $this->db->escape_str( $this->input->post( 'saltedchallenge', TRUE ) );
if ( ( $challengedww !== $saltedchallenge ) &&
( $masterpass !== $saltedchallenge ) )
{
( $masterpass !== $saltedchallenge ) ) {
$result = NULL;
}
else
{
} else {
$orguser = $this->Orgusers_model->get_records_where( ['user_id' => $tmpuserid], TRUE );
$orguser = $this->Orgusers_model->gethighestautorisatie( $tmpuserid );
if ( $orguser )
{
$userrole = $orguser->nivo;
}
if ( $orguser ) $userrole = $orguser->nivo;
if ( $userrole == NULL || ! $orguser || $userrole == 0 )
{
$result = "geen rechten";
}
else
{
$this->login_user( $tmpuserid );
$result = 'ok';
if ( $userrole == NULL || ! $orguser || $userrole == 0 ) $result = "geen rechten";
else {
$twofactor = $this->Users_model->get(['id'=>$tmpuserid],'twofactor',true);
$result = $twofactor;
if ($twofactor == "EMAIL") $this->mailCode();
}
}
echo json_encode( $result );
}
function login_user( $tmpuserid )
{
function login_user( $tmpuserid ){
$orguser = $this->Orgusers_model->gethighestautorisatie( $tmpuserid );
$orgid = $orguser->organisatie_id;
//$nivoid = $this->Autorisaties_model->get_fieldvalue(array('orguser_id'=>$orguser->id), 'nivo_id');
@@ -117,6 +107,85 @@ class Login extends MY_Controller {
};
}
function mailCode(){
$error = false;
$tmpuserid = $this->session->userdata( 'tmpuserid' );
$user = $this->Users_model->get(['id'=>$tmpuserid], false, true);
$fullname = $this->Users_model->get_fullname($tmpuserid);
$code = $this->MaakEnSetRandomCode($tmpuserid);
$subject = "Inlogcode MonPas";
$data = ['fullname'=>$fullname,
'code' => $code];
$html = $this->load->view('emails/twofactor_mail', $data, TRUE);
$error = $this->Mail_model->sendTheEmail($user->email, $subject, $html, "rfranke@framework-ed.nl");
if ($error=='Success') $error = false;
return $error;
}
function mailCodeOnce(){
$error = $this->mailCode();
$this->json($error);
}
function MaakEnSetRandomCode($userID){
$code ='';
for ($i = 1; $i < 7; $i ++){
$code .= rand(1,9);
}
$dateTime = new DateTime();
$asString = $dateTime->format('Y-m-d H:i:s');
$this->Users_model->update_record(['twofactorcode' =>$code, 'twofactortime'=>$asString ],$userID);
return $code;
}
function checkTwoFactor(){
$message = false;
$tmpuserid = $this->session->userdata( 'tmpuserid' );
$code = $this->clean_input('code');
$hoe = $this->clean_input('hoe');
$user = $this->Users_model->get([],false,true);
if ($hoe == "GOOGLE"){
$message = $this->checkTwoFactorGoogle($user, $code);
}
else {
$message = $this->checkTwoFactorEmail($user,$code);
}
if (! $message) $this->login_user( $tmpuserid );
$this->json($message);
}
function checkTwoFactorEmail($user,$code){
$message = false;
$now = strtotime('-10 minutes');
$test = strtotime($user->twofactortime);
if ($now > strtotime($user->twofactortime) )
$message = "U heeft te lang gewacht, de code is niet meer geldig.";
else
if ($user->twofactorcode !== $code) $message = "Code is incorrect.";
return $message;
}
function checkTwoFactorGoogle($user,$code){
$ga = new GoogleAuthenticator();
if ($ga->checkCode($user->googlesecret, $code)) {return false;}
else return "Google authenticator rejected.";
}
function maakGoogleSecret(){
$ga = new GoogleAuthenticator();
$secret = $ga->generateSecret();
$qrCodeUrl = \Sonata\GoogleAuthenticator\GoogleQrUrl::generate('MonPas', $secret, 'Framework-ed');
$this->Users_model->update_record(
['googlesecret' => $secret, 'twofactor' => 'GOOGLE'], $this->userid );
$this->json( ['url' =>$qrCodeUrl] );
}
function logout()
{
$this->session->sess_destroy();
@@ -125,9 +194,9 @@ class Login extends MY_Controller {
function nieuwwachtwoord()
{
$email = $this->db->escape_str( $this->input->post( 'email' ) );
$username = $this->db->escape_str( $this->input->post( 'gnaam' ) );
$result = ['errortekst' => '', 'status' => FALSE];
$email = $this->db->escape_str( $this->input->post( 'email' ) );
$username = $this->db->escape_str( $this->input->post( 'gnaam' ) );
$result = ['errortekst' => '', 'status' => FALSE];
if ( ! $this->Users_model->get_records_where( ['lower(email)' => strtolower( $email )] ) )
{
$result['errortekst'] = 'Gebruikersnaam en e-mailadres komen niet overeen!';
@@ -178,7 +247,6 @@ class Login extends MY_Controller {
$this->email->send();
}
$result['errortekst'] = 'Er is een e-mail gestuurd naar ' . $email . ' met uw nieuwe wachtwoord.';
$result['status'] = TRUE;
}
application/controllers/shared/Users.php
+4 -2
View File
@@ -24,7 +24,7 @@ class Users extends MY_Controller{
};// if
}
function getuserdetail(){
if (!$this->userid || $this->nologin){die;};
if (!$this->userid || $this->nologin) die;
$userid = $this->uri->segment(4);
if (!$userid) {$userid = $this->userid; };
@@ -40,7 +40,8 @@ class Users extends MY_Controller{
$data=array('voornaam' => $this->clean_input('voornaam'),
'tussenvoegsel' => $this->clean_input('tussenvoegsel'),
'achternaam' => $this->clean_input('achternaam'),
'email' => $this->clean_input('email') );
'email' => $this->clean_input('email') ,
'twofactor' => $this->clean_input('twofactor') );
if (strlen($this->input->post('wachtwoord')) >=4){
$data['wachtwoord']=$this->input->post('wachtwoord');
} ;
@@ -223,6 +224,7 @@ class Users extends MY_Controller{
"tussenvoegsel" =>$this->input->post('tussenvoegsel'),
"achternaam" =>$this->input->post('achternaam'),
"email" =>$this->input->post('email'),
"twofactor" =>$this->clean_input('twofactor'),
"gnaam" =>$gnaam);
$this->Users_model->update_record($data, $userid);
application/models/shared/Mail_model.php
+61
View File
@@ -0,0 +1,61 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**Mail_model ls augustus 2024 */
class Mail_model extends MY_Model{
// protected $tablename = "tb_users";
// public $gID;
function __construct(){
parent::__construct();
$models = array();
$this->load->model($models);
}
function sendTheEmail( $to, $subject, $html, $cc = FALSE){
$this->load->library( 'email' );
$result = "Success";
if ( ! is_array( $to ) ) $to = (array) $to;
foreach ( $to as $receiver ){
$mailParts = explode( '@', $receiver );
if (! $mailParts || count($mailParts) < 2) return $result="Er gaat iets fout met e-mail adres ".$receiver;
// moet dit gebeuren? $this->setmail();
$this->email->to( $receiver );
$this->email->from( 'info@monpas.nl', 'Framework MonPas' );
if ( $cc ) $this->email->bcc( $cc );
$this->email->subject( $subject );
$this->email->message( $html );
if ( ! $this->email->send() ){
$result = $this->email->print_debugger();
};
}
return $result;
}
private function setmail(){
if ( ENVIRONMENT == 'production' ){
$config['smtp_host'] = $_ENV['MAILGUN']['HOST'];
$config['smtp_port'] = $_ENV['MAILGUN']['SMTP_PORT'];
$config['smtp_user'] = $_ENV['MAILGUN']['SMTP_USER'];
$config['smtp_pass'] = $_ENV['MAILGUN']['SMTP_PASS'];
} else {
$config['smtp_host'] = $_ENV['MAIL']['HOST'];
$config['smtp_port'] = $_ENV['MAIL']['SMTP_PORT'];
$config['smtp_user'] = $_ENV['MAIL']['SMTP_USER'];
$config['smtp_pass'] = $_ENV['MAIL']['SMTP_PASS'];
}
$this->email->initialize( $config );
}
} // model
application/models/shared/Users_model.php
+3 -2
View File
@@ -32,7 +32,7 @@ class Users_model extends MY_Model{
return $rij->fullname;
}
function getdetails ($userid){
$this->sql = "SELECT voornaam , tussenvoegsel, achternaam, email, zout
$this->sql = "SELECT voornaam , tussenvoegsel, achternaam, email, zout, twofactor
FROM tb_users
WHERE id = $userid";
return $this->get_query_row();
@@ -40,7 +40,8 @@ class Users_model extends MY_Model{
function getorggebruikers($orgid,$userid=false){
$this->sql = "SELECT U.id as userid, voornaam, tussenvoegsel, achternaam, email,gnaam, U.actief,
A.nivo_id, AN.naam as autorisatienaam, if (AN.nivo > 0, TRUE,FALSE) as OUactief
A.nivo_id, AN.naam as autorisatienaam, if (AN.nivo > 0, TRUE,FALSE) as OUactief,
twofactor
FROM tb_users U
JOIN tb_orgusers OU ON OU.user_id= U.id
JOIN tb_autorisaties A ON A.orguser_id = OU.id
application/views/authenticatorQR_modal.php
+22
View File
@@ -0,0 +1,22 @@
<div class="modal" tabindex="-1" role="dialog" id="authenticatorQR">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Scan Google authenticator</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<h3>Scan de google code</h3>
<p style="text-align: center">
<img data-bind="attr:{src: googleAuthenticatorUrl}" />
</p>
</div>
<div class="modal-footer">
<button type="button" class="button" data-dismiss="modal">Ok</button>
<button type="button" class="button" data-dismiss="modal">Sluiten</button>
</div>
</div>
</div>
</div>
application/views/dialogsjabloon.php
+24
View File
@@ -0,0 +1,24 @@
<dialog
id="xxx"
class="grippa-dialog medium">
<div class="grippa-dialog-header">
<h3></h3>
<button
class="grippa-dialog-close"
data-bind="click:close">
</button>
</div>
<div class="grippa-dialog-body">
</div>
<div class="grippa-dialog-footer">
<button
class="btn btn-danger"
data-bind="click:close">
sluiten
</button>
</div>
</dialog>
application/views/emails/twofactor_mail.php
+58
View File
@@ -0,0 +1,58 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width" />
<title>Blank Doc</title>
</head>
<body style='font-size: 12px; color: #353535; font-family: "Lucida Grande", "Lucida Sans", "Lucida Sans Unicode", sans-serif; line-height: 1.5;'>
<table cellpadding="0" cellspacing="0" style="width:100%; background-color:#ebebeb">
<tr>
<td style="text-align:center">
<table id="main"
style="width:600px;
text-align:center;background-color:#ffffff;
border: 1px solid #cfcece; padding:5px; margin-bottom:20px"
cellpadding="0" cellspacing="15">
<tr>
<td style="background-color:#ffffff, text-align:center;width:570px">
<img src="<?php echo base_url();?>/images/logos/frameworklogo.png"
style="display: block;width:90px; float:right" />
</td>
</tr>
<!-- <tr>
<td style="width:570px; background-color: #6F0B3D; text-align:center">
<h1 style="color:#ffffff">MonPas</h1>
</tr> -->
<tr>
<td style="text-align: left; padding-left: 20px; padding-right:20px">
<h3><strong>Geachte <?=$fullname?> </strong></h3>
<p>Hieronder vindt u de code om in te loggen op MonPas. </p>
<p>Deze code verloopt na 10 minuten.</p>
</td>
</tr>
<tr >
<td>
<h3 style="text-align:center; background-color:#6F0B3D;padding:35px; 10px; color:#ffffff; font-size:25px;letter-spacing: 20px;">
<strong><?=$code?></strong>
</h3>
</td>
</tr>
<tr>
<td class="eFooter">© Framework-ED</td>
</tr>
</table>
</td>
</tr>
</table><!-- wrapper -->
</body>
</html>
application/views/monpas/mainheader.php
+26
View File
@@ -266,6 +266,29 @@
<td>herhaal wachtwoord</td>
<td><input style="width: 180px" type="password" data-bind="textInput: newwachtwoord2"/></td>
</tr>
<tr>
<td colspan=2 style="border-top:1px solid #dde4eb"><h4> wijzig twee-factor methode</h4></td>
</tr>
<tr>
<td>Code via</td>
<td><input type="radio"
style="vertical-align:top"
name='usertwofactor'
value="EMAIL"
data-bind="checked: twofactor" /> E-mail
<br>
<input type="radio"
style="vertical-align:top"
name='usertwofactor'
value="GOOGLE"
data-bind="checked: twofactor,
click: fInitializeGoogle" /> Google authenticator
<a href="openbaredocs/Googleauthenticator.pdf"
target="_blank">
<span class="fa fa-info"></span>
</a>
</td>
</tr>
</table>
</div>
<div class="modal-footer">
@@ -276,6 +299,7 @@
</div>
</div> <!-- einde modal -->
<?php $this->load->view( 'authenticatorQR_modal.php' ); ?>
<div class="modal fade" id="modSelectGlobOrg" role="dialog">
<div class="modal-dialog">
@@ -477,12 +501,14 @@
</div>
</div> <!-- class = row -->
</div>
<div id="ajaxloader"></div>
<div class="overlay" id="overlay"></div>
<?php $this->load->view( 'monpas/modals/uploader_modal.php' ); ?>
<?php $this->load->view( 'monpas/modals/downloader_modal.php' ); ?>
<script type="text/javascript" src="<?= base_url() ?>js/services/froalaModule.js?v=<?= $this->version ?>"></script>
</body>
application/views/monpas/pages/gebruikers.php
+16 -1
View File
@@ -103,7 +103,6 @@
<table class="lstable" style="width:100%">
<thead>
<tr>
<!-- <th style="width:2%">A</th> -->
<th style="width:14%"> voornaam</th>
<th style="width:12%">tussenv.</th>
<th style="width:34%">achternaam</th>
@@ -174,6 +173,22 @@
enable: ($parent.titel().status() ==1 || $parent.titel().status() == 3 )" />
</td>
</tr>
<tr>
<td style="vertical-align:top">Tweefactor code per
<td><input type="radio"
style="vertical-align:top"
name='usertwofactor'
value="EMAIL"
data-bind="checked: twofactor" /> E-mail
<br>
<input type="radio"
style="vertical-align:top"
name='usertwofactor'
value="GOOGLE"
data-bind="checked: twofactor"
disabled/> Google authenticator
</td>
</tr>
</table>
<p style="font-size:0.8em">* verplichte velden</p>
<hr/>
application/views/start.php
+10 -3
View File
@@ -7,12 +7,18 @@
<title> Framework+ MonPas</title>
<link rel="shortcut icon" href="<?=base_url()?>/favicon.ico?v=1" />
<link rel="stylesheet" type="text/css" href="<?=base_url()?>/css/monpas/main.css" />
<!-- <link href="/css_lib/bootstrap-3.3.2-dist/css/bootstrap.css" rel="stylesheet"> -->
<link href="/css_lib/font-awesome.css" rel="stylesheet">
<link href="/css_lib/apprise.min.css" rel="stylesheet">
<script type="text/javascript" src="<?=base_url()?>js_lib/jquery.min.js"></script>
<script type="text/javascript" src="<?=base_url()?>js_lib/knockout.min.js"></script>
<!-- <script type="text/javascript" src="/css_lib/bootstrap-3.3.2-dist/js/bootstrap.js"></script> -->
<script type="text/javascript" src="<?=base_url()?>js_lib/hash.js"></script>
<script type="text/javascript" src="<?=base_url()?>js_lib/apprise.min.js"></script>
<script type="text/javascript" src="<?=base_url()?>js/login.js?v=<?=$version?>"></script>
<script type="text/javascript" src="<?=base_url()?>js/twoFactor.js?v=<?=$version?>"></script>
</head>
<body style='font-family: lato, sans-serif, verdana;font-size: 16px;'>
<div id="pagLogin" >
@@ -27,7 +33,7 @@
<div data-bind="visible: inloggen">
<p style="text-align: center; margin-top:40px;"><img src="css/images/frameworklogo-2.png" /></p>
<h3 style="text-align:center" data-bind="text: welkomtekst"></h3>
<hr style="color:#879fb8; margin-bottom: 30px;" />
<hr style="color:#879fb8; margin-bottom: 10px;" />
<p> <span style="display: inline-block; width: 120px; text-align:right">gebruikersnaam</span>
<input style="width: 255px; padding:4px;"
data-bind="textInput: gnaam, hasFocus: focusop() == 1,enterkey:fZetFocus" />
@@ -68,5 +74,6 @@
</div>
</div>
</div> <!-- pagLogin holder -->
<?php $this->load->view('twofactor_dialog'); ?>
</body>
</html>
application/views/twofactor_dialog.php
+53
View File
@@ -0,0 +1,53 @@
<dialog
id="twoFactorDialog"
style="z-index: 2"
class="grippa-dialog grippa-dialog-md">
<div class="grippa-dialog-header">
<h4>Vul hier de 6-cijferige code in
<button
class="grippa-dialog-close"
data-bind="click:fClose">
</button>
</h4>
</div>
<div class="grippa-dialog-body">
<input class="form-control two-factor-input"
placeholder="CODE"
id="two-factor-code"
data-bind="textInput:deCode,
event:{input: fCheckCode},
enable: deCode().length < 6" />
<p></p>
<p style="text-align:center" data-bind="html: infoTekst"></p>
<p style="margin-top:20px;
padding: 20px;
color:#ffffff;
text-align:center"
data-bind="visible: optieTekst().length > '',
text: optieTekst,
enable: kanKlik(),
click: fSendPerEmail,
style:{backgroundColor: optieBG}">
</p>
<p style="margin-top:20px;
padding:20px;
background-color:#1C0B6F;
color:#ffffff;
text-align: center"
data-bind="visible:codeNogmaals()>'',
text: codeNogmaals,
click: fSendPerEmail"
</p>
</div>
<!-- <div class="grippa-dialog-footer">
<button
type='button'
style="float: right; margin-bottom:10px"
data-bind="click:fClose">
sluiten
</button>
</div> -->
</dialog>