diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-01-09 16:29:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-09 16:29:09 +0100 |
| commit | 05d27ec1484593f4a727ae5702f782da836b1e11 (patch) | |
| tree | c9ede48ead869ae10ef7ab077a349737e1e94038 /lib | |
| parent | fee18d6c789eff0805667a59c501afc7cd9605f5 (diff) | |
| parent | 69f343055271ca9d85386104069576d34ae42200 (diff) | |
| download | nextcloud-server-05d27ec1484593f4a727ae5702f782da836b1e11.tar.gz nextcloud-server-05d27ec1484593f4a727ae5702f782da836b1e11.zip | |
Merge pull request #2985 from nextcloud/fix-trusted-domain-error
Allow access to CSS resources
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/lib/base.php b/lib/base.php index 4a9158eff64..0fc34b3d9b9 100644 --- a/lib/base.php +++ b/lib/base.php @@ -791,23 +791,31 @@ class OC { && !\OC::$server->getTrustedDomainHelper()->isTrustedDomain($host) && self::$server->getConfig()->getSystemValue('installed', false) ) { - header('HTTP/1.1 400 Bad Request'); - header('Status: 400 Bad Request'); + // Allow access to CSS resources + $isScssRequest = false; + if(strpos($request->getPathInfo(), '/css/') === 0) { + $isScssRequest = true; + } + + if (!$isScssRequest) { + header('HTTP/1.1 400 Bad Request'); + header('Status: 400 Bad Request'); - \OC::$server->getLogger()->warning( + \OC::$server->getLogger()->warning( 'Trusted domain error. "{remoteAddress}" tried to access using "{host}" as host.', [ 'app' => 'core', 'remoteAddress' => $request->getRemoteAddress(), 'host' => $host, ] - ); + ); - $tmpl = new OCP\Template('core', 'untrustedDomain', 'guest'); - $tmpl->assign('domain', $host); - $tmpl->printPage(); + $tmpl = new OCP\Template('core', 'untrustedDomain', 'guest'); + $tmpl->assign('domain', $host); + $tmpl->printPage(); - exit(); + exit(); + } } \OC::$server->getEventLogger()->end('boot'); } |