Inspection of "add a new dav event to allow apps to register thei..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#6309)

by Björn

created 2017-08-30 12:13 UTC

Status

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 
 // no php execution timeout for webdav
 if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 ignore_user_abort(true);
 
@@ -33,38 +33,38 @@  discard block
 block discarded – undo
 \OC_Util::obEnd();
 
 $serverFactory = new \OCA\DAV\Connector\Sabre\ServerFactory(
-	\OC::$server->getConfig(),
-	\OC::$server->getLogger(),
-	\OC::$server->getDatabaseConnection(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getMountManager(),
-	\OC::$server->getTagManager(),
-	\OC::$server->getRequest(),
-	\OC::$server->getPreviewManager()
+    \OC::$server->getConfig(),
+    \OC::$server->getLogger(),
+    \OC::$server->getDatabaseConnection(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getMountManager(),
+    \OC::$server->getTagManager(),
+    \OC::$server->getRequest(),
+    \OC::$server->getPreviewManager()
 );
 
 // Backends
 $authBackend = new \OCA\DAV\Connector\Sabre\Auth(
-	\OC::$server->getSession(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getRequest(),
-	\OC::$server->getTwoFactorAuthManager(),
-	\OC::$server->getBruteForceThrottler(),
-	'principals/'
+    \OC::$server->getSession(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getRequest(),
+    \OC::$server->getTwoFactorAuthManager(),
+    \OC::$server->getBruteForceThrottler(),
+    'principals/'
 );
 $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
 $bearerAuthPlugin = new \OCA\DAV\Connector\Sabre\BearerAuth(
-	\OC::$server->getUserSession(),
-	\OC::$server->getSession(),
-	\OC::$server->getRequest()
+    \OC::$server->getUserSession(),
+    \OC::$server->getSession(),
+    \OC::$server->getRequest()
 );
 $authPlugin->addBackend($bearerAuthPlugin);
 
 $requestUri = \OC::$server->getRequest()->getRequestUri();
 
 $server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function() {
-	// use the view for the logged in user
-	return \OC\Files\Filesystem::getView();
+    // use the view for the logged in user
+    return \OC\Files\Filesystem::getView();
 });
 
 $dispatcher = \OC::$server->getEventDispatcher();

Please login to merge, or discard this patch.

apps/dav/lib/Server.php 1 patch

Indentation +173 added lines, -173 removed lines patch added patch discarded remove patch

@@ -58,201 +58,201 @@
 block discarded – undo
 
 class Server {
 
-	/** @var IRequest */
-	private $request;
+    /** @var IRequest */
+    private $request;
 
-	/** @var  string */
-	private $baseUri;
+    /** @var  string */
+    private $baseUri;
 
-	/** @var Connector\Sabre\Server  */
-	private $server;
+    /** @var Connector\Sabre\Server  */
+    private $server;
 
-	public function __construct(IRequest $request, $baseUri) {
-		$this->request = $request;
-		$this->baseUri = $baseUri;
-		$logger = \OC::$server->getLogger();
-		$mailer = \OC::$server->getMailer();
-		$dispatcher = \OC::$server->getEventDispatcher();
+    public function __construct(IRequest $request, $baseUri) {
+        $this->request = $request;
+        $this->baseUri = $baseUri;
+        $logger = \OC::$server->getLogger();
+        $mailer = \OC::$server->getMailer();
+        $dispatcher = \OC::$server->getEventDispatcher();
 
-		$root = new RootCollection();
-		$this->server = new \OCA\DAV\Connector\Sabre\Server($root);
+        $root = new RootCollection();
+        $this->server = new \OCA\DAV\Connector\Sabre\Server($root);
 
-		// Add maintenance plugin
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
+        // Add maintenance plugin
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
 
-		// Backends
-		$authBackend = new Auth(
-			\OC::$server->getSession(),
-			\OC::$server->getUserSession(),
-			\OC::$server->getRequest(),
-			\OC::$server->getTwoFactorAuthManager(),
-			\OC::$server->getBruteForceThrottler()
-		);
+        // Backends
+        $authBackend = new Auth(
+            \OC::$server->getSession(),
+            \OC::$server->getUserSession(),
+            \OC::$server->getRequest(),
+            \OC::$server->getTwoFactorAuthManager(),
+            \OC::$server->getBruteForceThrottler()
+        );
 
-		// Set URL explicitly due to reverse-proxy situations
-		$this->server->httpRequest->setUrl($this->request->getRequestUri());
-		$this->server->setBaseUri($this->baseUri);
+        // Set URL explicitly due to reverse-proxy situations
+        $this->server->httpRequest->setUrl($this->request->getRequestUri());
+        $this->server->setBaseUri($this->baseUri);
 
-		$this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
-		$authPlugin = new Plugin();
-		$authPlugin->addBackend(new PublicAuth());
-		$this->server->addPlugin($authPlugin);
+        $this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
+        $authPlugin = new Plugin();
+        $authPlugin->addBackend(new PublicAuth());
+        $this->server->addPlugin($authPlugin);
 
-		// allow setup of additional auth backends
-		$event = new SabrePluginEvent($this->server);
-		$dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
+        // allow setup of additional auth backends
+        $event = new SabrePluginEvent($this->server);
+        $dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
 
-		$bearerAuthBackend = new BearerAuth(
-			\OC::$server->getUserSession(),
-			\OC::$server->getSession(),
-			\OC::$server->getRequest()
-		);
-		$authPlugin->addBackend($bearerAuthBackend);
-		// because we are throwing exceptions this plugin has to be the last one
-		$authPlugin->addBackend($authBackend);
+        $bearerAuthBackend = new BearerAuth(
+            \OC::$server->getUserSession(),
+            \OC::$server->getSession(),
+            \OC::$server->getRequest()
+        );
+        $authPlugin->addBackend($bearerAuthBackend);
+        // because we are throwing exceptions this plugin has to be the last one
+        $authPlugin->addBackend($authBackend);
 
-		// debugging
-		if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
-			$this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
-		} else {
-			$this->server->addPlugin(new DummyGetResponsePlugin());
-		}
+        // debugging
+        if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
+            $this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
+        } else {
+            $this->server->addPlugin(new DummyGetResponsePlugin());
+        }
 
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
-		$this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
+        $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
 
-		// acl
-		$acl = new DavAclPlugin();
-		$acl->principalCollectionSet = [
-			'principals/users', 'principals/groups'
-		];
-		$acl->defaultUsernamePath = 'principals/users';
-		$this->server->addPlugin($acl);
+        // acl
+        $acl = new DavAclPlugin();
+        $acl->principalCollectionSet = [
+            'principals/users', 'principals/groups'
+        ];
+        $acl->defaultUsernamePath = 'principals/users';
+        $this->server->addPlugin($acl);
 
-		// calendar plugins
-		$this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
-		$this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
-		$this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
-		$this->server->addPlugin(new IMipPlugin($mailer, $logger));
-		$this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
-		$this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
-		$this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
-		$this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
-			\OC::$server->getConfig(),
-			\OC::$server->getURLGenerator()
-		));
+        // calendar plugins
+        $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
+        $this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
+        $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
+        $this->server->addPlugin(new IMipPlugin($mailer, $logger));
+        $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
+        $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
+        $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
+        $this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
+            \OC::$server->getConfig(),
+            \OC::$server->getURLGenerator()
+        ));
 
