wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #12230 from nextcloud/bugfix/do_not_logerror_on_filelock

Browse source 
Do not log FileLock as exception
This commit is contained in:
Roeland Jago Douma 2018-11-04 20:40:17 +01:00 committed by GitHub
commit 4ebb2090db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
View file

@ -26,6 +26,7 @@
namespace OCA\DAV\Connector\Sabre;
use OCA\DAV\Connector\Sabre\Exception\FileLocked;
use OCA\DAV\Connector\Sabre\Exception\PasswordLoginForbidden;
use OCP\Files\StorageNotAvailableException;
use OCP\ILogger;
@ -69,6 +70,8 @@ class ExceptionLoggerPlugin extends \Sabre\DAV\ServerPlugin {
// happens when a certain method is not allowed to be called
// for example creating a folder that already exists
MethodNotAllowed::class => true,
// A locked file is perfectly valid and can happen in various cases
FileLocked::class => true,
];
/** @var string */

6
apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php
View file

@ -46,9 +46,6 @@ class DownloadTest extends RequestTestCase {
$this->assertEquals(stream_get_contents($response->getBody()), 'bar');
}
/**
* @expectedException \OCA\DAV\Connector\Sabre\Exception\FileLocked
*/
public function testDownloadWriteLocked() {
$user = $this->getUniqueID();
$view = $this->setupUser($user, 'pass');
@ -57,7 +54,8 @@ class DownloadTest extends RequestTestCase {
$view->lockFile('/foo.txt', ILockingProvider::LOCK_EXCLUSIVE);
$this->request($view, $user, 'pass', 'GET', '/foo.txt', 'asd');
$result = $this->request($view, $user, 'pass', 'GET', '/foo.txt', 'asd');
$this->assertEquals(Http::STATUS_LOCKED, $result->getStatus());
}
public function testDownloadReadLocked() {

24
apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php
View file

@ -68,9 +68,6 @@ class UploadTest extends RequestTestCase {
$this->assertEquals(3, $info->getSize());
}
/**
* @expectedException \OCA\DAV\Connector\Sabre\Exception\FileLocked
*/
public function testUploadOverWriteReadLocked() {
$user = $this->getUniqueID();
$view = $this->setupUser($user, 'pass');
@ -79,12 +76,10 @@ class UploadTest extends RequestTestCase {
$view->lockFile('/foo.txt', ILockingProvider::LOCK_SHARED);
$this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
$result = $this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
$this->assertEquals(Http::STATUS_LOCKED, $result->getStatus());
}
/**
* @expectedException \OCA\DAV\Connector\Sabre\Exception\FileLocked
*/
public function testUploadOverWriteWriteLocked() {
$user = $this->getUniqueID();
$view = $this->setupUser($user, 'pass');
@ -94,7 +89,8 @@ class UploadTest extends RequestTestCase {
$view->lockFile('/foo.txt', ILockingProvider::LOCK_EXCLUSIVE);
$this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
$result = $this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
$this->assertEquals(Http::STATUS_LOCKED, $result->getStatus());
}
public function testChunkedUpload() {
@ -162,9 +158,6 @@ class UploadTest extends RequestTestCase {
$this->assertEquals(6, $info->getSize());
}
/**
* @expectedException \OCA\DAV\Connector\Sabre\Exception\FileLocked
*/
public function testChunkedUploadOutOfOrderReadLocked() {
$user = $this->getUniqueID();
$view = $this->setupUser($user, 'pass');
@ -184,12 +177,10 @@ class UploadTest extends RequestTestCase {
$this->assertFalse($view->file_exists('foo.txt'));
// last chunk should trigger the locked error since it tries to assemble
$this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-0', 'asd', ['OC-Chunked' => '1']);
$result = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-0', 'asd', ['OC-Chunked' => '1']);
$this->assertEquals(Http::STATUS_LOCKED, $result->getStatus());
}
/**
* @expectedException \OCA\DAV\Connector\Sabre\Exception\FileLocked
*/
public function testChunkedUploadOutOfOrderWriteLocked() {
$user = $this->getUniqueID();
$view = $this->setupUser($user, 'pass');
@ -209,6 +200,7 @@ class UploadTest extends RequestTestCase {
$this->assertFalse($view->file_exists('foo.txt'));
// last chunk should trigger the locked error since it tries to assemble
$this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-0', 'asd', ['OC-Chunked' => '1']);
$result = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-0', 'asd', ['OC-Chunked' => '1']);
$this->assertEquals(Http::STATUS_LOCKED, $result->getStatus());
}
}