mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8029 from nextcloud/13-7991 

[stable13] Send a proper response for status.php on trusted domain error
This commit is contained in:
Morris Jobke 2018-01-24 16:22:06 +01:00 committed by GitHub
parent 3b35c226ce 986623e2ac
commit 76636dea9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/base.php
View File

@ -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(