From de7181653f80d7a0a83b9e197b2bdf4faf37e09b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 8 Feb 2016 09:54:57 +0100 Subject: [PATCH 1/2] Correctly handle paths to exact files when setting cookie MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to set path to folder not a given file. Fixes #11916 Signed-off-by: Michal Čihař --- libraries/Config.php | 14 ++++++++++++++ test/classes/ConfigTest.php | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/libraries/Config.php b/libraries/Config.php index 7e03d1f7ff..548405a7eb 100644 --- a/libraries/Config.php +++ b/libraries/Config.php @@ -1400,6 +1400,20 @@ class Config $cookie_path = $parsed_url['path']; + /* Remove filename */ + if (substr($cookie_path, -4) == '.php') { + $cookie_path = dirname($cookie_path); + } + + /* Remove extra path from javascript calls */ + if (defined('PMA_PATH_TO_BASEDIR')) { + $cookie_path = dirname($cookie_path); + } + + if (substr($cookie_path, -1) != '/') { + $cookie_path = $cookie_path . '/'; + } + return $cookie_path; } diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php index 2b56b04fcf..131e5fa53b 100644 --- a/test/classes/ConfigTest.php +++ b/test/classes/ConfigTest.php @@ -663,6 +663,10 @@ class ConfigTest extends PMATestCase public function cookieUris() { return array( + array( + '/foo/bar/phpmyadmin/index.php', + '/foo/bar/phpmyadmin/', + ), array( '/foo/bar/phpmyadmin/', '/foo/bar/phpmyadmin/', From 5b928b91381f5c14c5aced29f786b3e5b3c3f821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 8 Feb 2016 11:07:41 +0100 Subject: [PATCH 2/2] Adjust Docker documentation to match current code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The port has been changed from 8080 to 80 in https://github.com/phpmyadmin/docker/pull/19 Signed-off-by: Michal Čihař --- doc/setup.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/setup.rst b/doc/setup.rst index 9c79c15ac0..88e30cb08d 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -112,7 +112,7 @@ download it using: docker pull phpmyadmin/phpmyadmin -The phpMyAdmin will be executed on port 8080. It supports several ways of +The phpMyAdmin will be executed on port 80. It supports several ways of configuring link to the database server, which you can configure using environment variables: @@ -154,25 +154,25 @@ To connect phpMyAdmin to given server use: .. code-block:: sh - docker run --name myadmin -d -e PMA_HOST=dbhost -p 8080:8080 phpmyadmin/phpmyadmin + docker run --name myadmin -d -e PMA_HOST=dbhost -p 8080:80 phpmyadmin/phpmyadmin To connect phpMyAdmin to more servers use: .. code-block:: sh - docker run --name myadmin -d -e PMA_HOSTS=dbhost1,dbhost2,dbhost3 -p 8080:8080 phpmyadmin/phpmyadmin + docker run --name myadmin -d -e PMA_HOSTS=dbhost1,dbhost2,dbhost3 -p 8080:80 phpmyadmin/phpmyadmin To use arbitrary server option: .. code-block:: sh - docker run --name myadmin -d --link mysql_db_server:db -p 8080:8080 -e PMA_ARBITRARY=1 phpmyadmin/phpmyadmin + docker run --name myadmin -d --link mysql_db_server:db -p 8080:80 -e PMA_ARBITRARY=1 phpmyadmin/phpmyadmin You can also link the database container using Docker: .. code-block:: sh - docker run --name phpmyadmin -d --link mysql_db_server:db -p 8080:8080 phpmyadmin/phpmyadmin + docker run --name phpmyadmin -d --link mysql_db_server:db -p 8080:80 phpmyadmin/phpmyadmin Using docker-compose --------------------