-		// addressbook plugins
-		$this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
-		$this->server->addPlugin(new VCFExportPlugin());
-		$this->server->addPlugin(new ImageExportPlugin(new PhotoCache(\OC::$server->getAppDataDir('dav-photocache'))));
+        // addressbook plugins
+        $this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
+        $this->server->addPlugin(new VCFExportPlugin());
+        $this->server->addPlugin(new ImageExportPlugin(new PhotoCache(\OC::$server->getAppDataDir('dav-photocache'))));
 
-		// system tags plugins
-		$this->server->addPlugin(new SystemTagPlugin(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getGroupManager(),
-			\OC::$server->getUserSession()
-		));
+        // system tags plugins
+        $this->server->addPlugin(new SystemTagPlugin(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getGroupManager(),
+            \OC::$server->getUserSession()
+        ));
 
-		// comments plugin
-		$this->server->addPlugin(new CommentsPlugin(
-			\OC::$server->getCommentsManager(),
-			\OC::$server->getUserSession()
-		));
+        // comments plugin
+        $this->server->addPlugin(new CommentsPlugin(
+            \OC::$server->getCommentsManager(),
+            \OC::$server->getUserSession()
+        ));
 
-		$this->server->addPlugin(new CopyEtagHeaderPlugin());
+        $this->server->addPlugin(new CopyEtagHeaderPlugin());
 
