Merge pull request #17697 from owncloud/fix-undefined-REMOTE_ADDR-stable8.1

Fixing 'Undefined index: REMOTE_ADDR' - fixes #17460

2 files changed, 17 insertions, 5 deletions

diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php
index 7d6a49202c6..d3ebcfc6925 100644
--- a/lib/private/appframework/http/request.php
+++ b/lib/private/appframework/http/request.php
@@ -478,7 +478,8 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 	 */
 	private function isOverwriteCondition($type = '') {
 		$regex = '/' . $this->config->getSystemValue('overwritecondaddr', '')  . '/';
-		return $regex === '//' || preg_match($regex, $this->server['REMOTE_ADDR']) === 1
+		$remoteAddr = isset($this->server['REMOTE_ADDR']) ? $this->server['REMOTE_ADDR'] : '';
+		return $regex === '//' || preg_match($regex, $remoteAddr) === 1
 		|| $type !== 'protocol';
 	}
 
diff --git a/tests/lib/appframework/http/RequestTest.php b/tests/lib/appframework/http/RequestTest.php
index a4bf3519bfc..f011d7f72bd 100644
--- a/tests/lib/appframework/http/RequestTest.php
+++ b/tests/lib/appframework/http/RequestTest.php
@@ -1023,17 +1023,27 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('/test.php', $request->getRequestUri());
 	}
 
-	public function testGetRequestUriWithOverwrite() {
+	public function providesGetRequestUriWithOverwriteData() {
+		return [
+			['/scriptname.php/some/PathInfo', '/owncloud/', ''],
+			['/scriptname.php/some/PathInfo', '/owncloud/', '123'],
+		];
+	}
+
+	/**
+	 * @dataProvider providesGetRequestUriWithOverwriteData
+	 */
+	public function testGetRequestUriWithOverwrite($expectedUri, $overwriteWebRoot, $overwriteCondAddr) {
 		$this->config
 			->expects($this->at(0))
 			->method('getSystemValue')
 			->with('overwritewebroot')
-			->will($this->returnValue('/owncloud/'));
+			->will($this->returnValue($overwriteWebRoot));
 		$this->config
 			->expects($this->at(1))
 			->method('getSystemValue')
 			->with('overwritecondaddr')
-			->will($this->returnValue(''));
+			->will($this->returnValue($overwriteCondAddr));
 
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
@@ -1054,6 +1064,7 @@ class RequestTest extends \Test\TestCase {
 			->method('getScriptName')
 			->will($this->returnValue('/scriptname.php'));
 
-		$this->assertSame('/scriptname.php/some/PathInfo', $request->getRequestUri());
+		$this->assertSame($expectedUri, $request->getRequestUri());
 	}
+
 }