From e7b1196dd6ca011d8b60764f7c55a5896e96d106 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 2 Nov 2016 10:22:36 +0100
Subject: [PATCH 1/2] Hack to prevent warning for read-only wrapper in public
 links

Storage wrappers should normally always be registered inside a presetup
hook. However in the public link scenario this is not possible and
there is currently no good alternative with the current architecture.

Instead of logging a warning every time, this fix prevents the warning
to be shown but also adds a FIXME in the code for the future. This is
ok because this app is already using private/internal APIs at the
moment and should be reworked properly in the future.
---
 apps/dav/appinfo/v1/publicwebdav.php | 8 +++-----
 lib/private/Files/Filesystem.php     | 5 ++++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/dav/appinfo/v1/publicwebdav.php b/apps/dav/appinfo/v1/publicwebdav.php
index 670eadd5ea9..95fb71032d5 100644
--- a/apps/dav/appinfo/v1/publicwebdav.php
+++ b/apps/dav/appinfo/v1/publicwebdav.php
@@ -73,14 +73,12 @@ $server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, func
 	$isReadable = $share->getPermissions() & \OCP\Constants::PERMISSION_READ;
 	$fileId = $share->getNodeId();
 
-	/*
-	if (!$isReadable) {
-		return false;
-	}*/
-
+	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
+	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
 	\OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
 		return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE));
 	});
+	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
 
 	OC_Util::setupFS($owner);
 	$ownerView = \OC\Files\Filesystem::getView();
diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php
index ac0e66973d4..3f776a1a809 100644
--- a/lib/private/Files/Filesystem.php
+++ b/lib/private/Files/Filesystem.php
@@ -214,10 +214,13 @@ class Filesystem {
 
 	/**
 	 * @param bool $shouldLog
+	 * @return bool previous value
 	 * @internal
 	 */
 	public static function logWarningWhenAddingStorageWrapper($shouldLog) {
-		self::$logWarningWhenAddingStorageWrapper = (bool)$shouldLog;
+		$previousValue = self::$logWarningWhenAddingStorageWrapper;
+		self::$logWarningWhenAddingStorageWrapper = (bool) $shouldLog;
+		return $previousValue;
 	}
 
 	/**

From b373f52fa8c0eb80338e5f06981f4a048f5720e1 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 14 Nov 2016 16:13:05 +0100
Subject: [PATCH 2/2] only use one kind of hack for the storage wrappers of the
 sharing code

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 apps/files_sharing/ajax/shareinfo.php | 3 +++
 lib/private/Files/Filesystem.php      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/ajax/shareinfo.php b/apps/files_sharing/ajax/shareinfo.php
index 75d6e6081ec..a32b0a07328 100644
--- a/apps/files_sharing/ajax/shareinfo.php
+++ b/apps/files_sharing/ajax/shareinfo.php
@@ -63,9 +63,12 @@ $path = $data['realPath'];
 
 $isWritable = $share->getPermissions() & (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_CREATE);
 if (!$isWritable) {
+	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
+	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
 	\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
 		return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
 	});
+	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
 }
 
 $rootInfo = \OC\Files\Filesystem::getFileInfo($path);
diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php
index 3f776a1a809..42a6d950332 100644
--- a/lib/private/Files/Filesystem.php
+++ b/lib/private/Files/Filesystem.php
@@ -229,7 +229,7 @@ class Filesystem {
 	 * @param int $priority
 	 */
 	public static function addStorageWrapper($wrapperName, $wrapper, $priority = 50) {
-		if (self::$logWarningWhenAddingStorageWrapper && $wrapperName !== 'readonly') {
+		if (self::$logWarningWhenAddingStorageWrapper) {
 			\OC::$server->getLogger()->warning("Storage wrapper '{wrapper}' was not registered via the 'OC_Filesystem - preSetup' hook which could cause potential problems.", [
 				'wrapper' => $wrapperName,
 				'app' => 'filesystem',