-		// allow setup of additional plugins
-		$dispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
+        // allow setup of additional plugins
+        $dispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
 
-		// Some WebDAV clients do require Class 2 WebDAV support (locking), since
-		// we do not provide locking we emulate it using a fake locking plugin.
-		if($request->isUserAgent([
-			'/WebDAVFS/',
-			'/Microsoft Office OneNote 2013/',
-			'/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
-		])) {
-			$this->server->addPlugin(new FakeLockerPlugin());
-		}
+        // Some WebDAV clients do require Class 2 WebDAV support (locking), since
+        // we do not provide locking we emulate it using a fake locking plugin.
+        if($request->isUserAgent([
+            '/WebDAVFS/',
+            '/Microsoft Office OneNote 2013/',
+            '/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
+        ])) {
+            $this->server->addPlugin(new FakeLockerPlugin());
+        }
 
-		if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
-			$this->server->addPlugin(new BrowserErrorPagePlugin());
-		}
+        if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
+            $this->server->addPlugin(new BrowserErrorPagePlugin());
+        }
 
-		// wait with registering these until auth is handled and the filesystem is setup
-		$this->server->on('beforeMethod', function () {
-			// custom properties plugin must be the last one
-			$userSession = \OC::$server->getUserSession();
-			$user = $userSession->getUser();
-			if ($user !== null) {
-				$view = \OC\Files\Filesystem::getView();
-				$this->server->addPlugin(
-					new FilesPlugin(
-						$this->server->tree,
-						\OC::$server->getConfig(),
-						$this->request,
-						\OC::$server->getPreviewManager(),
-						false,
-						!\OC::$server->getConfig()->getSystemValue('debug', false)
-					)
-				);
+        // wait with registering these until auth is handled and the filesystem is setup
+        $this->server->on('beforeMethod', function () {
+            // custom properties plugin must be the last one
+            $userSession = \OC::$server->getUserSession();
+            $user = $userSession->getUser();
+            if ($user !== null) {
+                $view = \OC\Files\Filesystem::getView();
+                $this->server->addPlugin(
+                    new FilesPlugin(
+                        $this->server->tree,
+                        \OC::$server->getConfig(),
+                        $this->request,
+                        \OC::$server->getPreviewManager(),
+                        false,
+                        !\OC::$server->getConfig()->getSystemValue('debug', false)
+                    )
+                );
 
-				$this->server->addPlugin(
-					new \Sabre\DAV\PropertyStorage\Plugin(
-						new CustomPropertiesBackend(
-							$this->server->tree,
-							\OC::$server->getDatabaseConnection(),
-							\OC::$server->getUserSession()->getUser()
-						)
-					)
-				);
-				if ($view !== null) {
-					$this->server->addPlugin(
-						new QuotaPlugin($view));
-				}
-				$this->server->addPlugin(
-					new TagsPlugin(
-						$this->server->tree, \OC::$server->getTagManager()
-					)
-				);
-				// TODO: switch to LazyUserFolder
-				$userFolder = \OC::$server->getUserFolder();
-				$this->server->addPlugin(new SharesPlugin(
-					$this->server->tree,
-					$userSession,
-					$userFolder,
-					\OC::$server->getShareManager()
-				));
-				$this->server->addPlugin(new CommentPropertiesPlugin(
-					\OC::$server->getCommentsManager(),
-					$userSession
-				));
-				$this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
-				if ($view !== null) {
-					$this->server->addPlugin(new FilesReportPlugin(
-						$this->server->tree,
-						$view,
-						\OC::$server->getSystemTagManager(),
-						\OC::$server->getSystemTagObjectMapper(),
-						\OC::$server->getTagManager(),
-						$userSession,
-						\OC::$server->getGroupManager(),
-						$userFolder
-					));
-					$this->server->addPlugin(new SearchPlugin(new \OCA\DAV\Files\FileSearchBackend(
-						$this->server->tree,
-						$user,
-						\OC::$server->getRootFolder(),
-						\OC::$server->getShareManager(),
-						$view
-					)));
-				}
-			}
-		});
-	}
+                $this->server->addPlugin(
+                    new \Sabre\DAV\PropertyStorage\Plugin(
+                        new CustomPropertiesBackend(
+                            $this->server->tree,
+                            \OC::$server->getDatabaseConnection(),
+                            \OC::$server->getUserSession()->getUser()
+                        )
+                    )
+                );
+                if ($view !== null) {
+                    $this->server->addPlugin(
+                        new QuotaPlugin($view));
+                }
+                $this->server->addPlugin(
+                    new TagsPlugin(
+                        $this->server->tree, \OC::$server->getTagManager()
+                    )
+                );
+                // TODO: switch to LazyUserFolder
+                $userFolder = \OC::$server->getUserFolder();
+                $this->server->addPlugin(new SharesPlugin(
+                    $this->server->tree,
+                    $userSession,
+                    $userFolder,
+                    \OC::$server->getShareManager()
+                ));
+                $this->server->addPlugin(new CommentPropertiesPlugin(
+                    \OC::$server->getCommentsManager(),
+                    $userSession
+                ));
+                $this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
+                if ($view !== null) {
+                    $this->server->addPlugin(new FilesReportPlugin(
+                        $this->server->tree,
+                        $view,
+                        \OC::$server->getSystemTagManager(),
+                        \OC::$server->getSystemTagObjectMapper(),
+                        \OC::$server->getTagManager(),
+                        $userSession,
+                        \OC::$server->getGroupManager(),
+                        $userFolder
+                    ));
+                    $this->server->addPlugin(new SearchPlugin(new \OCA\DAV\Files\FileSearchBackend(
+                        $this->server->tree,
+                        $user,
+                        \OC::$server->getRootFolder(),
+                        \OC::$server->getShareManager(),
+                        $view
+                    )));
+                }
+            }
+        });
+    }
 
