remove storage wrappers when deleting the user storage

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener.php b/lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener.php
index fa7459e10ff977d0d825c67f301ee310f3531052..2fb05159d091f3208fd250748b542608de91284c 100644 (file)
--- a/lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener.php
+++ b/lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener.php
@@ -26,6 +26,7 @@ declare(strict_types=1);
 namespace OC\Authentication\Listeners;
 
 use OC\Files\Cache\Cache;
+use OC\Files\Storage\Wrapper\Wrapper;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Files\Config\IMountProviderCollection;
@@ -56,6 +57,13 @@ class UserDeletedFilesCleanupListener implements IEventListener {
                        if (!$storage) {
                                throw new \Exception("User has no home storage");
                        }
+
+                       // remove all wrappers, so we do the delete directly on the home storage bypassing any wrapper
+                       while ($storage->instanceOfStorage(Wrapper::class)) {
+                               /** @var Wrapper $storage */
+                               $storage = $storage->getWrapperStorage();
+                       }
+
                        $this->homeStorageCache[$event->getUser()->getUID()] = $storage;
                }
                if ($event instanceof UserDeletedEvent) {