Tidied up code\nRemoved placeholders
This commit is contained in:
@ -57,19 +57,41 @@ function authenticateLDAP (string $username, string $password) {
|
||||
}
|
||||
}
|
||||
|
||||
function storeToken (string $username, string $password, object $cookie) {
|
||||
global $settings;
|
||||
function storeToken (string $secureToken, string $qualifiedUsername, string $httpHost) {
|
||||
global $settings, $pdoDB;
|
||||
|
||||
}
|
||||
|
||||
function retrieveTokenFromDB (string $username, string $foo) {
|
||||
global $settings;
|
||||
// Save authentication token in database serverside
|
||||
try {
|
||||
$pdoQuery = $pdoDB->prepare('
|
||||
INSERT INTO SecureToken (UserId, Value)
|
||||
SELECT User.Id, :securetoken
|
||||
FROM User
|
||||
WHERE User.Username = :qualifiedusername
|
||||
');
|
||||
$pdoQuery->execute([
|
||||
':securetoken' => $secureToken,
|
||||
':qualifiedusername' => $qualifiedUsername
|
||||
]);
|
||||
}
|
||||
catch (Exception $e) {
|
||||
return ['status' => 'Fail', 'reason' => $e];
|
||||
}
|
||||
|
||||
// Save authentication token in cookie clientside
|
||||
$cookieDomain = array_values(array_filter($settings->Session['CookieDomains'], function ($value) use ($httpHost) {
|
||||
// Check if $_SERVER['HTTP_HOST'] matches any of the configured domains (either explicitly or as a subdomain)
|
||||
// This might seem backwards, but relying on $_SERVER directly allows spoofed values with potential security risks
|
||||
return (strlen($value) > strlen($httpHost)) ? false : (0 === substr_compare($httpHost, $value, -strlen($value)));
|
||||
}))[0];
|
||||
if (setcookie('JWT', $secureToken, (time() + $settings->Session['Duration']), '/', '.' . $cookieDomain)) {
|
||||
return ['status' => 'Success'];
|
||||
}
|
||||
}
|
||||
|
||||
function validateToken (string $secureToken) {
|
||||
global $settings, $pdoDB;
|
||||
|
||||
// Decode provided authentication token
|
||||
try {
|
||||
$jwtPayload = JWT::decode($secureToken, base64_decode($settings->JWT['PrivateKey_base64']), $settings->JWT['Algorithm']);
|
||||
} catch (Exception $e) {
|
||||
@ -82,6 +104,7 @@ function validateToken (string $secureToken) {
|
||||
return ['status' => 'Fail', 'reason' => '3'];
|
||||
}
|
||||
|
||||
// Retrieve all authentication tokens from database matching username
|
||||
$pdoQuery = $pdoDB->prepare('
|
||||
SELECT SecureToken.Value
|
||||
FROM SecureToken
|
||||
@ -100,13 +123,12 @@ function validateToken (string $secureToken) {
|
||||
}
|
||||
}
|
||||
|
||||
// Compare provided authentication token to all stored tokens in database
|
||||
if (!empty($storedTokens) && sizeof(array_filter($storedTokens, function ($value) use ($jwtPayload) {
|
||||
return $value->iat === $jwtPayload->iat;
|
||||
})) === 1) {
|
||||
// At least one of the database-stored tokens match
|
||||
return ['status' => 'Success', 'token' => $jwtPayload];
|
||||
return ['status' => 'Success'];
|
||||
} else {
|
||||
// No matching token in database
|
||||
return ['status' => 'Fail', 'reason' => '2'];
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user