-	public function exec() {
-		$this->server->exec();
-	}
+    public function exec() {
+        $this->server->exec();
+    }
 }

Please login to merge, or discard this patch.

		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25
26	26	// no php execution timeout for webdav
27	27	if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
28		- @set_time_limit(0);
	28	+ @set_time_limit(0);
29	29	}
30	30	ignore_user_abort(true);
31	31
		@@ -33,38 +33,38 @@ discard block
		block discarded – undo
33	33	\OC_Util::obEnd();
34	34
35	35	$serverFactory = new \OCA\DAV\Connector\Sabre\ServerFactory(
36		- \OC::$server->getConfig(),
37		- \OC::$server->getLogger(),
38		- \OC::$server->getDatabaseConnection(),
39		- \OC::$server->getUserSession(),
40		- \OC::$server->getMountManager(),
41		- \OC::$server->getTagManager(),
42		- \OC::$server->getRequest(),
43		- \OC::$server->getPreviewManager()
	36	+ \OC::$server->getConfig(),
	37	+ \OC::$server->getLogger(),
	38	+ \OC::$server->getDatabaseConnection(),
	39	+ \OC::$server->getUserSession(),
	40	+ \OC::$server->getMountManager(),
	41	+ \OC::$server->getTagManager(),
	42	+ \OC::$server->getRequest(),
	43	+ \OC::$server->getPreviewManager()
44	44	);
45	45
46	46	// Backends
47	47	$authBackend = new \OCA\DAV\Connector\Sabre\Auth(
48		- \OC::$server->getSession(),
49		- \OC::$server->getUserSession(),
50		- \OC::$server->getRequest(),
51		- \OC::$server->getTwoFactorAuthManager(),
52		- \OC::$server->getBruteForceThrottler(),
53		- 'principals/'
	48	+ \OC::$server->getSession(),
	49	+ \OC::$server->getUserSession(),
	50	+ \OC::$server->getRequest(),
	51	+ \OC::$server->getTwoFactorAuthManager(),
	52	+ \OC::$server->getBruteForceThrottler(),
	53	+ 'principals/'
54	54	);
55	55	$authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
56	56	$bearerAuthPlugin = new \OCA\DAV\Connector\Sabre\BearerAuth(
57		- \OC::$server->getUserSession(),
58		- \OC::$server->getSession(),
59		- \OC::$server->getRequest()
	57	+ \OC::$server->getUserSession(),
	58	+ \OC::$server->getSession(),
	59	+ \OC::$server->getRequest()
60	60	);
61	61	$authPlugin->addBackend($bearerAuthPlugin);
62	62
63	63	$requestUri = \OC::$server->getRequest()->getRequestUri();
64	64
65	65	$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function() {
66		- // use the view for the logged in user
67		- return \OC\Files\Filesystem::getView();
	66	+ // use the view for the logged in user
	67	+ return \OC\Files\Filesystem::getView();
68	68	});
69	69
70	70	$dispatcher = \OC::$server->getEventDispatcher();

		@@ -58,201 +58,201 @@
		block discarded – undo
