upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #7991 from nextcloud/show-trusted-domain-error-in-status.php

Browse source 
Send a proper response for status.php on trusted domain error
This commit is contained in:
Roeland Jago Douma 2018-01-24 15:05:49 +01:00 committed by GitHub
commit abb17589b1
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

@ -757,8 +757,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(