Merge pull request #1130 from nextcloud/shared-upload-quota

[uc] Fix uploading to shared folder with quota

2 files changed, 28 insertions, 0 deletions

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 3ceca430424..e1875fe2394 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -106,6 +106,16 @@ class Shared extends \OC\Files\Storage\Wrapper\Jail implements ISharedStorage {
 	}
 
 	/**
+	 * @inheritdoc
+	 */
+	public function instanceOfStorage($class) {
+		if (in_array($class, ['\OC\Files\Storage\Home', '\OC\Files\ObjectStore\HomeObjectStoreStorage'])) {
+			return false;
+		}
+		return parent::instanceOfStorage($class);
+	}
+
+	/**
 	 * @return string
 	 */
 	public function getShareId() {
diff --git a/build/integration/features/webdav-related.feature b/build/integration/features/webdav-related.feature
index c49db4f8a5d..a59d65a2674 100644
--- a/build/integration/features/webdav-related.feature
+++ b/build/integration/features/webdav-related.feature
@@ -59,6 +59,24 @@ Feature: webdav-related
 		  |{DAV:}quota-available-bytes|
 		And the single response should contain a property "{DAV:}quota-available-bytes" with value "10485421"
 
+	Scenario: Uploading a file as recipient using webdav having quota
+		Given using dav path "remote.php/webdav"
+		And As an "admin"
+		And user "user0" exists
+		And user "user1" exists
+		And user "user0" has a quota of "10 MB"
+		And user "user1" has a quota of "10 MB"
+		And As an "user1"
+		And user "user1" created a folder "/testquota"
+		And as "user1" creating a share with
+		  | path | testquota |
+		  | shareType | 0 |
+		  | permissions | 31 |
+		  | shareWith | user0 |
+		And As an "user0"
+		When User "user0" uploads file "data/textfile.txt" to "/testquota/asdf.txt"
+		Then the HTTP status code should be "201"
+
 	Scenario: download a public shared file with range
 		Given user "user0" exists
 		And As an "user0"