diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-02-03 12:16:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-03 12:16:56 +0100 |
| commit | 933ad5e4d2c18a4f083ce46752b740f4c9a9511e (patch) | |
| tree | 320fc8919decf7a8911a15ee95af97d143d65aad | |
| parent | e0f96bc1ac0641a79f2da237addca1cf35041f9e (diff) | |
| parent | d7b8f586d486860ccde9efc38ed81b7bec2ec4b4 (diff) | |
| download | nextcloud-server-933ad5e4d2c18a4f083ce46752b740f4c9a9511e.tar.gz nextcloud-server-933ad5e4d2c18a4f083ce46752b740f4c9a9511e.zip | |
Merge pull request #43181 from nextcloud/backport/42930/stable28
[stable28] Fix: config param 'overwritecondaddr' not working
| -rw-r--r-- | lib/private/AppFramework/Http/Request.php | 8 | ||||
| -rw-r--r-- | tests/lib/AppFramework/Http/RequestTest.php | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index 0f80764053f..e913c83fa8d 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/lib/private/AppFramework/Http/Request.php @@ -629,14 +629,12 @@ class Request implements \ArrayAccess, \Countable, IRequest { /** * Check overwrite condition - * @param string $type * @return bool */ - private function isOverwriteCondition(string $type = ''): bool { + private function isOverwriteCondition(): bool { $regex = '/' . $this->config->getSystemValueString('overwritecondaddr', '') . '/'; $remoteAddr = isset($this->server['REMOTE_ADDR']) ? $this->server['REMOTE_ADDR'] : ''; - return $regex === '//' || preg_match($regex, $remoteAddr) === 1 - || $type !== 'protocol'; + return $regex === '//' || preg_match($regex, $remoteAddr) === 1; } /** @@ -646,7 +644,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { */ public function getServerProtocol(): string { if ($this->config->getSystemValueString('overwriteprotocol') !== '' - && $this->isOverwriteCondition('protocol')) { + && $this->isOverwriteCondition()) { return $this->config->getSystemValueString('overwriteprotocol'); } diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php index 4f53b3d8d5c..25b3a88f300 100644 --- a/tests/lib/AppFramework/Http/RequestTest.php +++ b/tests/lib/AppFramework/Http/RequestTest.php @@ -1822,14 +1822,14 @@ class RequestTest extends \Test\TestCase { public function providesGetRequestUriWithOverwriteData() { return [ ['/scriptname.php/some/PathInfo', '/owncloud/', ''], - ['/scriptname.php/some/PathInfo', '/owncloud/', '123'], + ['/scriptname.php/some/PathInfo', '/owncloud/', '123', '123.123.123.123'], ]; } /** * @dataProvider providesGetRequestUriWithOverwriteData */ - public function testGetRequestUriWithOverwrite($expectedUri, $overwriteWebRoot, $overwriteCondAddr) { + public function testGetRequestUriWithOverwrite($expectedUri, $overwriteWebRoot, $overwriteCondAddr, $remoteAddr = '') { $this->config ->expects($this->exactly(2)) ->method('getSystemValueString') @@ -1838,13 +1838,14 @@ class RequestTest extends \Test\TestCase { ['overwritecondaddr', '', $overwriteCondAddr], ]); - $request = $this->getMockBuilder('\OC\AppFramework\Http\Request') + $request = $this->getMockBuilder(Request::class) ->setMethods(['getScriptName']) ->setConstructorArgs([ [ 'server' => [ 'REQUEST_URI' => '/test.php/some/PathInfo', 'SCRIPT_NAME' => '/test.php', + 'REMOTE_ADDR' => $remoteAddr ] ], $this->requestId, |