diff options
author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2021-11-01 11:26:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-01 11:26:17 +0100 |
commit | d6a26b25364a1ab2183085d09546d8b075ceff6b (patch) | |
tree | 3fac0dd35a7a47c093d7fabcbd1133df7a8f9a11 /apps/dav/lib/Connector | |
parent | e1bf5c1cd37f29281ab775795b8af0edbb3fc11f (diff) | |
download | nextcloud-server-d6a26b25364a1ab2183085d09546d8b075ceff6b.tar.gz nextcloud-server-d6a26b25364a1ab2183085d09546d8b075ceff6b.zip |
Revert "add dav plugin to trigger recalculating of checksums"
Diffstat (limited to 'apps/dav/lib/Connector')
-rw-r--r-- | apps/dav/lib/Connector/Sabre/ChecksumUpdatePlugin.php | 83 | ||||
-rw-r--r-- | apps/dav/lib/Connector/Sabre/File.php | 15 | ||||
-rw-r--r-- | apps/dav/lib/Connector/Sabre/ServerFactory.php | 1 |
3 files changed, 4 insertions, 95 deletions
diff --git a/apps/dav/lib/Connector/Sabre/ChecksumUpdatePlugin.php b/apps/dav/lib/Connector/Sabre/ChecksumUpdatePlugin.php deleted file mode 100644 index 3247259357f..00000000000 --- a/apps/dav/lib/Connector/Sabre/ChecksumUpdatePlugin.php +++ /dev/null @@ -1,83 +0,0 @@ -<?php - -declare(strict_types=1); -/** - * @copyright Copyright (c) 2021 Robin Appelman <robin@icewind.nl> - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -namespace OCA\DAV\Connector\Sabre; - -use Sabre\DAV\ServerPlugin; -use Sabre\HTTP\RequestInterface; -use Sabre\HTTP\ResponseInterface; - -class ChecksumUpdatePlugin extends ServerPlugin { - /** - * @var \Sabre\DAV\Server - */ - protected $server; - - public function initialize(\Sabre\DAV\Server $server) { - $this->server = $server; - $server->on('method:PATCH', [$this, 'httpPatch']); - } - - public function getPluginName(): string { - return 'checksumupdate'; - } - - public function getHTTPMethods($path): array { - $tree = $this->server->tree; - - if ($tree->nodeExists($path)) { - $node = $tree->getNodeForPath($path); - if ($node instanceof File) { - return ['PATCH']; - } - } - - return []; - } - - public function getFeatures(): array { - return ['nextcloud-checksum-update']; - } - - public function httpPatch(RequestInterface $request, ResponseInterface $response) { - $path = $request->getPath(); - - $node = $this->server->tree->getNodeForPath($path); - if ($node instanceof File) { - $type = strtolower( - (string)$request->getHeader('X-Recalculate-Hash') - ); - - $hash = $node->hash($type); - if ($hash) { - $checksum = strtoupper($type) . ':' . $hash; - $node->setChecksum($checksum); - $response->addHeader('OC-Checksum', $checksum); - $response->setHeader('Content-Length', '0'); - $response->setStatus(204); - - return false; - } - } - } -} diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php index 6bb30591d95..5ff5f831eb5 100644 --- a/apps/dav/lib/Connector/Sabre/File.php +++ b/apps/dav/lib/Connector/Sabre/File.php @@ -343,9 +343,11 @@ class File extends Node implements IFile { if (isset($this->request->server['HTTP_OC_CHECKSUM'])) { $checksum = trim($this->request->server['HTTP_OC_CHECKSUM']); - $this->setChecksum($checksum); + $this->fileView->putFileInfo($this->path, ['checksum' => $checksum]); + $this->refreshInfo(); } elseif ($this->getChecksum() !== null && $this->getChecksum() !== '') { - $this->setChecksum(''); + $this->fileView->putFileInfo($this->path, ['checksum' => '']); + $this->refreshInfo(); } } catch (StorageNotAvailableException $e) { throw new ServiceUnavailable("Failed to check file size: " . $e->getMessage(), 0, $e); @@ -686,18 +688,9 @@ class File extends Node implements IFile { return $this->info->getChecksum(); } - public function setChecksum(string $checksum) { - $this->fileView->putFileInfo($this->path, ['checksum' => $checksum]); - $this->refreshInfo(); - } - protected function header($string) { if (!\OC::$CLI) { \header($string); } } - - public function hash(string $type) { - return $this->fileView->hash($type, $this->path); - } } diff --git a/apps/dav/lib/Connector/Sabre/ServerFactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php index e74fbbf47cf..7be24014881 100644 --- a/apps/dav/lib/Connector/Sabre/ServerFactory.php +++ b/apps/dav/lib/Connector/Sabre/ServerFactory.php @@ -177,7 +177,6 @@ class ServerFactory { ) ); $server->addPlugin(new \OCA\DAV\Connector\Sabre\QuotaPlugin($view, true)); - $server->addPlugin(new \OCA\DAV\Connector\Sabre\ChecksumUpdatePlugin()); if ($this->userSession->isLoggedIn()) { $server->addPlugin(new \OCA\DAV\Connector\Sabre\TagsPlugin($objectTree, $this->tagManager)); |