58	58
59	59	class Server {
60	60
61		- /** @var IRequest */
62		- private $request;
	61	+ /** @var IRequest */
	62	+ private $request;
63	63
64		- /** @var string */
65		- private $baseUri;
	64	+ /** @var string */
	65	+ private $baseUri;
66	66
67		- /** @var Connector\Sabre\Server */
68		- private $server;
	67	+ /** @var Connector\Sabre\Server */
	68	+ private $server;
69	69
70		- public function __construct(IRequest $request, $baseUri) {
71		- $this->request = $request;
72		- $this->baseUri = $baseUri;
73		- $logger = \OC::$server->getLogger();
74		- $mailer = \OC::$server->getMailer();
75		- $dispatcher = \OC::$server->getEventDispatcher();
	70	+ public function __construct(IRequest $request, $baseUri) {
	71	+ $this->request = $request;
	72	+ $this->baseUri = $baseUri;
	73	+ $logger = \OC::$server->getLogger();
	74	+ $mailer = \OC::$server->getMailer();
	75	+ $dispatcher = \OC::$server->getEventDispatcher();
76	76
77		- $root = new RootCollection();
78		- $this->server = new \OCA\DAV\Connector\Sabre\Server($root);
	77	+ $root = new RootCollection();
	78	+ $this->server = new \OCA\DAV\Connector\Sabre\Server($root);
79	79
80		- // Add maintenance plugin
81		- $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
	80	+ // Add maintenance plugin
	81	+ $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
82	82
83		- // Backends
84		- $authBackend = new Auth(
85		- \OC::$server->getSession(),
86		- \OC::$server->getUserSession(),
87		- \OC::$server->getRequest(),
88		- \OC::$server->getTwoFactorAuthManager(),
89		- \OC::$server->getBruteForceThrottler()
90		- );
	83	+ // Backends
	84	+ $authBackend = new Auth(
	85	+ \OC::$server->getSession(),
	86	+ \OC::$server->getUserSession(),
	87	+ \OC::$server->getRequest(),
	88	+ \OC::$server->getTwoFactorAuthManager(),
	89	+ \OC::$server->getBruteForceThrottler()
	90	+ );
91	91
92		- // Set URL explicitly due to reverse-proxy situations
93		- $this->server->httpRequest->setUrl($this->request->getRequestUri());
94		- $this->server->setBaseUri($this->baseUri);
	92	+ // Set URL explicitly due to reverse-proxy situations
	93	+ $this->server->httpRequest->setUrl($this->request->getRequestUri());
	94	+ $this->server->setBaseUri($this->baseUri);
95	95
96		- $this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
97		- $authPlugin = new Plugin();
98		- $authPlugin->addBackend(new PublicAuth());
99		- $this->server->addPlugin($authPlugin);
	96	+ $this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
	97	+ $authPlugin = new Plugin();
	98	+ $authPlugin->addBackend(new PublicAuth());
	99	+ $this->server->addPlugin($authPlugin);
100	100
101		- // allow setup of additional auth backends
102		- $event = new SabrePluginEvent($this->server);
103		- $dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
	101	+ // allow setup of additional auth backends
	102	+ $event = new SabrePluginEvent($this->server);
	103	+ $dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
104	104
105		- $bearerAuthBackend = new BearerAuth(
106		- \OC::$server->getUserSession(),
107		- \OC::$server->getSession(),
108		- \OC::$server->getRequest()
109		- );
110		- $authPlugin->addBackend($bearerAuthBackend);
111		- // because we are throwing exceptions this plugin has to be the last one
112		- $authPlugin->addBackend($authBackend);
	105	+ $bearerAuthBackend = new BearerAuth(
	106	+ \OC::$server->getUserSession(),
	107	+ \OC::$server->getSession(),
	108	+ \OC::$server->getRequest()
	109	+ );
	110	+ $authPlugin->addBackend($bearerAuthBackend);
	111	+ // because we are throwing exceptions this plugin has to be the last one
	112	+ $authPlugin->addBackend($authBackend);
113	113
114		- // debugging
115		- if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
116		- $this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
117		- } else {
118		- $this->server->addPlugin(new DummyGetResponsePlugin());
119		- }
	114	+ // debugging
	115	+ if(\OC::$server->getConfig()->getSystemValue('debug', false)) {
	116	+ $this->server->addPlugin(new \Sabre\DAV\Browser\Plugin());
	117	+ } else {
	118	+ $this->server->addPlugin(new DummyGetResponsePlugin());
	119	+ }
120	120
121		- $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
122		- $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
123		- $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
	121	+ $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
	122	+ $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
	123	+ $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
124	124
125		- // acl
126		- $acl = new DavAclPlugin();
127		- $acl->principalCollectionSet = [
128		- 'principals/users', 'principals/groups'
129		- ];
130		- $acl->defaultUsernamePath = 'principals/users';
131		- $this->server->addPlugin($acl);
	125	+ // acl
	126	+ $acl = new DavAclPlugin();
	127	+ $acl->principalCollectionSet = [
	128	+ 'principals/users', 'principals/groups'
	129	+ ];
	130	+ $acl->defaultUsernamePath = 'principals/users';
	131	+ $this->server->addPlugin($acl);
132	132
133		- // calendar plugins
134		- $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
135		- $this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
136		- $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
137		- $this->server->addPlugin(new IMipPlugin($mailer, $logger));
138		- $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
139		- $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
140		- $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
141		- $this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
142		- \OC::$server->getConfig(),
143		- \OC::$server->getURLGenerator()
144		- ));
	133	+ // calendar plugins
	134	+ $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
	135	+ $this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
	136	+ $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
	137	+ $this->server->addPlugin(new IMipPlugin($mailer, $logger));
	138	+ $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
	139	+ $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
	140	+ $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
	141	+ $this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
	142	+ \OC::$server->getConfig(),
	143	+ \OC::$server->getURLGenerator()
	144	+ ));
