Compare commits
No commits in common. "6081e42d148fd17bae5e0f89e2ebc18d4411ce89" and "ee35696cd42bb3b4a4515611b8a497fd2c6866da" have entirely different histories.
6081e42d14
...
ee35696cd4
@ -39,8 +39,7 @@
|
|||||||
"Result" => "Success",
|
"Result" => "Success",
|
||||||
"Location" => $originalUri,
|
"Location" => $originalUri,
|
||||||
"CrossDomainLogin" => $settings->Session['CrossDomainLogin'],
|
"CrossDomainLogin" => $settings->Session['CrossDomainLogin'],
|
||||||
"CookieDomains" => json_encode(array_diff($settings->Session['CookieDomains'], [$_SERVER['HTTP_HOST']])),
|
"CookieDomains" => json_encode(array_diff($settings->Session['CookieDomains'], $_SERVER['HTTP_HOST']))
|
||||||
"SecureToken" => $result['token']
|
|
||||||
]);
|
]);
|
||||||
} else {
|
} else {
|
||||||
switch ($result['reason']) {
|
switch ($result['reason']) {
|
||||||
|
@ -18,19 +18,14 @@
|
|||||||
switch ($queryString['action']) {
|
switch ($queryString['action']) {
|
||||||
case 'login':
|
case 'login':
|
||||||
if (validateToken($queryString['token'])['status'] === "Success") {
|
if (validateToken($queryString['token'])['status'] === "Success") {
|
||||||
// This request appears valid; try storing a cookie
|
// This request appears valid; store a cookie
|
||||||
$httpHost = $_SERVER['HTTP_HOST'];
|
$httpHost = $_SERVER['HTTP_HOST'];
|
||||||
$httpOrigin = $_SERVER['HTTP_ORIGIN'];
|
|
||||||
// Check if $_SERVER['HTTP_HOST'] and $_SERVER['HTTP_ORIGIN'] match 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
|
|
||||||
$cookieDomain = array_values(array_filter($settings->Session['CookieDomains'], function ($value) use ($httpHost) {
|
$cookieDomain = array_values(array_filter($settings->Session['CookieDomains'], function ($value) use ($httpHost) {
|
||||||
return (strlen($value) > strlen($httpHost)) ? false : (0 === substr_compare($httpHost, $value, -strlen($value)));
|
// 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];
|
}))[0];
|
||||||
$originDomain = array_values(array_filter($settings->Session['CookieDomains'], function ($value) use ($httpOrigin) {
|
if ($cookieDomain && setcookie('JWT', $queryString['token'], (time() + $settings->Session['Duration']), '/', '.' . $cookieDomain)) {
|
||||||
return (strlen($value) > strlen($httpOrigin)) ? false : (0 === substr_compare($httpOrigin, $value, -strlen($value)));
|
|
||||||
}))[0];
|
|
||||||
if (($cookieDomain && (is_null($httpOrigin) || $originDomain)) && setcookie('JWT', $queryString['token'], (time() + $settings->Session['Duration']), '/', '.' . $cookieDomain)) {
|
|
||||||
header("Access-Control-Allow-Origin: {$_SERVER['HTTP_ORIGIN']}");
|
|
||||||
header("HTTP/1.1 202 Accepted");
|
header("HTTP/1.1 202 Accepted");
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
$(document).ready(function(){
|
|
||||||
$.post("lucidAuth.setXDomainCookie.php", {
|
|
||||||
do: "login",
|
|
||||||
ref: $('#ref').val()
|
|
||||||
})
|
|
||||||
.done(function(data,_status) {
|
|
||||||
if (data.Result === 'Success') {
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
@ -32,33 +32,27 @@ $(document).ready(function(){
|
|||||||
});
|
});
|
||||||
if (data.CrossDomainLogin) {
|
if (data.CrossDomainLogin) {
|
||||||
console.log('CrossDomainLogin initiated');
|
console.log('CrossDomainLogin initiated');
|
||||||
// do ajax in parallel, show progress,
|
// For reference:
|
||||||
// redirect once all finished loading or timeout after $X ms
|
// [
|
||||||
// origin domain should be exempted from timeout
|
// "Result" => "Success",
|
||||||
// (because origin domain can/will be different from current domain --due to traefik design).
|
// "Location" => $originalUri,
|
||||||
|
// "CrossDomainLogin" => $settings->Session['CrossDomainLogin'],
|
||||||
|
// "CookieDomains" => json_encode(array_diff($settings->Session['CookieDomains'], $_SERVER['HTTP_HOST']))
|
||||||
|
// ]);
|
||||||
|
|
||||||
|
var cookieDomains = json_decode(data.CookieDomains);
|
||||||
|
console.log(data.CookieDomains);
|
||||||
|
// let the client setup multiple iframes for all domains
|
||||||
|
// psuedo-code: foreach (cookieDomains as domain) { $.get(domain, ref=[action,token])}
|
||||||
|
|
||||||
|
// validate each request against JWT-tokens in database
|
||||||
|
// load all iframes parallel, show user progress and redirect once all iframes have finished loading; or after treshold of X ms has been reached
|
||||||
|
// origin domain should be exempted from the treshold (because origin domain can be different from current domain -due to traefik design).
|
||||||
|
|
||||||
var cookieDomains = JSON.parse(data.CookieDomains);
|
|
||||||
var XHR = [];
|
|
||||||
cookieDomains.forEach(function(domain) {
|
|
||||||
XHR.push($.get({
|
|
||||||
url: "https://auth." + domain + "/lucidAuth.setXDomainCookie.php",
|
|
||||||
crossDomain: true,
|
|
||||||
data: {
|
|
||||||
ref: btoa(JSON.stringify({
|
|
||||||
action: 'login',
|
|
||||||
token: data.SecureToken
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
});
|
|
||||||
$.when.apply($, XHR).then(function(){
|
|
||||||
$.each(arguments, function(_index, arg) {
|
|
||||||
console.log(JSON.stringify(arg));
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Finished (either succesfully or through timeout) cross-domain logins
|
// Finished (either succesfully or through timeout) cross-domain logins
|
||||||
//window.location.replace(data.Location);
|
window.location.replace(data.Location);
|
||||||
}, 2250);
|
}, 2250);
|
||||||
} else {
|
} else {
|
||||||
$('#btnlogin').css({
|
$('#btnlogin').css({
|
||||||
|
Loading…
x
Reference in New Issue
Block a user