mirror of
https://github.com/nextcloud/server.git
synced 2026-02-03 20:41:22 -05:00
fix(dav): drop unwanted RemoteException class
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
This commit is contained in:
parent
68864ab394
commit
0e88e066e0
2 changed files with 13 additions and 7 deletions
18
public.php
18
public.php
|
|
@ -33,30 +33,33 @@ try {
|
|||
// this policy with a softer one if debug mode is enabled.
|
||||
header("Content-Security-Policy: default-src 'none';");
|
||||
|
||||
// Check if Nextcloud is in maintenance mode
|
||||
if (\OCP\Util::needUpgrade()) {
|
||||
// since the behavior of apps or remotes are unpredictable during
|
||||
// an upgrade, return a 503 directly
|
||||
throw new RemoteException('Service unavailable', 503);
|
||||
throw new \Exception('Service unavailable', 503);
|
||||
}
|
||||
|
||||
$request = \OC::$server->getRequest();
|
||||
$pathInfo = $request->getPathInfo();
|
||||
if ($pathInfo === false || $pathInfo === '') {
|
||||
throw new RemoteException('Path not found', 404);
|
||||
throw new \Exception('Path not found', 404);
|
||||
}
|
||||
|
||||
// Extract the service from the path
|
||||
if (!$pos = strpos($pathInfo, '/', 1)) {
|
||||
$pos = strlen($pathInfo);
|
||||
}
|
||||
$service = substr($pathInfo, 1, $pos - 1);
|
||||
|
||||
// Resolve the service to a file
|
||||
$file = resolveService($service);
|
||||
|
||||
if (!$file) {
|
||||
throw new RemoteException('Path not found', 404);
|
||||
throw new \Exception('Path not found', 404);
|
||||
}
|
||||
|
||||
// Extract the app from the service file
|
||||
$file = ltrim($file, '/');
|
||||
|
||||
$parts = explode('/', $file, 2);
|
||||
$app = $parts[0];
|
||||
|
||||
|
|
@ -66,9 +69,12 @@ try {
|
|||
OC_App::loadApps(['extended_authentication']);
|
||||
OC_App::loadApps(['filesystem', 'logging']);
|
||||
|
||||
// Check if the app is enabled
|
||||
if (!\OC::$server->getAppManager()->isInstalled($app)) {
|
||||
throw new RemoteException('App not installed: ' . $app);
|
||||
throw new \Exception('App not installed: ' . $app);
|
||||
}
|
||||
|
||||
// Load the app
|
||||
OC_App::loadApp($app);
|
||||
OC_User::setIncognitoMode(true);
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ use Sabre\DAV\Server;
|
|||
* Dummy exception class to be use locally to identify certain conditions
|
||||
* Will not be logged to avoid DoS
|
||||
*/
|
||||
class RemoteException extends Exception {
|
||||
class RemoteException extends \Exception {
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in a new issue