diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-24 16:22:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-24 16:22:06 +0100 |
| commit | 76636dea9ce544c0c73f6d827f11382777eeb4ee (patch) | |
| tree | ba1ddea89f2e2497a1cd3e1161a8fcf74642ab89 | |
| parent | 3b35c226ce7ba755ec933b57e008a7748a9a0195 (diff) | |
| parent | 986623e2acdb199fb5f929bb2242842726b50bf1 (diff) | |
| download | nextcloud-server-76636dea9ce544c0c73f6d827f11382777eeb4ee.tar.gz nextcloud-server-76636dea9ce544c0c73f6d827f11382777eeb4ee.zip | |
Merge pull request #8029 from nextcloud/13-7991
[stable13] Send a proper response for status.php on trusted domain error
| -rw-r--r-- | lib/base.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index d0672785cef..080b268795c 100644 --- a/lib/base.php +++ b/lib/base.php @@ -779,8 +779,16 @@ class OC { $isScssRequest = true; } + if(substr($request->getRequestUri(), -11) === '/status.php') { + OC_Response::setStatus(\OC_Response::STATUS_BAD_REQUEST); + header('Status: 400 Bad Request'); + header('Content-Type: application/json'); + echo '{"error": "Trusted domain error.", "code": 15}'; + exit(); + } + if (!$isScssRequest) { - header('HTTP/1.1 400 Bad Request'); + OC_Response::setStatus(\OC_Response::STATUS_BAD_REQUEST); header('Status: 400 Bad Request'); \OC::$server->getLogger()->warning( |