README.md

@@ -29,4 +29,4 @@ Forward Authentication for use with proxies (caddy, nginx, traefik, etc)
   The domainname of the website made in step 3, needs to match the domainname (*ignoring subdomains, if any*) of the resource utilizing this authentication proxy.
 
 ## Questions or bugs
-Feel free to open issues in this repository (or in its mirror on [GitHub](#)).
+Feel free to open issues in this repository.

include/lucidAuth.template.php

@@ -81,7 +81,7 @@ $contentLayout['login'] = <<<LOGIN
           <img src="/images/tag_lock.png" style="position: absolute; top: 175px; left: 20px;" alt="Secure!" />
 LOGIN;
 
-$contentLayout['manage'] = <<<MANAGE
+$contentLayout['manage'] = <<<'MANAGE'
 		  <script src="misc/script.manage.js"></script>
           <span id="user"><span data-translation="span_loggedinas">Ingelogd als</span>&nbsp;{$_SESSION['fullname']}&nbsp;---&nbsp;[<a id="linkplugindialog" tabindex="600" data-translation="link_plugin">Browser plugin</a><div id="pluginlogos"><span data-translation="label_selectbrowser" style="float: left; margin-left: 5px;">Select browser:</span><span style="font-size: 8px; float: right; margin-right: 5px; margin-top: 2px;">[v0.2.122.4]</span><br /><img id="linkpluginchrome" src="images/chrome_256x256.png" /><img id="linkpluginfirefox" src="images/firefox_256x256.png" /><img id="linkpluginopera" src="images/opera_256x256.png" /></div>]&nbsp;[<a id="linklanguage-en" href="#" tabindex="700">EN</a>&nbsp;<a id="linklanguage-nl" class="current" href="#" tabindex="700">NL</a>]&nbsp;[<a href="index.php?do=logout" tabindex="800" data-translation="link_logout">Log uit</a>]</span>
 <!--          <fieldset style="clear: both;">
@@ -119,5 +119,4 @@ $contentLayout['dialog'] = <<<DIALOG
           </ul>
 DIALOG;
 
-
 ?>

public/lucidAuth.login.php

@@ -2,12 +2,10 @@
 	error_reporting(E_ALL ^ E_NOTICE);
 
 	include_once('../include/lucidAuth.functions.php');
-	
+
-	echo $settings->Debug['Verbose'];
-  
 	if ($_POST['do'] == 'login') {
 		$result = authenticateLDAP($_POST['username'], $_POST['password']);
-		if ($result['status'] == 'Success') {
+		if ($result['status'] === 'Success') {
 			// Store authentication token; in database serverside & in cookie clientside
 			if (storeToken($result['token'], $settings->LDAP['Domain'] . '\\' . $_POST['username'], $_SERVER['HTTP_HOST'])['status'] !== 'Success') {
 				// Since this action is only ever called through an AJAX-request; return JSON object
@@ -34,14 +32,24 @@
 				"Location"			=>	$originalUri,
 				"CrossDomainLogin"	=>	$settings->Session['CrossDomainLogin']
 			]);
-#			echo sprintf('{"Result":"Success","Location":"%1$s","CrossDomainLogin":%2$s}', $originalUri, $settings->Session['CrossDomainLogin'] ? 'True' : 'False') . PHP_EOL;
 		} else {
 			switch ($result['reason']) {
 				case '1':
-					echo '{"Result":"Fail","Reason":"Invalid username and/or password"}' . PHP_EOL;
+					header('Content-Type: application/json');
+					echo json_encode([
+						"Result"	=>	"Failure",
+						"Reason"	=>	"Invalid username and/or password"
+					]);
+#					echo '{"Result":"Fail","Reason":"Invalid username and/or password"}' . PHP_EOL;
 					break;
 				default:
-					echo '{"Result":"Fail","Reason":"Uncaught error"}' . PHP_EOL;
+					header('Content-Type: application/json');
+					echo json_encode([
+						"Result"	=>	"Failure",
+						"Reason"	=>	"Uncaught error"
+					]);
+#					echo '{"Result":"Fail","Reason":"Uncaught error"}' . PHP_EOL;
+					break;
 			}
 		}
 	} else {

public/lucidAuth.manage.php

@@ -0,0 +1,19 @@
+<?php
+	error_reporting(E_ALL ^ E_NOTICE);
+
+	include_once('../include/lucidAuth.functions.php');
+
+	if (!empty($_COOKIE['JWT']) && validateToken($_COOKIE['JWT'])['status'] === "Success") {
+		include_once('../include/lucidAuth.template.php');
+
+		echo sprintf($pageLayout['full'], $contentLayout['manage']);
+	} else {
+		// No cookie containing valid authentication token found;
+		//   explicitly deleting any remaining cookie, then redirecting to loginpage
+		setcookie('JWT', FALSE);
+
+		header("HTTP/1.1 401 Unauthorized");
+		header("Location: lucidAuth.login.php");
+	}
+
+?>