145	145
146		- // addressbook plugins
147		- $this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
148		- $this->server->addPlugin(new VCFExportPlugin());
149		- $this->server->addPlugin(new ImageExportPlugin(new PhotoCache(\OC::$server->getAppDataDir('dav-photocache'))));
	146	+ // addressbook plugins
	147	+ $this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
	148	+ $this->server->addPlugin(new VCFExportPlugin());
	149	+ $this->server->addPlugin(new ImageExportPlugin(new PhotoCache(\OC::$server->getAppDataDir('dav-photocache'))));
150	150
151		- // system tags plugins
152		- $this->server->addPlugin(new SystemTagPlugin(
153		- \OC::$server->getSystemTagManager(),
154		- \OC::$server->getGroupManager(),
155		- \OC::$server->getUserSession()
156		- ));
	151	+ // system tags plugins
	152	+ $this->server->addPlugin(new SystemTagPlugin(
	153	+ \OC::$server->getSystemTagManager(),
	154	+ \OC::$server->getGroupManager(),
	155	+ \OC::$server->getUserSession()
	156	+ ));
157	157
158		- // comments plugin
159		- $this->server->addPlugin(new CommentsPlugin(
160		- \OC::$server->getCommentsManager(),
161		- \OC::$server->getUserSession()
162		- ));
	158	+ // comments plugin
	159	+ $this->server->addPlugin(new CommentsPlugin(
	160	+ \OC::$server->getCommentsManager(),
	161	+ \OC::$server->getUserSession()
	162	+ ));
