Merge pull request #36281 from owncloud/fix-avatar

Avoid unnecessary "Avatar not found" logs by initializing ViewOnlyPlugin for only files
owncloud · Oct 21, 2019 · c75fecf · c75fecf
2 parents 6cb568c + 71dfb32
commit c75fecf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php
@@ -137,7 +137,6 @@ public function __construct(IRequest $request, $baseUri) {
 			$this->server->addPlugin(new PublicFilesPlugin());
 			$authPlugin->addBackend(new PublicSharingAuth($this->server, OC::$server->getShareManager()));
 			$this->server->addPlugin(new PublicLinkEventsPlugin(\OC::$server->getEventDispatcher()));
-			$this->server->addPlugin(new PublicFilesPlugin());
 		}
 		$authPlugin->addBackend(new PublicAuth());
 		$this->server->addPlugin($authPlugin);
@@ -218,10 +217,11 @@ public function __construct(IRequest $request, $baseUri) {
 			OC::$server->getLazyRootFolder()
 		));
 
-		// Allow view-only plugin for webdav requests
-		$this->server->addPlugin(new ViewOnlyPlugin(
-			OC::$server->getLogger()
-		));
+		if ($this->isRequestForSubtree(['files', 'trash-bin', 'public-files'])) {
+			$this->server->addPlugin(new ViewOnlyPlugin(
+				OC::$server->getLogger()
+			));
+		}
 
 		if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
 			$this->server->addPlugin(new BrowserErrorPagePlugin());
@@ -245,7 +245,7 @@ public function __construct(IRequest $request, $baseUri) {
 					)
 				);
 
-				if ($this->isRequestForSubtree(['files', 'uploads', 'trash-bin'])) {
+				if ($this->isRequestForSubtree(['files', 'uploads', 'trash-bin', 'public-files'])) {
 					//For files only
 					$filePropertiesPlugin = new FileCustomPropertiesPlugin(
 						new FileCustomPropertiesBackend(

diff --git a/apps/dav/tests/unit/ServerTest.php b/apps/dav/tests/unit/ServerTest.php
@@ -55,6 +55,7 @@ public function providesUris() {
 			'principals' => ['principals/users/admin', ['caldav', 'oc-resource-sharing', 'carddav']],
 			'calendars' => ['calendars/admin', ['caldav', 'oc-resource-sharing']],
 			'addressbooks' => ['addressbooks/admin', ['carddav', 'oc-resource-sharing']],
+			'files' => ['files/admin', ['OCA\DAV\DAV\ViewOnlyPlugin']]
 		];
 	}
 }
diff --git a/changelog/unreleased/36281 b/changelog/unreleased/36281
@@ -0,0 +1,5 @@
+Bugfix: Avoid unnecessary "Avatar not found" logs by initializing ViewOnlyPlugin for only files
+
+ViewOnlyPlugin was producing too many warning logs for users who have not an avatar. By registering ViewOnlyPlugin for only files problem resolved.
+
+https://github.com/owncloud/core/pull/36281