Merge pull request #33458 from nextcloud/object-store-validate-write

allow disabling object store write check
nextcloud · Oct 26, 2022 · 5e71875 · 5e71875
2 parents 71f6986 + 3357c8e
commit 5e71875
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
@@ -61,6 +61,9 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
 
 	private $logger;
 
+	/** @var bool */
+	protected $validateWrites = true;
+
 	public function __construct($params) {
 		if (isset($params['objectstore']) && $params['objectstore'] instanceof IObjectStore) {
 			$this->objectStore = $params['objectstore'];
@@ -75,6 +78,9 @@ public function __construct($params) {
 		if (isset($params['objectPrefix'])) {
 			$this->objectPrefix = $params['objectPrefix'];
 		}
+		if (isset($params['validateWrites'])) {
+			$this->validateWrites = (bool)$params['validateWrites'];
+		}
 		//initialize cache with root directory in cache
 		if (!$this->is_dir('/')) {
 			$this->mkdir('/');
@@ -522,7 +528,7 @@ public function writeStream(string $path, $stream, int $size = null): int {
 		if ($exists) {
 			$this->getCache()->update($fileId, $stat);
 		} else {
-			if ($this->objectStore->objectExists($urn)) {
+			if (!$this->validateWrites || $this->objectStore->objectExists($urn)) {
 				$this->getCache()->move($uploadPath, $path);
 			} else {
 				$this->getCache()->remove($uploadPath);

diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStorageOverwrite.php b/tests/lib/Files/ObjectStore/ObjectStoreStorageOverwrite.php
@@ -37,4 +37,8 @@ public function setObjectStore(IObjectStore $objectStore) {
 	public function getObjectStore(): IObjectStore {
 		return $this->objectStore;
 	}
+
+	public function setValidateWrites(bool $validate) {
+		$this->validateWrites = $validate;
+	}
 }
diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php
@@ -181,6 +181,15 @@ public function testWriteObjectSilentFailure() {
 		$this->assertFalse($this->instance->file_exists('test.txt'));
 	}
 
+	public function testWriteObjectSilentFailureNoCheck() {
+		$objectStore = $this->instance->getObjectStore();
+		$this->instance->setObjectStore(new FailWriteObjectStore($objectStore));
+		$this->instance->setValidateWrites(false);
+
+		$this->instance->file_put_contents('test.txt', 'foo');
+		$this->assertTrue($this->instance->file_exists('test.txt'));
+	}
+
 	public function testDeleteObjectFailureKeepCache() {
 		$objectStore = $this->instance->getObjectStore();
 		$this->instance->setObjectStore(new FailDeleteObjectStore($objectStore));