diff --git a/include/lucidAuth.template.php b/include/lucidAuth.template.php index e1b45b6..a4146eb 100644 --- a/include/lucidAuth.template.php +++ b/include/lucidAuth.template.php @@ -72,22 +72,6 @@ $pageLayout['full_alt'] = <<<'FULL_ALT' FULL_ALT; -$pageLayout['bare'] = <<<'BARE' - - - - - lucidAuth - - - - - - %1$s - - -BARE; - $contentLayout['login'] = <<<'LOGIN'
diff --git a/public/lucidAuth.login.php b/public/lucidAuth.login.php index cf55df8..4af3a1c 100644 --- a/public/lucidAuth.login.php +++ b/public/lucidAuth.login.php @@ -14,10 +14,9 @@ "Result" => "Failure", "Reason" => "Failed storing authentication token in database and/or cookie" ]); -# echo '{"Result":"Fail","Reason":"Failed storing authentication token in database and/or cookie"}' . PHP_EOL; exit; } - + // Convert base64 encoded string back from JSON; // forcing it into an associative array (instead of javascript's default StdClass object) try { @@ -30,7 +29,6 @@ "Result" => "Failure", "Reason" => "Original request-URI lost in transition" ]); -# echo '{"Result":"Fail","Reason":"Original request URI lost in transition"}' . PHP_EOL; exit; } $originalUri = !empty($proxyHeaders) ? $proxyHeaders['XForwardedProto'] . '://' . $proxyHeaders['XForwardedHost'] . $proxyHeaders['XForwardedUri'] : 'lucidAuth.manage.php'; @@ -40,7 +38,9 @@ echo json_encode([ "Result" => "Success", "Location" => $originalUri, - "CrossDomainLogin" => $settings->Session['CrossDomainLogin'] + "CrossDomainLogin" => $settings->Session['CrossDomainLogin'], + "CookieDomains" => json_encode(array_diff($settings->Session['CookieDomains'], [$_SERVER['HTTP_HOST']])), + "SecureToken" => $result['token'] ]); } else { switch ($result['reason']) { @@ -63,8 +63,8 @@ } else { include_once('../include/lucidAuth.template.php'); - echo sprintf($pageLayout['full'], - sprintf($contentLayout['login'], + echo sprintf($pageLayout['full'], + sprintf($contentLayout['login'], $_GET['ref'] ) ); diff --git a/public/lucidAuth.requestCookie.php b/public/lucidAuth.requestCookie.php new file mode 100644 index 0000000..409f524 --- /dev/null +++ b/public/lucidAuth.requestCookie.php @@ -0,0 +1,59 @@ +Debug['Verbose']) throw new Exception($e); + exit; + } + + switch ($queryString['action']) { + case 'login': + if (validateToken($queryString['token'])['status'] === "Success") { + // This request appears valid; try storing a cookie + $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) { + return (strlen($value) > strlen($httpHost)) ? false : (0 === substr_compare($httpHost, $value, -strlen($value))); + }))[0]; + $originDomain = array_values(array_filter($settings->Session['CookieDomains'], function ($value) use ($httpOrigin) { + 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('Access-Control-Allow-Credentials: true'); + header('Access-Control-Max-Age: 86400'); + header("HTTP/1.1 202 Accepted"); + exit; + } + else { + header("HTTP/1.1 400 Bad Request"); + exit; + } + } + else { + header("HTTP/1.1 401 Unauthorized"); + exit; + } + break; + default: + header("HTTP/1.1 400 Bad Request"); + exit; + break; + } + } + else { + header("HTTP/1.1 400 Bad Request"); + exit; + } +?> \ No newline at end of file diff --git a/public/lucidAuth.setXDomainCookie.php b/public/lucidAuth.setXDomainCookie.php deleted file mode 100644 index 0d20746..0000000 --- a/public/lucidAuth.setXDomainCookie.php +++ /dev/null @@ -1,41 +0,0 @@ -Session['CookieDomains'] and iterate through the remaining domains, serving them in one page (which contains iframes already) - // this might be slower because it means one additional roundtrip between client and server - - // approach 2: - // let the client setup multiple iframes for all domains other than origin domains - // this requires passing an array of domains to the client in asynchronous reply; which feels insecure - - if (!empty($_REQUEST['ref'])) { - try { - $queryString = json_decode(base64_decode($_REQUEST['ref']), JSON_OBJECT_AS_ARRAY); - } - catch (Exception $e) { - // Silently fail, unless explicitly specified otherwise - if ($settings->Debug['Verbose']) throw new Exception($e); - exit; - } - - switch ($queryString['action']) { - case 'login': - break; - default: - break; - } - } - - include_once('../include/lucidAuth.template.php'); - - echo sprintf($pageLayout['bare'], - '// iFrames go here' - ); -?> \ No newline at end of file diff --git a/public/lucidAuth.validateRequest.php b/public/lucidAuth.validateRequest.php index 289561d..ef68ff0 100644 --- a/public/lucidAuth.validateRequest.php +++ b/public/lucidAuth.validateRequest.php @@ -14,7 +14,7 @@ $proxyHeaders = array_filter($proxyHeaders, function ($key) { return substr($key, 0, 10) === 'XForwarded'; }, ARRAY_FILTER_USE_KEY); - + // For debugging purposes - enable it in ../lucidAuth.config.php if ($settings->Debug['LogToFile']) { file_put_contents('../requestHeaders.log', (new DateTime())->format('Y-m-d\TH:i:s.u') . ' --- ' . (json_encode($proxyHeaders, JSON_FORCE_OBJECT)) . PHP_EOL, FILE_APPEND); @@ -22,7 +22,7 @@ if (sizeof($proxyHeaders) === 0) { // Non-proxied request; this is senseless, go fetch! - header("HTTP/1.1 403 Forbidden"); + header("HTTP/1.1 400 Bad Request"); exit; } diff --git a/public/misc/script.index.js b/public/misc/script.index.js index 746d489..1fd11cc 100644 --- a/public/misc/script.index.js +++ b/public/misc/script.index.js @@ -31,11 +31,34 @@ $(document).ready(function(){ 'color': '#FFF' }); if (data.CrossDomainLogin) { - // Create iframes for other domains -console.log('CrossDomainLogin initiated'); + var cookieDomains = JSON.parse(data.CookieDomains); + var XHR = []; + cookieDomains.forEach(function(domain) { + XHR.push($.get({ + url: "https://auth." + domain + "/lucidAuth.requestCookie.php", + crossDomain: true, + xhrFields: { + withCredentials: true, + }, + data: { + ref: btoa(JSON.stringify({ + action: 'login', + token: data.SecureToken + })) + } + })); + }); + $.when.apply($, XHR).then(function(){ + $.each(arguments, function(_index, _arg) { + // Show progress somehow (maybe something like https://minicss.org/v2/progress) + }); + }); } -console.log("Navigating to :" + data.Location); - window.location.replace(data.Location); + // Finished (either succesfully or through timeout) cross-domain logins +// redirect once all finished loading or timeout after $X ms +// origin domain should be exempted from timeout +// (because origin domain can/will be different from current domain --due to traefik design). + //window.location.replace(data.Location); }, 2250); } else { $('#btnlogin').css({ diff --git a/public/misc/script.theme.js b/public/misc/script.theme.js deleted file mode 100644 index 5532021..0000000 --- a/public/misc/script.theme.js +++ /dev/null @@ -1,19 +0,0 @@ -$(document).ready(function() { - if (localStorage.getItem('theme') != '') { - $('html').addClass(localStorage.getItem('theme')); - } - - $('.logo .sub').on('click', function(event) { - if (event.ctrlKey) { - var classes = ["tablecloth", "weave", "madras", "tartan", "seigaiha"]; - var selectedTheme = classes[~~(Math.random()*classes.length)]; - - $('html').removeClass().addClass(selectedTheme); - localStorage.setItem('theme', selectedTheme); - } - if (event.altKey) { - $('html').removeClass(); - localStorage.removeItem('theme'); - } - }); -}); \ No newline at end of file