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

Merge pull request #15772 from nextcloud/backport/15766/stable16 

[stable16] Check for free space on touch
This commit is contained in:
Roeland Jago Douma 2019-05-29 20:48:51 +02:00 committed by GitHub
parent baf376b6fd 7764979281
commit 538a710d1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/private/Files/Node/Folder.php
View File

@ -181,14 +181,15 @@ class Folder extends Node implements \OCP\Files\Folder {
$nonExisting = new NonExistingFile($this->root, $this->view, $fullPath);
$this->root->emit('\OC\Files', 'preWrite', array($nonExisting));
$this->root->emit('\OC\Files', 'preCreate', array($nonExisting));
$this->view->touch($fullPath);
if (!$this->view->touch($fullPath)) {
throw new NotPermittedException('Could not create path');
}
$node = new File($this->root, $this->view, $fullPath);
$this->root->emit('\OC\Files', 'postWrite', array($node));
$this->root->emit('\OC\Files', 'postCreate', array($node));
return $node;
} else {
throw new NotPermittedException('No create permission for path');
}
throw new NotPermittedException('No create permission for path');
}
/**

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

@ -209,4 +209,14 @@ class Quota extends Wrapper {
return parent::mkdir($path);
}
public function touch($path, $mtime = null) {
$free = $this->free_space($path);
if ($free === 0.0) {
return false;
}
return parent::touch($path, $mtime);
}
}

5
tests/lib/Files/Storage/Wrapper/QuotaTest.php
View File

@ -213,4 +213,9 @@ class QuotaTest extends \Test\Files\Storage\Storage {
$instance = $this->getLimitedStorage(0.0);
$this->assertFalse($instance->mkdir('foobar'));
}
public function testNoTouchQuotaZero() {
$instance = $this->getLimitedStorage(0.0);
$this->assertFalse($instance->touch('foobar'));
}
}