aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Encryption/Manager.php
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2023-01-10 13:48:31 +0100
committerRobin Appelman <robin@icewind.nl>2023-08-31 19:46:47 +0200
commite4f85226c575d7013bedf6bfcccead006d97ceb9 (patch)
tree6319ef37adf1ec247bed806c0ba357bad7c95135 /lib/private/Encryption/Manager.php
parenta3d37c531a91f39ade3c6c9aa860744bfd452097 (diff)
downloadnextcloud-server-e4f85226c575d7013bedf6bfcccead006d97ceb9.tar.gz
nextcloud-server-e4f85226c575d7013bedf6bfcccead006d97ceb9.zip
extend fix-key-location to handle cases from broken cross-storage moves
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private/Encryption/Manager.php')
-rw-r--r--lib/private/Encryption/Manager.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/private/Encryption/Manager.php b/lib/private/Encryption/Manager.php
index f751bd94b28..28bee7dacb7 100644
--- a/lib/private/Encryption/Manager.php
+++ b/lib/private/Encryption/Manager.php
@@ -32,6 +32,8 @@ use OC\Memcache\ArrayCache;
use OC\ServiceUnavailableException;
use OCP\Encryption\IEncryptionModule;
use OCP\Encryption\IManager;
+use OCP\Files\Mount\IMountPoint;
+use OCP\Files\Storage\IStorage;
use OCP\IConfig;
use OCP\IL10N;
use Psr\Log\LoggerInterface;
@@ -234,6 +236,11 @@ class Manager implements IManager {
}
}
+ public function forceWrapStorage(IMountPoint $mountPoint, IStorage $storage) {
+ $encryptionWrapper = new EncryptionWrapper($this->arrayCache, $this, $this->logger);
+ return $encryptionWrapper->wrapStorage($mountPoint->getMountPoint(), $storage, $mountPoint, true);
+ }
+
/**
* check if key storage is ready