diff options
author | blizzz <blizzz@arthur-schiwon.de> | 2022-06-01 15:36:54 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-01 15:36:54 +0300 |
commit | b1c793e6632b26b6c7e12c5f24b03a5b77482e69 (patch) | |
tree | 40fbfcda8d52dbf50294e1b3da6acad2024ecb28 | |
parent | 010924916c74e62089131ff9f62b8b0e96ff539b (diff) | |
parent | 1b426eda44f59648d2f1c5b79a06c78ff74c9fce (diff) |
Merge pull request #32686 from nextcloud/perf/make-x-hash-optin
Make X-HAS-{MD5/SHA256} opt-in
-rw-r--r-- | apps/dav/lib/Connector/Sabre/File.php | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php index 37fb109a3bd..ebcfdabc6b3 100644 --- a/apps/dav/lib/Connector/Sabre/File.php +++ b/apps/dav/lib/Connector/Sabre/File.php @@ -215,15 +215,26 @@ class File extends Node implements IFile { $data = $tmpData; } - $data = HashWrapper::wrap($data, 'md5', function ($hash) { - $this->header('X-Hash-MD5: ' . $hash); - }); - $data = HashWrapper::wrap($data, 'sha1', function ($hash) { - $this->header('X-Hash-SHA1: ' . $hash); - }); - $data = HashWrapper::wrap($data, 'sha256', function ($hash) { - $this->header('X-Hash-SHA256: ' . $hash); - }); + if ($this->request->getHeader('X-HASH') !== '') { + $hash = $this->request->getHeader('X-HASH'); + if ($hash === 'all' || $hash === 'md5') { + $data = HashWrapper::wrap($data, 'md5', function ($hash) { + $this->header('X-Hash-MD5: ' . $hash); + }); + } + + if ($hash === 'all' || $hash === 'sha1') { + $data = HashWrapper::wrap($data, 'sha1', function ($hash) { + $this->header('X-Hash-SHA1: ' . $hash); + }); + } + + if ($hash === 'all' || $hash === 'sha256') { + $data = HashWrapper::wrap($data, 'sha256', function ($hash) { + $this->header('X-Hash-SHA256: ' . $hash); + }); + } + } if ($partStorage->instanceOfStorage(Storage\IWriteStreamStorage::class)) { $isEOF = false; |