Merge pull request #1018 from nextcloud/revert-510-bugfix/noid/disabl…

…e-sabre-plugin

Revert "Temporarily disable the DAV plugin until clients work"

lib/AppInfo/Application.php

@@ -14,6 +14,7 @@
 use OCA\Registration\Events\ValidateFormEvent;
 use OCA\TermsOfService\PublicCapabilities;
 use OCA\TermsOfService\Checker;
+use OCA\TermsOfService\Dav\CheckPlugin;
 use OCA\TermsOfService\Filesystem\StorageWrapper;
 use OCA\TermsOfService\Listener\RegistrationIntegration;
 use OCA\TermsOfService\Listener\UserDeletedListener;
@@ -29,6 +30,7 @@
 use OCP\IUser;
 use OCP\IUserSession;
 use OCP\Notification\IManager;
+use OCP\SabrePluginEvent;
 use OCP\User\Events\UserDeletedEvent;
 use OCP\User\Events\UserFirstTimeLoggedInEvent;
 use OCP\Util;
@@ -58,19 +60,18 @@ public function register(IRegistrationContext $context): void {
 	public function boot(IBootContext $context): void {
 		Util::connectHook('OC_Filesystem', 'preSetup', $this, 'addStorageWrapper');
 
-		// FIXME currently disabled until we made sure all clients (Talk and files on Android and iOS, as well as desktop) handle this gracefully
-//		$eventDispatcher = $context->getServerContainer()->get(IEventDispatcher::class);
-//		$eventDispatcher->addListener('OCA\DAV\Connector\Sabre::addPlugin', function (SabrePluginEvent $event) use ($context) {
-//			$eventServer = $event->getServer();
-//
-//			if ($eventServer !== null) {
-//				// We have to register the CheckPlugin here and not info.xml,
-//				// because info.xml plugins are loaded, after the
-//				// beforeMethod:* hook has already been emitted.
-//				$plugin = $context->getAppContainer()->get(CheckPlugin::class);
-//				$eventServer->addPlugin($plugin);
-//			}
-//		});
+		$eventDispatcher = $context->getServerContainer()->get(IEventDispatcher::class);
+		$eventDispatcher->addListener('OCA\DAV\Connector\Sabre::addPlugin', function (SabrePluginEvent $event) use ($context) {
+			$eventServer = $event->getServer();
+
+			if ($eventServer !== null) {
+				// We have to register the CheckPlugin here and not info.xml,
+				// because info.xml plugins are loaded, after the
+				// beforeMethod:* hook has already been emitted.
+				$plugin = $context->getAppContainer()->get(CheckPlugin::class);
+				$eventServer->addPlugin($plugin);
+			}
+		});
 
 		$context->injectFn([$this, 'registerNotifier']);
 		$context->injectFn([$this, 'createNotificationOnFirstLogin']);

lib/Checker.php

@@ -12,6 +12,7 @@
 use OCP\IConfig;
 use OCP\IRequest;
 use OCP\ISession;
+use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IUserSession;
 use OCP\IL10N;
@@ -38,6 +39,8 @@ class Checker {
 	private $logger;
 	/** @var array */
 	private $termsCache = [];
+	/** @var IURLGenerator */
+	private $url;
 
 	public function __construct(
 		IRequest $request,
@@ -48,7 +51,8 @@ public function __construct(
 		CountryDetector $countryDetector,
 		IConfig $config,
 		IL10N $l10n,
-		LoggerInterface $logger
+		LoggerInterface $logger,
+		IURLGenerator $url
 	) {
 		$this->request = $request;
 		$this->userSession = $userSession;
@@ -59,10 +63,11 @@ public function __construct(
 		$this->config = $config;
 		$this->l10n = $l10n;
 		$this->logger = $logger;
+		$this->url = $url;
 	}
 
 	public function getForbiddenMessage(): string {
-		return $this->l10n->t('Terms of service are not signed');
+		return $this->url->getBaseUrl();
 	}
 
 	/**

lib/Dav/CheckPlugin.php

@@ -11,12 +11,13 @@
 
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
-use Sabre\DAV\Exception\Forbidden;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
 
 use OCA\TermsOfService\AppInfo\Application;
 use OCA\TermsOfService\Checker;
+use OCA\TermsOfService\TermsNotSignedException;
+
 
 class CheckPlugin extends ServerPlugin {
 	/** @var Server */
@@ -51,9 +52,9 @@ public function initialize(Server $server) {
 	 */
 	public function checkToS(RequestInterface $request, ResponseInterface $response) {
 		// we instantiate the checker here to make sure sabre auth backend was triggered
-		$checker = \OC::$server->get(Checker::class);
+		$checker = \OCP\Server::get(Checker::class);
 		if (!$checker->currentUserHasSigned()) {
-			throw new Forbidden($checker->getForbiddenMessage());
+			throw new TermsNotSignedException($checker->getForbiddenMessage());
 		}
 		return true;
 	}

lib/TermsNotSignedException.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\TermsOfService;
+
+use Sabre\DAV\Exception\Forbidden;
+
+class TermsNotSignedException extends Forbidden {
+}

vendor-bin/psalm/composer.json

@@ -7,6 +7,7 @@
 	},
 	"require-dev": {
 		"nextcloud/ocp": "dev-stable28",
+		"sabre/dav": "^4.1",
 		"vimeo/psalm": "^5.6"
 	}
 }