chore: remove chunking-v1

Signed-off-by: Robin Appelman <robin@icewind.nl>

4 files changed, 1 insertions, 442 deletions

diff --git a/apps/dav/tests/unit/Connector/Sabre/FileTest.php b/apps/dav/tests/unit/Connector/Sabre/FileTest.php
index 2830ccc0f18..060f0294256 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FileTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FileTest.php
@@ -211,86 +211,6 @@ class FileTest extends TestCase {
 	}
 
 	/**
-	 * Test putting a file using chunking
-	 *
-	 * @dataProvider fopenFailuresProvider
-	 */
-	public function testChunkedPutFails($thrownException, $expectedException, $checkPreviousClass = false): void {
-		// setup
-		$storage = $this->getMockBuilder(Local::class)
-			->onlyMethods(['fopen'])
-			->setConstructorArgs([['datadir' => \OCP\Server::get(ITempManager::class)->getTemporaryFolder()]])
-			->getMock();
-		\OC\Files\Filesystem::mount($storage, [], $this->user . '/');
-		/** @var View|MockObject */
-		$view = $this->getMockBuilder(View::class)
-			->onlyMethods(['getRelativePath', 'resolvePath'])
-			->getMock();
-		$view->expects($this->atLeastOnce())
-			->method('resolvePath')
-			->willReturnCallback(
-				function ($path) use ($storage) {
-					return [$storage, $path];
-				}
-			);
-
-		if ($thrownException !== null) {
-			$storage->expects($this->once())
-				->method('fopen')
-				->will($this->throwException($thrownException));
-		} else {
-			$storage->expects($this->once())
-				->method('fopen')
-				->willReturn(false);
-		}
-
-		$view->expects($this->any())
-			->method('getRelativePath')
-			->willReturnArgument(0);
-
-		$request = new Request([
-			'server' => [
-				'HTTP_OC_CHUNKED' => 'true'
-			]
-		], $this->requestId, $this->config, null);
-
-		$info = new \OC\Files\FileInfo('/test.txt-chunking-12345-2-0', $this->getMockStorage(), null, [
-			'permissions' => \OCP\Constants::PERMISSION_ALL,
-			'type' => FileInfo::TYPE_FOLDER,
-		], null);
-		$file = new \OCA\DAV\Connector\Sabre\File($view, $info, null, $request);
-
-		// put first chunk
-		$file->acquireLock(ILockingProvider::LOCK_SHARED);
-		$this->assertNull($file->put('test data one'));
-		$file->releaseLock(ILockingProvider::LOCK_SHARED);
-
-		$info = new \OC\Files\FileInfo('/test.txt-chunking-12345-2-1', $this->getMockStorage(), null, [
-			'permissions' => \OCP\Constants::PERMISSION_ALL,
-			'type' => FileInfo::TYPE_FOLDER,
-		], null);
-		$file = new \OCA\DAV\Connector\Sabre\File($view, $info, null, $request);
-
-		// action
-		$caughtException = null;
-		try {
-			// last chunk
-			$file->acquireLock(ILockingProvider::LOCK_SHARED);
-			$file->put('test data two');
-			$file->releaseLock(ILockingProvider::LOCK_SHARED);
-		} catch (\Exception $e) {
-			$caughtException = $e;
-		}
-
-		$this->assertInstanceOf($expectedException, $caughtException);
-		if ($checkPreviousClass) {
-			$this->assertInstanceOf(get_class($thrownException), $caughtException->getPrevious());
-		}
-
-		$this->assertEmpty($this->listPartFiles($view, ''), 'No stray part files');
-	}
-
-	/**
 	 * Simulate putting a file to the given path.
 	 *
 	 * @param string $path path to put the file into
@@ -419,45 +339,6 @@ class FileTest extends TestCase {
 	}
 
 	/**
-	 * Test putting a file with string Mtime using chunking
-	 * @dataProvider legalMtimeProvider
-	 */
-	public function testChunkedPutLegalMtime($requestMtime, $resultMtime): void {
-		$request = new Request([
-			'server' => [
-				'HTTP_X_OC_MTIME' => (string)$requestMtime,
-				'HTTP_OC_CHUNKED' => 'true'
-			]
-		], $this->requestId, $this->config, null);
-
-		$file = 'foo.txt';
-
-		if ($resultMtime === null) {
-			$this->expectException(\Sabre\DAV\Exception::class);
-		}
-
-		$this->doPut($file.'-chunking-12345-2-0', null, $request);
-		$this->doPut($file.'-chunking-12345-2-1', null, $request);
-
-		if ($resultMtime !== null) {
-			$this->assertEquals($resultMtime, $this->getFileInfos($file)['mtime']);
-		}
-	}
-
-	/**
-	 * Test putting a file using chunking
-	 */
-	public function testChunkedPut(): void {
-		$request = new Request([
-			'server' => [
-				'HTTP_OC_CHUNKED' => 'true'
-			]
-		], $this->requestId, $this->config, null);
-		$this->assertNull($this->doPut('/test.txt-chunking-12345-2-0', null, $request));
-		$this->assertNotEmpty($this->doPut('/test.txt-chunking-12345-2-1', null, $request));
-	}
-
-	/**
 	 * Test that putting a file triggers create hooks
 	 */
 	public function testPutSingleFileTriggersHooks(): void {
@@ -559,83 +440,6 @@ class FileTest extends TestCase {
 		);
 	}
 
