Don't require login to logout

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1223 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php
index d174835e115196e7b5c148e696c3e7c3b802e823..c261b07f6cd3cf1577c98d968255ce07b3c985e7 100644 (file)
--- a/adminer/include/auth.inc.php
+++ b/adminer/include/auth.inc.php
@@ -4,7 +4,6 @@ if (isset($_POST["server"])) {
        session_regenerate_id(); // defense against session fixation
        $_SESSION["usernames"][$_POST["server"]] = $_POST["username"];
        $_SESSION["passwords"][$_POST["server"]] = $_POST["password"];
-       $_SESSION["tokens"][$_POST["server"]] = rand(1, 1e6); // defense against cross-site request forgery
        if (count($_POST) == count($ignore)) {
                $location = ((string) $_GET["server"] === $_POST["server"] ? remove_from_uri() : preg_replace('~^([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) . (strlen($_POST["server"]) ? '?server=' . urlencode($_POST["server"]) : ''));
                if (!isset($_COOKIE[session_name()])) {
@@ -12,12 +11,10 @@ if (isset($_POST["server"])) {
                }
                redirect($location);
        }
-       if ($_POST["token"]) {
-               $_POST["token"] = $_SESSION["tokens"][$_POST["server"]];
-       }
        $_GET["server"] = $_POST["server"];
 } elseif (isset($_POST["logout"])) {
-       if ($_POST["token"] != $_SESSION["tokens"][$_GET["server"]]) {
+       $token = $_SESSION["tokens"][$_GET["server"]];
+       if ($token && $_POST["token"] != $token) {
                page_header(lang('Logout'), lang('Invalid CSRF token. Send the form again.'));
                page_footer("db");
                exit;
@@ -25,6 +22,9 @@ if (isset($_POST["server"])) {
                foreach (array("usernames", "passwords", "databases", "tokens", "history") as $val) {
                        unset($_SESSION[$val][$_GET["server"]]);
                }
+               if (!isset($_SESSION["passwords"])) { // don't require login to logout
+                       $_SESSION["passwords"] = array();
+               }
                redirect(substr(ME, 0, -1), lang('Logout successful.'));
        }
 }
@@ -49,6 +49,13 @@ function auth_error($exception = null) {
        page_footer("auth");
 }
 
+if (!$_SESSION["tokens"][$_GET["server"]]) {
+       $_SESSION["tokens"][$_GET["server"]] = rand(1, 1e6); // defense against cross-site request forgery
+       if ($_POST["token"]) {
+               $_POST["token"] = $_SESSION["tokens"][$_GET["server"]];
+       }
+}
+
 $username = &$_SESSION["usernames"][$_GET["server"]];
 if (!isset($username)) {
        $username = $_GET["username"]; // default username can be passed in URL