163	163
164		- $this->server->addPlugin(new CopyEtagHeaderPlugin());
	164	+ $this->server->addPlugin(new CopyEtagHeaderPlugin());
165	165
166		- // allow setup of additional plugins
167		- $dispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
	166	+ // allow setup of additional plugins
	167	+ $dispatcher->dispatch('OCA\DAV\Connector\Sabre::addPlugin', $event);
168	168
169		- // Some WebDAV clients do require Class 2 WebDAV support (locking), since
170		- // we do not provide locking we emulate it using a fake locking plugin.
171		- if($request->isUserAgent([
172		- '/WebDAVFS/',
173		- '/Microsoft Office OneNote 2013/',
174		- '/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
175		- ])) {
176		- $this->server->addPlugin(new FakeLockerPlugin());
177		- }
	169	+ // Some WebDAV clients do require Class 2 WebDAV support (locking), since
	170	+ // we do not provide locking we emulate it using a fake locking plugin.
	171	+ if($request->isUserAgent([
	172	+ '/WebDAVFS/',
	173	+ '/Microsoft Office OneNote 2013/',
	174	+ '/^Microsoft-WebDAV/',// Microsoft-WebDAV-MiniRedir/6.1.7601
	175	+ ])) {
	176	+ $this->server->addPlugin(new FakeLockerPlugin());
	177	+ }
178	178
179		- if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
180		- $this->server->addPlugin(new BrowserErrorPagePlugin());
181		- }
	179	+ if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
	180	+ $this->server->addPlugin(new BrowserErrorPagePlugin());
	181	+ }
