Merge pull request #52 from nextcloud/fix/49/csp-event-v2

Use addServiceListener for registration with the IEventDispatcher
nextcloud · Nov 18, 2021 · d46337a · d46337a
2 parents 712464f + 0120bb7
commit d46337a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -31,6 +31,7 @@
 use OCA\GlobalSiteSelector\UserBackend;
 use OCP\AppFramework\App;
 use OCP\AppFramework\IAppContainer;
+use OCP\AppFramework\QueryException;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Security\CSP\AddContentSecurityPolicyEvent;
 use OCP\Util;
@@ -70,9 +71,12 @@ private function registerMasterHooks(IAppContainer $c) {
 		$master = $c->query(Master::class);
 		Util::connectHook('OC_User', 'pre_login', $master, 'handleLoginRequest');
 
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $c->getServer()->query(IEventDispatcher::class);
-		$eventDispatcher->addListener(AddContentSecurityPolicyEvent::class, AddContentSecurityPolicyListener::class);
+		try {
+			/** @var IEventDispatcher $eventDispatcher */
+			$eventDispatcher = $c->getServer()->query(IEventDispatcher::class);
+			$eventDispatcher->addServiceListener(AddContentSecurityPolicyEvent::class, AddContentSecurityPolicyListener::class);
+		} catch (QueryException $e) {
+		}
 	}
 
 	/**