-	/**
-	 * Test that putting a file with chunks triggers create hooks
-	 */
-	public function testPutChunkedFileTriggersHooks(): void {
-		HookHelper::setUpHooks();
-
-		$request = new Request([
-			'server' => [
-				'HTTP_OC_CHUNKED' => 'true'
-			]
-		], $this->requestId, $this->config, null);
-		$this->assertNull($this->doPut('/foo.txt-chunking-12345-2-0', null, $request));
-		$this->assertNotEmpty($this->doPut('/foo.txt-chunking-12345-2-1', null, $request));
-
-		$this->assertCount(4, HookHelper::$hookCalls);
-		$this->assertHookCall(
-			HookHelper::$hookCalls[0],
-			Filesystem::signal_create,
-			'/foo.txt'
-		);
-		$this->assertHookCall(
-			HookHelper::$hookCalls[1],
-			Filesystem::signal_write,
-			'/foo.txt'
-		);
-		$this->assertHookCall(
-			HookHelper::$hookCalls[2],
-			Filesystem::signal_post_create,
-			'/foo.txt'
-		);
-		$this->assertHookCall(
-			HookHelper::$hookCalls[3],
-			Filesystem::signal_post_write,
-			'/foo.txt'
-		);
-	}
-
-	/**
-	 * Test that putting a chunked file triggers update hooks
-	 */
-	public function testPutOverwriteChunkedFileTriggersHooks(): void {
-		$view = \OC\Files\Filesystem::getView();
-		$view->file_put_contents('/foo.txt', 'some content that will be replaced');
-
-		HookHelper::setUpHooks();
-
-		$request = new Request([
-			'server' => [
-				'HTTP_OC_CHUNKED' => 'true'
-			]
-		], $this->requestId, $this->config, null);
-		$this->assertNull($this->doPut('/foo.txt-chunking-12345-2-0', null, $request));
-		$this->assertNotEmpty($this->doPut('/foo.txt-chunking-12345-2-1', null, $request));
-
-		$this->assertCount(4, HookHelper::$hookCalls);
-		$this->assertHookCall(
-			HookHelper::$hookCalls[0],
-			Filesystem::signal_update,
-			'/foo.txt'
-		);
-		$this->assertHookCall(
-			HookHelper::$hookCalls[1],
-			Filesystem::signal_write,
-			'/foo.txt'
-		);
-		$this->assertHookCall(
-			HookHelper::$hookCalls[2],
-			Filesystem::signal_post_update,
-			'/foo.txt'
-		);
-		$this->assertHookCall(
-			HookHelper::$hookCalls[3],
-			Filesystem::signal_post_write,
-			'/foo.txt'
-		);
-	}
-
 	public static function cancellingHook($params): void {
 		self::$hookCalls[] = [
 			'signal' => Filesystem::signal_post_create,
@@ -754,50 +558,6 @@ class FileTest extends TestCase {
 	}
 
 	/**
-	 * Test exception during final rename in chunk upload mode
-	 */
-	public function testChunkedPutFailsFinalRename(): void {
-		$view = new \OC\Files\View('/' . $this->user . '/files');
-
-		// simulate situation where the target file is locked
-		$view->lockFile('/test.txt', ILockingProvider::LOCK_EXCLUSIVE);
-
-		$request = new Request([
-			'server' => [
-				'HTTP_OC_CHUNKED' => 'true'
-			]
-		], $this->requestId, $this->config, null);
-
-		$info = new \OC\Files\FileInfo('/' . $this->user . '/files/test.txt-chunking-12345-2-0', $this->getMockStorage(), null, [
-			'permissions' => \OCP\Constants::PERMISSION_ALL,
-			'type' => FileInfo::TYPE_FOLDER,
-		], null);
-		$file = new \OCA\DAV\Connector\Sabre\File($view, $info, null, $request);
-		$file->acquireLock(ILockingProvider::LOCK_SHARED);
-		$this->assertNull($file->put('test data one'));
-		$file->releaseLock(ILockingProvider::LOCK_SHARED);
-
-		$info = new \OC\Files\FileInfo('/' . $this->user . '/files/test.txt-chunking-12345-2-1', $this->getMockStorage(), null, [
-			'permissions' => \OCP\Constants::PERMISSION_ALL,
-			'type' => FileInfo::TYPE_FOLDER,
-		], null);
-		$file = new \OCA\DAV\Connector\Sabre\File($view, $info, null, $request);
-
-		// action
-		$thrown = false;
-		try {
-			$file->acquireLock(ILockingProvider::LOCK_SHARED);
-			$file->put($this->getStream('test data'));
-			$file->releaseLock(ILockingProvider::LOCK_SHARED);
-		} catch (\OCA\DAV\Connector\Sabre\Exception\FileLocked $e) {
-			$thrown = true;
-		}
-
-		$this->assertTrue($thrown);
-		$this->assertEmpty($this->listPartFiles($view, ''), 'No stray part files');
-	}
-
-	/**
 	 * Test put file with invalid chars
 	 */
 	public function testSimplePutInvalidChars(): void {
diff --git a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
index ccdb501f7d3..f0996a17a33 100644
--- a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
@@ -127,13 +127,8 @@ class ObjectTreeTest extends \Test\TestCase {
 		$inputFileName,
 		$fileInfoQueryPath,
 		$outputFileName,
-		$type,
-		$enableChunkingHeader
+		$type
 	): void {
-		if ($enableChunkingHeader) {
-			$_SERVER['HTTP_OC_CHUNKED'] = true;
-		}
-
 		$rootNode = $this->getMockBuilder(Directory::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -170,8 +165,6 @@ class ObjectTreeTest extends \Test\TestCase {
 		} else {
 			$this->assertTrue($node instanceof \OCA\DAV\Connector\Sabre\Directory);
 		}
-
-		unset($_SERVER['HTTP_OC_CHUNKED']);
 	}
 
 	public function nodeForPathProvider() {
@@ -182,7 +175,6 @@ class ObjectTreeTest extends \Test\TestCase {
 				'regularfile.txt',
 				'regularfile.txt',
 				'file',
-				false
 			],
 			// regular directory
 			[
@@ -190,31 +182,6 @@ class ObjectTreeTest extends \Test\TestCase {
 				'regulardir',
 				'regulardir',
 				'dir',
-				false
-			],
-			// regular file with chunking
-			[
-				'regularfile.txt',
-				'regularfile.txt',
-				'regularfile.txt',
-				'file',
-				true
-			],
-			// regular directory with chunking
-			[
-				'regulardir',
-				'regulardir',
-				'regulardir',
-				'dir',
-				true
-			],
-			// file with chunky file name
-			[
-				'regularfile.txt-chunking-123566789-10-1',
-				'regularfile.txt',
-				'regularfile.txt',
-				'file',
-				true
 			],
 			// regular file in subdir
 			[
@@ -222,7 +189,6 @@ class ObjectTreeTest extends \Test\TestCase {
 				'subdir/regularfile.txt',
 				'regularfile.txt',
 				'file',
-				false
 			],
 			// regular directory in subdir
 			[
@@ -230,15 +196,6 @@ class ObjectTreeTest extends \Test\TestCase {
 				'subdir/regulardir',
 				'regulardir',
 				'dir',
-				false
-			],
-			// file with chunky file name in subdir
-			[
-				'subdir/regularfile.txt-chunking-123566789-10-1',
-				'subdir/regularfile.txt',
-				'regularfile.txt',
-				'file',
-				true
 			],
 		];
 	}
diff --git a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
index ed4a8b0404a..815837799fd 100644
--- a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
@@ -143,29 +143,6 @@ class QuotaPluginTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider quotaChunkedOkProvider
-	 */
-	public function testCheckQuotaChunkedOk($quota, $chunkTotalSize, $headers): void {
-		$this->init($quota, 'sub/test.txt');
-
-		$mockChunking = $this->getMockBuilder(\OC_FileChunking::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$mockChunking->expects($this->once())
-			->method('getCurrentSize')
-			->willReturn($chunkTotalSize);
-
-		$this->plugin->expects($this->once())
-			->method('getFileChunking')
-			->willReturn($mockChunking);
-
-		$headers['OC-CHUNKED'] = 1;
-		$this->server->httpRequest = new \Sabre\HTTP\Request('POST', 'dummy.file', $headers);
-		$result = $this->plugin->checkQuota('/sub/test.txt-chunking-12345-3-1');
-		$this->assertTrue($result);
-	}
-
 	public function quotaChunkedFailProvider() {
 		return [
 			[400, 0, ['X-EXPECTED-ENTITY-LENGTH' => '1024']],
@@ -178,30 +155,6 @@ class QuotaPluginTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider quotaChunkedFailProvider
-	 */
-	public function testCheckQuotaChunkedFail($quota, $chunkTotalSize, $headers): void {
-		$this->expectException(\Sabre\DAV\Exception\InsufficientStorage::class);
-
-		$this->init($quota, 'sub/test.txt');
-
-		$mockChunking = $this->getMockBuilder(\OC_FileChunking::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$mockChunking->expects($this->once())
-			->method('getCurrentSize')
-			->willReturn($chunkTotalSize);
-
-		$this->plugin->expects($this->once())
-			->method('getFileChunking')
-			->willReturn($mockChunking);
-
-		$headers['OC-CHUNKED'] = 1;
-		$this->server->httpRequest = new \Sabre\HTTP\Request('POST', 'dummy.file', $headers);
-		$this->plugin->checkQuota('/sub/test.txt-chunking-12345-3-1');
-	}
-
 	private function buildFileViewMock($quota, $checkedPath) {
 		// mock filesysten
 		$view = $this->getMockBuilder(View::class)
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php
index 286bba7d196..60decd4c846 100644
--- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php
@@ -74,115 +74,4 @@ class UploadTest extends RequestTestCase {
 		$result = $this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
 		$this->assertEquals(Http::STATUS_LOCKED, $result->getStatus());
 	}
-
-	public function testChunkedUpload(): void {
-		$user = $this->getUniqueID();
-		$view = $this->setupUser($user, 'pass');
-
-		$this->assertFalse($view->file_exists('foo.txt'));
-		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-0', 'asd', ['OC-Chunked' => '1']);
-
-		$this->assertEquals(201, $response->getStatus());
-		$this->assertFalse($view->file_exists('foo.txt'));
-
-		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-1', 'bar', ['OC-Chunked' => '1']);
-
-		$this->assertEquals(Http::STATUS_CREATED, $response->getStatus());
-		$this->assertTrue($view->file_exists('foo.txt'));
-
-		$this->assertEquals('asdbar', $view->file_get_contents('foo.txt'));
-
-		$info = $view->getFileInfo('foo.txt');
-		$this->assertInstanceOf('\OC\Files\FileInfo', $info);
-		$this->assertEquals(6, $info->getSize());
-	}
-
-	public function testChunkedUploadOverWrite(): void {
-		$user = $this->getUniqueID();
-		$view = $this->setupUser($user, 'pass');
-
-		$view->file_put_contents('foo.txt', 'bar');
-		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-0', 'asd', ['OC-Chunked' => '1']);
-
-		$this->assertEquals(Http::STATUS_CREATED, $response->getStatus());
-		$this->assertEquals('bar', $view->file_get_contents('foo.txt'));
-
-		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-1', 'bar', ['OC-Chunked' => '1']);
-
-		$this->assertEquals(Http::STATUS_CREATED, $response->getStatus());
-
-		$this->assertEquals('asdbar', $view->file_get_contents('foo.txt'));
-
-		$info = $view->getFileInfo('foo.txt');
-		$this->assertInstanceOf('\OC\Files\FileInfo', $info);
-		$this->assertEquals(6, $info->getSize());
-	}
-
-	public function testChunkedUploadOutOfOrder(): void {
-		$user = $this->getUniqueID();
-		$view = $this->setupUser($user, 'pass');
-
-		$this->assertFalse($view->file_exists('foo.txt'));
-		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-1', 'bar', ['OC-Chunked' => '1']);
-
-		$this->assertEquals(Http::STATUS_CREATED, $response->getStatus());
-		$this->assertFalse($view->file_exists('foo.txt'));
-
-		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-0', 'asd', ['OC-Chunked' => '1']);
-
-		$this->assertEquals(201, $response->getStatus());
-		$this->assertTrue($view->file_exists('foo.txt'));
-
-		$this->assertEquals('asdbar', $view->file_get_contents('foo.txt'));
-
-		$info = $view->getFileInfo('foo.txt');
-		$this->assertInstanceOf('\OC\Files\FileInfo', $info);
-		$this->assertEquals(6, $info->getSize());
-	}
-
-	public function testChunkedUploadOutOfOrderReadLocked(): void {
-		$user = $this->getUniqueID();
-		$view = $this->setupUser($user, 'pass');
-
-		$this->assertFalse($view->file_exists('foo.txt'));
-
-		$view->lockFile('/foo.txt', ILockingProvider::LOCK_SHARED);
-
-		try {
-			$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-1', 'bar', ['OC-Chunked' => '1']);
-		} catch (\OCA\DAV\Connector\Sabre\Exception\FileLocked $e) {
-			$this->fail('Didn\'t expect locked error for the first chunk on read lock');
-			return;
-		}
-
-		$this->assertEquals(Http::STATUS_CREATED, $response->getStatus());
-		$this->assertFalse($view->file_exists('foo.txt'));
-
-		// last chunk should trigger the locked error since it tries to assemble
-		$result = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-0', 'asd', ['OC-Chunked' => '1']);
-		$this->assertEquals(Http::STATUS_LOCKED, $result->getStatus());
-	}
-
-	public function testChunkedUploadOutOfOrderWriteLocked(): void {
-		$user = $this->getUniqueID();
-		$view = $this->setupUser($user, 'pass');
-
-		$this->assertFalse($view->file_exists('foo.txt'));
-
-		$view->lockFile('/foo.txt', ILockingProvider::LOCK_EXCLUSIVE);
-
-		try {
-			$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-1', 'bar', ['OC-Chunked' => '1']);
-		} catch (\OCA\DAV\Connector\Sabre\Exception\FileLocked $e) {
-			$this->fail('Didn\'t expect locked error for the first chunk on write lock'); // maybe forbid this in the future for write locks only?
-			return;
-		}
-
-		$this->assertEquals(Http::STATUS_CREATED, $response->getStatus());
-		$this->assertFalse($view->file_exists('foo.txt'));
-
-		// last chunk should trigger the locked error since it tries to assemble
-		$result = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-0', 'asd', ['OC-Chunked' => '1']);
-		$this->assertEquals(Http::STATUS_LOCKED, $result->getStatus());
-	}
 }