182	182
183		- // wait with registering these until auth is handled and the filesystem is setup
184		- $this->server->on('beforeMethod', function () {
185		- // custom properties plugin must be the last one
186		- $userSession = \OC::$server->getUserSession();
187		- $user = $userSession->getUser();
188		- if ($user !== null) {
189		- $view = \OC\Files\Filesystem::getView();
190		- $this->server->addPlugin(
191		- new FilesPlugin(
192		- $this->server->tree,
193		- \OC::$server->getConfig(),
194		- $this->request,
195		- \OC::$server->getPreviewManager(),
196		- false,
197		- !\OC::$server->getConfig()->getSystemValue('debug', false)
198		- )
199		- );
	183	+ // wait with registering these until auth is handled and the filesystem is setup
	184	+ $this->server->on('beforeMethod', function () {
	185	+ // custom properties plugin must be the last one
	186	+ $userSession = \OC::$server->getUserSession();
	187	+ $user = $userSession->getUser();
	188	+ if ($user !== null) {
	189	+ $view = \OC\Files\Filesystem::getView();
	190	+ $this->server->addPlugin(
	191	+ new FilesPlugin(
	192	+ $this->server->tree,
	193	+ \OC::$server->getConfig(),
	194	+ $this->request,
	195	+ \OC::$server->getPreviewManager(),
	196	+ false,
	197	+ !\OC::$server->getConfig()->getSystemValue('debug', false)
	198	+ )
	199	+ );
200	200
201		- $this->server->addPlugin(
202		- new \Sabre\DAV\PropertyStorage\Plugin(
203		- new CustomPropertiesBackend(
204		- $this->server->tree,
205		- \OC::$server->getDatabaseConnection(),
206		- \OC::$server->getUserSession()->getUser()
207		- )
208		- )
209		- );
210		- if ($view !== null) {
211		- $this->server->addPlugin(
212		- new QuotaPlugin($view));
213		- }
214		- $this->server->addPlugin(
215		- new TagsPlugin(
216		- $this->server->tree, \OC::$server->getTagManager()
217		- )
218		- );
219		- // TODO: switch to LazyUserFolder
220		- $userFolder = \OC::$server->getUserFolder();
221		- $this->server->addPlugin(new SharesPlugin(
222		- $this->server->tree,
223		- $userSession,
224		- $userFolder,
225		- \OC::$server->getShareManager()
226		- ));
227		- $this->server->addPlugin(new CommentPropertiesPlugin(
228		- \OC::$server->getCommentsManager(),
229		- $userSession
230		- ));
231		- $this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
232		- if ($view !== null) {
233		- $this->server->addPlugin(new FilesReportPlugin(
234		- $this->server->tree,
235		- $view,
236		- \OC::$server->getSystemTagManager(),
237		- \OC::$server->getSystemTagObjectMapper(),
238		- \OC::$server->getTagManager(),
239		- $userSession,
240		- \OC::$server->getGroupManager(),
241		- $userFolder
242		- ));
243		- $this->server->addPlugin(new SearchPlugin(new \OCA\DAV\Files\FileSearchBackend(
244		- $this->server->tree,
245		- $user,
246		- \OC::$server->getRootFolder(),
247		- \OC::$server->getShareManager(),
248		- $view
249		- )));
250		- }
251		- }
252		- });
253		- }
	201	+ $this->server->addPlugin(
	202	+ new \Sabre\DAV\PropertyStorage\Plugin(
	203	+ new CustomPropertiesBackend(
	204	+ $this->server->tree,
	205	+ \OC::$server->getDatabaseConnection(),
	206	+ \OC::$server->getUserSession()->getUser()
	207	+ )
	208	+ )
	209	+ );
	210	+ if ($view !== null) {
	211	+ $this->server->addPlugin(
	212	+ new QuotaPlugin($view));
	213	+ }
	214	+ $this->server->addPlugin(
	215	+ new TagsPlugin(
	216	+ $this->server->tree, \OC::$server->getTagManager()
	217	+ )
	218	+ );
	219	+ // TODO: switch to LazyUserFolder
	220	+ $userFolder = \OC::$server->getUserFolder();
	221	+ $this->server->addPlugin(new SharesPlugin(
	222	+ $this->server->tree,
	223	+ $userSession,
	224	+ $userFolder,
	225	+ \OC::$server->getShareManager()
	226	+ ));
	227	+ $this->server->addPlugin(new CommentPropertiesPlugin(
	228	+ \OC::$server->getCommentsManager(),
	229	+ $userSession
	230	+ ));
	231	+ $this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin());
	232	+ if ($view !== null) {
	233	+ $this->server->addPlugin(new FilesReportPlugin(
	234	+ $this->server->tree,
	235	+ $view,
	236	+ \OC::$server->getSystemTagManager(),
	237	+ \OC::$server->getSystemTagObjectMapper(),
	238	+ \OC::$server->getTagManager(),
	239	+ $userSession,
	240	+ \OC::$server->getGroupManager(),
	241	+ $userFolder
	242	+ ));
	243	+ $this->server->addPlugin(new SearchPlugin(new \OCA\DAV\Files\FileSearchBackend(
	244	+ $this->server->tree,
	245	+ $user,
	246	+ \OC::$server->getRootFolder(),
	247	+ \OC::$server->getShareManager(),
	248	+ $view
	249	+ )));
	250	+ }
	251	+ }
	252	+ });
	253	+ }
254	254
255		- public function exec() {
256		- $this->server->exec();
257		- }
	255	+ public function exec() {
	256	+ $this->server->exec();
	257	+ }
258	258	}

nextcloud / server

Pull Request — master (#6309)

Status

Category

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

Indentation +173 added lines, -173 removed lines patch added patch discarded remove patch