Skip to content

Commit

Permalink
Many changes on user profile and login system
Browse files Browse the repository at this point in the history 
- Fixed #80
- Better UI
- Fixed some bugs
  • Loading branch information
@getpinga
getpinga committed Feb 26, 2024
1 parent 5831b2d commit e032e75
Show file tree
Hide file tree
Showing 10 changed files with 231 additions and 171 deletions.
13 changes: 10 additions & 3 deletions cp/app/Controllers/Auth/AuthController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Respect\Validation\Validator as v;
use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request;
use Pinga\Session;

/**
* AuthController
Expand Down Expand Up @@ -59,7 +60,13 @@ public function login(Request $request, Response $response){
global $container;
$data = $request->getParsedBody();
$db = $container->get('db');
$is2FAEnabled = $db->selectValue('SELECT tfa_enabled, tfa_secret FROM users WHERE email = ?', [$data['email']]);
$is2FAEnabled = $db->selectValue('SELECT tfa_enabled FROM users WHERE email = ?', [$data['email']]);
$isWebaEnabled = $db->selectValue('SELECT auth_method FROM users WHERE email = ?', [$data['email']]);

if ($isWebaEnabled == 'webauthn') {
$container->get('flash')->addMessage('error', 'WebAuthn enabled for this account');
return $response->withHeader('Location', '/login')->withStatus(302);
}

// If 2FA is enabled and no code is provided, redirect to 2FA code entry
if($is2FAEnabled && !isset($data['code'])) {
Expand Down Expand Up @@ -219,7 +226,7 @@ public function verifyLogin(Request $request, Response $response)
// Send success response
$user = $db->selectRow('SELECT * FROM users WHERE id = ?', [$user_id]);

Session::regenerate(true);
session_regenerate_id();
$_SESSION['auth_logged_in'] = true;
$_SESSION['auth_user_id'] = $user['id'];
$_SESSION['auth_email'] = $user['email'];
Expand All @@ -237,7 +244,7 @@ public function verifyLogin(Request $request, Response $response)
'users_audit',
[
'user_id' => $_SESSION['auth_user_id'],
'user_event' => 'user.login',
'user_event' => 'user.login.webauthn',
'user_resource' => 'control.panel',
'user_agent' => $_SERVER['HTTP_USER_AGENT'],
'user_ip' => get_client_ip(),
Expand Down
27 changes: 16 additions & 11 deletions cp/app/Controllers/ProfileController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,15 @@ public function profile(Request $request, Response $response)
[$userId]
);
$is_weba_activated = $db->select(
'SELECT * FROM users_webauthn WHERE user_id = ?',
[$userId]
);
$user_audit = $db->select(
'SELECT * FROM users_audit WHERE user_id = ? ORDER BY event_time DESC',
'SELECT * FROM users_webauthn WHERE user_id = ? ORDER BY created_at DESC LIMIT 5',
[$userId]
);
if ($is_2fa_activated) {
return view($response,'admin/profile/profile.twig',['email' => $email, 'username' => $username, 'status' => $status, 'role' => $role, 'csrf_name' => $csrfName, 'csrf_value' => $csrfValue, 'userAudit' => $user_audit]);
return view($response,'admin/profile/profile.twig',['email' => $email, 'username' => $username, 'status' => $status, 'role' => $role, 'csrf_name' => $csrfName, 'csrf_value' => $csrfValue]);
} else if ($is_weba_activated) {
return view($response,'admin/profile/profile.twig',['email' => $email, 'username' => $username, 'status' => $status, 'role' => $role, 'qrcodeDataUri' => $qrcodeDataUri, 'secret' => $secret, 'csrf_name' => $csrfName, 'csrf_value' => $csrfValue, 'weba' => $is_weba_activated, 'userAudit' => $user_audit]);
return view($response,'admin/profile/profile.twig',['email' => $email, 'username' => $username, 'status' => $status, 'role' => $role, 'qrcodeDataUri' => $qrcodeDataUri, 'secret' => $secret, 'csrf_name' => $csrfName, 'csrf_value' => $csrfValue, 'weba' => $is_weba_activated]);
} else {
return view($response,'admin/profile/profile.twig',['email' => $email, 'username' => $username, 'status' => $status, 'role' => $role, 'qrcodeDataUri' => $qrcodeDataUri, 'secret' => $secret, 'csrf_name' => $csrfName, 'csrf_value' => $csrfValue, 'userAudit' => $user_audit]);
return view($response,'admin/profile/profile.twig',['email' => $email, 'username' => $username, 'status' => $status, 'role' => $role, 'qrcodeDataUri' => $qrcodeDataUri, 'secret' => $secret, 'csrf_name' => $csrfName, 'csrf_value' => $csrfValue]);
}

}
Expand Down Expand Up @@ -203,10 +199,19 @@ public function verifyRegistration(Request $request, Response $response)
'sign_count' => $counter
]
);

$msg = 'registration success.';
$db->update(
'users',
[
'auth_method' => 'webauthn'
],
[
'id' => $userId
]
);

$msg = 'Registration success.';
if ($credential->rootValid === false) {
$msg = 'registration ok, but certificate does not match any of the selected root ca.';
$msg = 'Registration ok, but certificate does not match any of the selected root ca.';
}

$return = new \stdClass();
Expand Down
153 changes: 17 additions & 136 deletions cp/resources/views/admin/profile/profile.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,27 +134,30 @@
{% endif %}
</div>
<div class="card tab-pane" id="tabs-webauthn">
{% if weba is defined %}
<div class="card-body">
<h3 class="card-title">{{ __('WebAuthn Authentication') }}</h3>
<p>{{ __('Secure your account with WebAuthn. Click the button below to register your device for passwordless sign-in.') }}</p>
<button type="button" class="btn btn-success" id="connectWebAuthnButton">{{ __('Connect WebAuthn Device') }}</button>
<div class="d-flex align-items-center">
<span class="badge bg-green text-green-fg me-3"><svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M12 3a12 12 0 0 0 8.5 3a12 12 0 0 1 -8.5 15a12 12 0 0 1 -8.5 -15a12 12 0 0 0 8.5 -3" /><path d="M12 11m-1 0a1 1 0 1 0 2 0a1 1 0 1 0 -2 0" /><path d="M12 12l0 2.5" /></svg></span>
<div>
<h5 class="card-title mb-1">{{ __('Your account is secured with an additional layer of protection.') }}</h5>
<p class="text-muted mb-2">{{ __('WebAuthn is currently') }} <strong>{{ __('enabled') }}</strong> {{ __('for your account. If you encounter any issues or need to disable WebAuthn, please contact our support team for assistance.') }}</p>
</div>
</div>
<button type="button" class="btn btn-primary mt-4" id="connectWebAuthnButton">{{ __('Connect WebAuthn Device') }}</button>
<div class="table-responsive mt-4">
<table class="table table-striped">
<thead>
<tr>
<th>{{ __('Device/Browser Info') }}</th>
<th>{{ __('Registration Date') }}</th>
<th>{{ __('Action') }}</th>
</tr>
</thead>
<tbody>
{% for device in weba %}
<tr>
<td>{{ device.user_agent }}</td>
<td>{{ device.created_at }}</td>
<td>
<a href="/path/to/action?deviceId={{ device.id }}">{{ __('Edit') }}</a>
</td>
</tr>
{% else %}
<tr>
Expand All @@ -165,38 +168,20 @@
</table>
</div>
</div>
{% else %}
<div class="card-body">
<h3 class="card-title">{{ __('WebAuthn Authentication') }}</h3>
<p>{{ __('Secure your account with WebAuthn. Click the button below to register your device for passwordless sign-in.') }}</p>
<button type="button" class="btn btn-primary" id="connectWebAuthnButton">{{ __('Connect WebAuthn Device') }}</button>
</div>
{% endif %}
</div>
<div class="card tab-pane" id="tabs-log">
<div class="card-body">
<h3 class="card-title">{{ __('User Audit Log') }}</h3>
<p>{{ __('Track and review all user activities in your account below. Monitor logins, profile changes, and other key actions to ensure security and transparency.') }}</p>
<div class="table-responsive mt-4">
<table class="table table-striped">
<thead>
<tr>
<th>{{ __('Event') }}</th>
<th>{{ __('User Agent') }}</th>
<th>IP</th>
<th>{{ __('Location') }}</th>
<th>{{ __('Timestamp') }}</th>
</tr>
</thead>
<tbody>
{% for user in userAudit %}
<tr>
<td>{{ user.user_event }}</td>
<td>{{ user.user_agent }}</td>
<td>{{ user.user_ip }}</td>
<td>{{ user.user_location }}</td>
<td>{{ user.event_time }}</td>
</tr>
{% else %}
<tr>
<td colspan="5">{{ __('No log data for user.') }}</td>
</tr>
{% endfor %}
</tbody>
</table>
<div id="auditTable"></div>
</div>
</div>
</div>
Expand All @@ -205,108 +190,4 @@
</div>
{% include 'partials/footer.twig' %}
</div>
<script>
document.addEventListener('DOMContentLoaded', function() {
const connectButton = document.getElementById('connectWebAuthnButton');
connectButton.addEventListener('click', async function() {
try {
// check browser support
if (!window.fetch || !navigator.credentials || !navigator.credentials.create) {
throw new Error('Browser not supported.');
}
// get create args
let rep = await window.fetch('/webauthn/register/challenge', {method:'GET', cache:'no-cache'});
const createArgs = await rep.json();
// error handling
if (createArgs.success === false) {
throw new Error(createArgs.msg || 'unknown error occured');
}
// replace binary base64 data with ArrayBuffer. a other way to do this
// is the reviver function of JSON.parse()
recursiveBase64StrToArrayBuffer(createArgs);
// create credentials
const cred = await navigator.credentials.create(createArgs);
// create object
const authenticatorAttestationResponse = {
transports: cred.response.getTransports ? cred.response.getTransports() : null,
clientDataJSON: cred.response.clientDataJSON ? arrayBufferToBase64(cred.response.clientDataJSON) : null,
attestationObject: cred.response.attestationObject ? arrayBufferToBase64(cred.response.attestationObject) : null
};
// check auth on server side
rep = await window.fetch('/webauthn/register/verify', {
method : 'POST',
body : JSON.stringify(authenticatorAttestationResponse),
cache : 'no-cache'
});
const authenticatorAttestationServerResponse = await rep.json();
// prompt server response
if (authenticatorAttestationServerResponse.success) {
//location.reload();
window.alert(authenticatorAttestationServerResponse.msg || 'registration success');
} else {
throw new Error(authenticatorAttestationServerResponse.msg);
}
} catch (err) {
//location.reload();
window.alert(err.message || 'unknown error occured');
}
});
/**
* convert RFC 1342-like base64 strings to array buffer
* @param {mixed} obj
* @returns {undefined}
*/
function recursiveBase64StrToArrayBuffer(obj) {
let prefix = '=?BINARY?B?';
let suffix = '?=';
if (typeof obj === 'object') {
for (let key in obj) {
if (typeof obj[key] === 'string') {
let str = obj[key];
if (str.substring(0, prefix.length) === prefix && str.substring(str.length - suffix.length) === suffix) {
str = str.substring(prefix.length, str.length - suffix.length);
let binary_string = window.atob(str);
let len = binary_string.length;
let bytes = new Uint8Array(len);
for (let i = 0; i < len; i++) {
bytes[i] = binary_string.charCodeAt(i);
}
obj[key] = bytes.buffer;
}
} else {
recursiveBase64StrToArrayBuffer(obj[key]);
}
}
}
}
/**
* Convert a ArrayBuffer to Base64
* @param {ArrayBuffer} buffer
* @returns {String}
*/
function arrayBufferToBase64(buffer) {
let binary = '';
let bytes = new Uint8Array(buffer);
let len = bytes.byteLength;
for (let i = 0; i < len; i++) {
binary += String.fromCharCode( bytes[ i ] );
}
return window.btoa(binary);
}
});
</script>
{% endblock %}
49 changes: 33 additions & 16 deletions cp/resources/views/auth/login.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,15 @@
</div>
</div>
</div>
<script src="/assets/js/sweetalert2.min.js" defer></script>
<script>
document.addEventListener('DOMContentLoaded', function() {
const loginButton = document.getElementById('loginWebAuthnButton');
const emailInput = document.querySelector('input[name="email"]');
const passwordInput = document.querySelector('input[name="password"]');
const codeInput = document.querySelector('input[name="code"]');
loginButton.addEventListener('click', async function() {
try {
// Disable password and 2FA fields
passwordInput.disabled = true;
codeInput.disabled = true;
if (!window.fetch || !navigator.credentials || !navigator.credentials.create) {
throw new Error('Browser not supported.');
}
Expand Down Expand Up @@ -112,19 +107,41 @@ document.addEventListener('DOMContentLoaded', function() {
body: JSON.stringify(authenticatorAttestationResponse),
cache:'no-cache'
});
const authenticatorAttestationServerResponse = await rep.json();
// check server response
if (authenticatorAttestationServerResponse.success) {
//reloadServerPreview();
window.alert(authenticatorAttestationServerResponse.msg || 'login success');
// Check the Content-Type of the response
const contentType = rep.headers.get('Content-Type');
if (contentType && contentType.includes('application/json')) {
// If the response is JSON, proceed with parsing
const authenticatorAttestationServerResponse = await rep.json();
// check server response
if (authenticatorAttestationServerResponse.success) {
Swal.fire({
title: 'WebAuthn Login',
text: authenticatorAttestationServerResponse.msg || 'Login success',
icon: "success"
});
} else {
Swal.fire({
title: 'WebAuthn Login',
text: authenticatorAttestationServerResponse.msg,
icon: "error"
});
}
} else if (contentType && (contentType.includes('text/html') || contentType.includes('application/xhtml+xml'))) {
// If the response is HTML, redirect to /dashboard
window.location.href = '/dashboard';
} else {
throw new Error(authenticatorAttestationServerResponse.msg);
// Handle other content types or unexpected responses
console.error('Unexpected response type:', contentType);
}
} catch (err) {
//reloadServerPreview();
window.alert(err.message || 'unknown error occured');
Swal.fire({
title: 'WebAuthn Login',
text: err.message || 'Unknown error occured',
icon: "error"
});
}
});
Expand Down
4 changes: 3 additions & 1 deletion cp/resources/views/layouts/app.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge"/>
<title>{% block title %}{% endblock %} | Namingo</title>
<!-- CSS files -->
{% if route_is('domains') or route_is('applications') or route_is('contacts') or route_is('hosts') or route_is('epphistory') or route_is('registrars') or route_is('transactions') or route_is('overview') or route_is('reports') or route_is('transfers') or route_is('users') or is_current_url('ticketview') or route_is('poll') or route_is('log') or route_is('invoices') or route_is('registry/tlds') %}{% include 'partials/css-tables.twig' %}{% else %}{% include 'partials/css.twig' %}{% endif %}
{% if route_is('domains') or route_is('applications') or route_is('contacts') or route_is('hosts') or route_is('epphistory') or route_is('registrars') or route_is('transactions') or route_is('overview') or route_is('reports') or route_is('transfers') or route_is('users') or is_current_url('ticketview') or route_is('poll') or route_is('log') or route_is('invoices') or route_is('registry/tlds') or route_is('profile') %}{% include 'partials/css-tables.twig' %}{% else %}{% include 'partials/css.twig' %}{% endif %}
<style>
@import url('https://rsms.me/inter/inter.css');
:root {
Expand Down Expand Up @@ -293,6 +293,8 @@
{% include 'partials/js-invoices.twig' %}
{% elseif route_is('registry/tlds') %}
{% include 'partials/js-tlds.twig' %}
{% elseif route_is('profile') %}
{% include 'partials/js-profile.twig' %}
{% else %}
{% include 'partials/js.twig' %}
{% endif %}
Expand Down
1 change: 1 addition & 0 deletions cp/resources/views/layouts/auth.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<title>{% block title %}{% endblock %} | Namingo</title>
<!-- CSS files -->
{% include 'partials/css.twig' %}
<link href="/assets/css/sweetalert2.min.css" rel="stylesheet">
<style>
@import url('https://rsms.me/inter/inter.css');
:root {
Expand Down
Loading

0 comments on commit e032e75

Please sign in to comment.