ac7fb1b23e
The getfile routing code was absolutely legacy and not needed anymore. Additionally \OC::$REQUESTEDAPP was never set to the actually accessed application. This commit removes the legacy routing code and ensures that $REQUESTEDAPP is always set so that other applications (e.g. the firewall or a two-factor authentication) can intercept the currently accessed app. Testplan: [x] Installation works [x] Login with DB works [x] Logout works [x] Login with alternate backend works (tested with user_webdavauth) [x] Other apps are accessible [x] Redirect on login works (e.g. index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fapps%3Finstalled) [x] Personal settings are accessible [x] Admin settings are accessible [x] Sharing files works [x] DAV works [x] OC::$REQUESTEDAPP contains the requested application and can be intercepted by other applications
48 lines
1.2 KiB
PHP
48 lines
1.2 KiB
PHP
<?php
|
|
|
|
try {
|
|
require_once 'lib/base.php';
|
|
$path_info = OC_Request::getPathInfo();
|
|
if ($path_info === false || $path_info === '') {
|
|
OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
|
|
exit;
|
|
}
|
|
if (!$pos = strpos($path_info, '/', 1)) {
|
|
$pos = strlen($path_info);
|
|
}
|
|
$service=substr($path_info, 1, $pos-1);
|
|
|
|
$file = \OC::$server->getAppConfig()->getValue('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', 'filesystem', 'logging'));
|
|
|
|
switch ($app) {
|
|
case 'core':
|
|
$file = OC::$SERVERROOT .'/'. $file;
|
|
break;
|
|
default:
|
|
OC_Util::checkAppEnabled($app);
|
|
OC_App::loadApp($app);
|
|
$file = OC_App::getAppPath($app) .'/'. $parts[1];
|
|
break;
|
|
}
|
|
$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
|
|
require_once $file;
|
|
|
|
} 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);
|
|
}
|