Use PmaAbsolueUri for cookie path

Issue #12374 Signed-off-by: Michal Čihař <michal@cihar.com>
phpmyadmin · Aug 17, 2016 · 8347632 · 8347632
1 parent 1099f68
commit 8347632
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/libraries/Config.php b/libraries/Config.php
@@ -1393,6 +1393,15 @@ public function getCookiePath()
             return $cookie_path;
         }
 
+        $url = $this->get('PmaAbsoluteUri');
+
+        if (! empty($url)) {
+            $path = parse_url($url, PHP_URL_PATH);
+            if (! empty($path)) {
+                return $path;
+            }
+        }
+
         $parsed_url = parse_url($GLOBALS['PMA_PHP_SELF']);
 
         $parts = explode(

diff --git a/test/classes/plugin/auth/AuthenticationCookieTest.php b/test/classes/plugin/auth/AuthenticationCookieTest.php
@@ -456,6 +456,7 @@ public function testLogoutDelete()
         $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = '';
         $GLOBALS['cfg']['CaptchaLoginPublicKey'] = '';
         $GLOBALS['cfg']['LoginCookieDeleteAll'] = true;
+        $GLOBALS['PMA_Config']->set('PmaAbsoluteUri', '');
         $GLOBALS['cfg']['Servers'] = array(1);
 
         $_COOKIE['pmaAuth-0'] = 'test';
@@ -497,6 +498,7 @@ public function testLogout()
         $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = '';
         $GLOBALS['cfg']['CaptchaLoginPublicKey'] = '';
         $GLOBALS['cfg']['LoginCookieDeleteAll'] = false;
+        $GLOBALS['PMA_Config']->set('PmaAbsoluteUri', '');
         $GLOBALS['cfg']['Servers'] = array(1);
         $GLOBALS['server'] = 1;
 

diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php
@@ -360,6 +360,7 @@ public function testUserprefsRedirect()
                 'Cannot redefine constant/function - missing runkit extension'
             );
         }
+        $GLOBALS['PMA_Config']->set('PmaAbsoluteUri', '');
 
         $GLOBALS['cfg']['ServerDefault'] = 1;
         $GLOBALS['lang'] = '';