mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check if quota should be applied to path when creating directories 

This fixes an issue where the files_trashbin hierarchy of a user could
not been created as the mkdir operations were blocked by the quota
storage wrapper. Even with 0 quota, users should be able to have a
trashbin for external storages.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2020-09-08 07:33:54 +02:00
parent 47e7257c80
commit 87e5fd0d2c
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/private/Files/Storage/Wrapper/Quota.php
View File

@ -161,7 +161,7 @@ class Quota extends Wrapper {
$free = $this->free_space($path);
if ($source && $free >= 0 && $mode !== 'r' && $mode !== 'rb') {
// only apply quota for files, not metadata, trash or others
if (strpos(ltrim($path, '/'), 'files/') === 0) {
if ($this->shouldApplyQuota($path)) {
return \OC\Files\Stream\Quota::wrap($source, $free);
}
}
@ -182,6 +182,13 @@ class Quota extends Wrapper {
return ($extension === 'part');
}
/**
* Only apply quota for files, not metadata, trash or others
*/
private function shouldApplyQuota(string $path): bool {
return strpos(ltrim($path, '/'), 'files/') === 0;
}
/**
* @param IStorage $sourceStorage
* @param string $sourceInternalPath
@ -214,7 +221,7 @@ class Quota extends Wrapper {
public function mkdir($path) {
$free = $this->free_space($path);
if ($free === 0.0) {
if ($this->shouldApplyQuota($path) && $free === 0.0) {
return false;
}