[stable9.1] Fix empty PATH_INFO (#25904)

2 files changed, 26 insertions, 5 deletions

diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php
index eca02b2ac2b..729c7e5377f 100644
--- a/lib/private/AppFramework/Http/Request.php
+++ b/lib/private/AppFramework/Http/Request.php
@@ -650,8 +650,9 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 	 * @return string|false Path info or false when not found
 	 */
 	public function getPathInfo() {
-		if(isset($this->server['PATH_INFO'])) {
-			return $this->server['PATH_INFO'];
+		$pathInfo = isset($this->server['PATH_INFO']) ? $this->server['PATH_INFO'] : '';
+		if($pathInfo !== '') {
+			return $pathInfo;
 		}
 
 		$pathInfo = $this->getRawPathInfo();
diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php
index ddc2403d866..4806a9d5ae5 100644
--- a/tests/lib/AppFramework/Http/RequestTest.php
+++ b/tests/lib/AppFramework/Http/RequestTest.php
@@ -13,6 +13,7 @@ namespace Test\AppFramework\Http;
 use OC\AppFramework\Http\Request;
 use OC\Security\CSRF\CsrfToken;
 use OC\Security\CSRF\CsrfTokenManager;
+use OCP\IRequest;
 use OCP\Security\ISecureRandom;
 use OCP\IConfig;
 
@@ -24,11 +25,11 @@ use OCP\IConfig;
 class RequestTest extends \Test\TestCase {
 	/** @var string */
 	protected $stream = 'fakeinput://data';
-	/** @var ISecureRandom */
+	/** @var ISecureRandom | \PHPUnit_Framework_MockObject_MockObject */
 	protected $secureRandom;
-	/** @var IConfig */
+	/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */
 	protected $config;
-	/** @var CsrfTokenManager */
+	/** @var CsrfTokenManager | \PHPUnit_Framework_MockObject_MockObject */
 	protected $csrfTokenManager;
 
 	protected function setUp() {
@@ -1079,6 +1080,24 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('apps/files/',  $request->getPathInfo());
 	}
 
+	public function testGetPathInfoWithPathInfoBeingEmpty() {
+		$request = new Request(
+			[
+				'server' => [
+					'PATH_INFO' => '',
+					'REQUEST_URI' => '/index.php/apps/files/?dir=/',
+					'SCRIPT_NAME' => 'index.php'
+				]
+			],
+			$this->secureRandom,
+			$this->config,
+			$this->csrfTokenManager,
+			$this->stream
+		);
+
+		$this->assertSame('/apps/files/',  $request->getPathInfo());
+	}
+
 	/**
 	 * @expectedException \Exception
 	 * @expectedExceptionMessage The requested uri(/foo.php) cannot be processed by the script '/var/www/index.php')
@@ -1290,6 +1309,7 @@ class RequestTest extends \Test\TestCase {
 			->with('overwritecondaddr')
 			->will($this->returnValue($overwriteCondAddr));
 
+		/** @var IRequest | \PHPUnit_Framework_MockObject_MockObject $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
 			->setConstructorArgs([