886bda5f81
This changeset removes the static class `OC_Request` and moves the functions either into `IRequest` which is accessible via `\OC::$server::->getRequest()` or into a separated `TrustedDomainHelper` class for some helper methods which should not be publicly exposed. This changes only internal methods and nothing on the public API. Some public functions in `util.php` have been deprecated though in favour of the new non-static functions. Unfortunately some part of this code uses things like `__DIR__` and thus is not completely unit-testable. Where tests where possible they ahve been added though. Fixes https://github.com/owncloud/core/issues/13976 which was requested in https://github.com/owncloud/core/pull/13973#issuecomment-73492969
65 lines
1.8 KiB
PHP
65 lines
1.8 KiB
PHP
<?php
|
|
|
|
try {
|
|
require_once 'lib/base.php';
|
|
|
|
if (\OCP\Util::needUpgrade()) {
|
|
// since the behavior of apps or remotes are unpredictable during
|
|
// an upgrade, return a 503 directly
|
|
OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
|
|
OC_Template::printErrorPage('Service unavailable');
|
|
exit;
|
|
}
|
|
|
|
$request = \OC::$server->getRequest();
|
|
$pathInfo = $request->getPathInfo();
|
|
if ($pathInfo === false || $pathInfo === '') {
|
|
OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
|
|
exit;
|
|
}
|
|
if (!$pos = strpos($pathInfo, '/', 1)) {
|
|
$pos = strlen($pathInfo);
|
|
}
|
|
$service=substr($pathInfo, 1, $pos-1);
|
|
|
|
$file = \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service);
|
|
|
|
if(is_null($file)) {
|
|
OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
|
|
exit;
|
|
}
|
|
|
|
$file=ltrim($file, '/');
|
|
|
|
$parts=explode('/', $file, 2);
|
|
$app=$parts[0];
|
|
|
|
// Load all required applications
|
|
\OC::$REQUESTEDAPP = $app;
|
|
OC_App::loadApps(array('authentication'));
|
|
OC_App::loadApps(array('filesystem', 'logging'));
|
|
|
|
switch ($app) {
|
|
case 'core':
|
|
$file = OC::$SERVERROOT .'/'. $file;
|
|
break;
|
|
default:
|
|
if (!\OC::$server->getAppManager()->isInstalled($app)) {
|
|
throw new Exception('App not installed: ' . $app);
|
|
}
|
|
OC_App::loadApp($app);
|
|
$file = OC_App::getAppPath($app) .'/'. $parts[1];
|
|
break;
|
|
}
|
|
$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
|
|
require_once $file;
|
|
|
|
} catch (\OC\ServiceUnavailableException $ex) {
|
|
OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
|
|
\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
|
|
OC_Template::printExceptionErrorPage($ex);
|
|
} catch (Exception $ex) {
|
|
OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
|
|
\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
|
|
OC_Template::printExceptionErrorPage($ex);
|
|
}
|