Skip to content

Commit

Permalink
Merge pull request #41371 from nextcloud/backport/41354/stable27
Browse files Browse the repository at this point in the history
[stable27] fix: Validate that we have a proper distributed cache configured
  • Loading branch information
blizzz authored Nov 15, 2023
2 parents a2c8a0b + f81aa80 commit 3374457
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion apps/dav/lib/Upload/ChunkingV2Plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
use OC\Files\Filesystem;
use OC\Files\ObjectStore\ObjectStoreStorage;
use OC\Files\View;
use OC\Memcache\Memcached;
use OC\Memcache\Redis;
use OC_Hook;
use OCA\DAV\Connector\Sabre\Directory;
use OCA\DAV\Connector\Sabre\File;
Expand All @@ -40,6 +42,7 @@
use OCP\Files\StorageInvalidException;
use OCP\ICache;
use OCP\ICacheFactory;
use OCP\IConfig;
use OCP\Lock\ILockingProvider;
use Sabre\DAV\Exception\BadRequest;
use Sabre\DAV\Exception\InsufficientStorage;
Expand Down Expand Up @@ -272,6 +275,11 @@ public function beforeDelete(RequestInterface $request, ResponseInterface $respo
* @throws StorageInvalidException
*/
private function checkPrerequisites(bool $checkUploadMetadata = true): void {
$distributedCacheConfig = \OCP\Server::get(IConfig::class)->getSystemValue('memcache.distributed', null);

if ($distributedCacheConfig === null || (!$this->cache instanceof Redis && !$this->cache instanceof Memcached)) {
throw new BadRequest('Skipping chunking v2 since no proper distributed cache is available');
}
if (!$this->uploadFolder instanceof UploadFolder || empty($this->server->httpRequest->getHeader(self::DESTINATION_HEADER))) {
throw new BadRequest('Skipping chunked file writing as the destination header was not passed');
}
Expand All @@ -284,7 +292,7 @@ private function checkPrerequisites(bool $checkUploadMetadata = true): void {

if ($checkUploadMetadata) {
if ($this->uploadId === null || $this->uploadPath === null) {
throw new PreconditionFailed('Missing metadata for chunked upload');
throw new PreconditionFailed('Missing metadata for chunked upload. The distributed cache does not hold the information of previous requests.');
}
}
}
Expand Down

0 comments on commit 3374457

Please sign in to comment.