aboutsummaryrefslogtreecommitdiffstats
path: root/remote.php
diff options
context:
space:
mode:
Diffstat (limited to 'remote.php')
-rw-r--r--remote.php143
1 files changed, 64 insertions, 79 deletions
diff --git a/remote.php b/remote.php
index 69e3a53eeec..2cfd9d818c8 100644
--- a/remote.php
+++ b/remote.php
@@ -1,39 +1,21 @@
<?php
+
+use OC\ServiceUnavailableException;
+use OCP\IConfig;
+use OCP\Util;
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Brice Maron <brice@bmaron.net>
- * @author Christopher Schäpers <kondou@ts.unde.re>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Georg Ehrke <oc.list@georgehrke.com>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <vincent@nextcloud.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
require_once __DIR__ . '/lib/versioncheck.php';
use OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin;
+use OCP\App\IAppManager;
+use OCP\IRequest;
+use OCP\Template\ITemplateManager;
+use Psr\Log\LoggerInterface;
use Sabre\DAV\Exception\ServiceUnavailable;
use Sabre\DAV\Server;
@@ -42,54 +24,55 @@ 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 {
}
-/**
- * @param Exception|Error $e
- */
-function handleException($e) {
- $request = \OC::$server->getRequest();
- // in case the request content type is text/xml - we assume it's a WebDAV request
- $isXmlContentType = strpos($request->getHeader('Content-Type'), 'text/xml');
- if ($isXmlContentType === 0) {
- // fire up a simple server to properly process the exception
- $server = new Server();
- if (!($e instanceof RemoteException)) {
- // we shall not log on RemoteException
- $server->addPlugin(new ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
- }
- $server->on('beforeMethod:*', function () use ($e) {
- if ($e instanceof RemoteException) {
- switch ($e->getCode()) {
- case 503:
- throw new ServiceUnavailable($e->getMessage());
- case 404:
- throw new \Sabre\DAV\Exception\NotFound($e->getMessage());
- }
+function handleException(Exception|Error $e): void {
+ try {
+ $request = \OCP\Server::get(IRequest::class);
+ // in case the request content type is text/xml - we assume it's a WebDAV request
+ $isXmlContentType = strpos($request->getHeader('Content-Type'), 'text/xml');
+ if ($isXmlContentType === 0) {
+ // fire up a simple server to properly process the exception
+ $server = new Server();
+ if (!($e instanceof RemoteException)) {
+ // we shall not log on RemoteException
+ $server->addPlugin(new ExceptionLoggerPlugin('webdav', \OCP\Server::get(LoggerInterface::class)));
}
- $class = get_class($e);
- $msg = $e->getMessage();
- throw new ServiceUnavailable("$class: $msg");
- });
- $server->exec();
- } else {
- $statusCode = 500;
- if ($e instanceof \OC\ServiceUnavailableException) {
- $statusCode = 503;
- }
- if ($e instanceof RemoteException) {
- // we shall not log on RemoteException
- OC_Template::printErrorPage($e->getMessage(), '', $e->getCode());
+ $server->on('beforeMethod:*', function () use ($e): void {
+ if ($e instanceof RemoteException) {
+ switch ($e->getCode()) {
+ case 503:
+ throw new ServiceUnavailable($e->getMessage());
+ case 404:
+ throw new \Sabre\DAV\Exception\NotFound($e->getMessage());
+ }
+ }
+ $class = get_class($e);
+ $msg = $e->getMessage();
+ throw new ServiceUnavailable("$class: $msg");
+ });
+ $server->exec();
} else {
- \OC::$server->getLogger()->logException($e, ['app' => 'remote']);
- OC_Template::printExceptionErrorPage($e, $statusCode);
+ $statusCode = 500;
+ if ($e instanceof ServiceUnavailableException) {
+ $statusCode = 503;
+ }
+ if ($e instanceof RemoteException) {
+ // we shall not log on RemoteException
+ \OCP\Server::get(ITemplateManager::class)->printErrorPage($e->getMessage(), '', $e->getCode());
+ } else {
+ \OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), ['app' => 'remote','exception' => $e]);
+ \OCP\Server::get(ITemplateManager::class)->printExceptionErrorPage($e, $statusCode);
+ }
}
+ } catch (\Exception $e) {
+ \OCP\Server::get(ITemplateManager::class)->printExceptionErrorPage($e, 500);
}
}
/**
- * @param $service
+ * @param string $service
* @return string
*/
function resolveService($service) {
@@ -107,7 +90,7 @@ function resolveService($service) {
return $services[$service];
}
- return \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service);
+ return \OCP\Server::get(IConfig::class)->getAppValue('core', 'remote_' . $service);
}
try {
@@ -118,13 +101,13 @@ try {
// this policy with a softer one if debug mode is enabled.
header("Content-Security-Policy: default-src 'none';");
- if (\OCP\Util::needUpgrade()) {
+ if (Util::needUpgrade()) {
// since the behavior of apps or remotes are unpredictable during
// an upgrade, return a 503 directly
throw new RemoteException('Service unavailable', 503);
}
- $request = \OC::$server->getRequest();
+ $request = \OCP\Server::get(IRequest::class);
$pathInfo = $request->getPathInfo();
if ($pathInfo === false || $pathInfo === '') {
throw new RemoteException('Path not found', 404);
@@ -147,22 +130,24 @@ try {
// Load all required applications
\OC::$REQUESTEDAPP = $app;
- OC_App::loadApps(['authentication']);
- OC_App::loadApps(['filesystem', 'logging']);
+ $appManager = \OCP\Server::get(IAppManager::class);
+ $appManager->loadApps(['authentication']);
+ $appManager->loadApps(['extended_authentication']);
+ $appManager->loadApps(['filesystem', 'logging']);
switch ($app) {
case 'core':
- $file = OC::$SERVERROOT .'/'. $file;
+ $file = OC::$SERVERROOT . '/' . $file;
break;
default:
- if (!\OC::$server->getAppManager()->isInstalled($app)) {
+ if (!$appManager->isEnabledForUser($app)) {
throw new RemoteException('App not installed: ' . $app);
}
- OC_App::loadApp($app);
- $file = OC_App::getAppPath($app) .'/'. $parts[1];
+ $appManager->loadApp($app);
+ $file = $appManager->getAppPath($app) . '/' . ($parts[1] ?? '');
break;
}
- $baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
+ $baseuri = OC::$WEBROOT . '/remote.php/' . $service . '/';
require_once $file;
} catch (Exception $ex) {
handleException($ex);
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-14 18:25:00 +0000