Fix hook encryption with cron job

Make sure the setup fs is set before using the Update service

Fix #29674

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

diff --git a/apps/files_sharing/lib/ExpireSharesJob.php b/apps/files_sharing/lib/ExpireSharesJob.php
index dd0979e4b0be128451916a804ad6a9f6f5664c59..f5eb5856aeaf8915f8e8485ebdb383eb4a97862b 100644 (file)
--- a/apps/files_sharing/lib/ExpireSharesJob.php
+++ b/apps/files_sharing/lib/ExpireSharesJob.php
@@ -85,7 +85,7 @@ class ExpireSharesJob extends TimedJob {
                                )
                        );
 
-               $shares = $qb->execute();
+               $shares = $qb->executeQuery();
                while ($share = $shares->fetch()) {
                        if ((int)$share['share_type'] === IShare::TYPE_LINK) {
                                $id = 'ocinternal';

diff --git a/lib/private/Encryption/HookManager.php b/lib/private/Encryption/HookManager.php
index a2d6b990a88a0bf2316d5872044b91814a709048..5081bcccf948db4f343568eb1b74e14e2def0608 100644 (file)
--- a/lib/private/Encryption/HookManager.php
+++ b/lib/private/Encryption/HookManager.php
@@ -25,39 +25,51 @@ namespace OC\Encryption;
 
 use OC\Files\Filesystem;
 use OC\Files\View;
+use OC\Files\SetupManager;
 use Psr\Log\LoggerInterface;
 
 class HookManager {
-       /**
-        * @var Update
-        */
-       private static $updater;
+       private static ?Update $updater = null;
 
-       public static function postShared($params) {
+       public static function postShared($params): void {
                self::getUpdate()->postShared($params);
        }
-       public static function postUnshared($params) {
-               self::getUpdate()->postUnshared($params);
+       public static function postUnshared($params): void {
+               // In case the unsharing happens in a background job, we don't have
+               // a session and we load instead the user from the UserManager
+               $path = Filesystem::getPath($params['fileSource']);
+               $owner = Filesystem::getOwner($path);
+               self::getUpdate($owner)->postUnshared($params);
        }
 
-       public static function postRename($params) {
+       public static function postRename($params): void {
                self::getUpdate()->postRename($params);
        }
 
-       public static function postRestore($params) {
+       public static function postRestore($params): void {
                self::getUpdate()->postRestore($params);
        }
 
-       /**
-        * @return Update
-        */
-       private static function getUpdate() {
+       private static function getUpdate(?string $owner = null): Update {
                if (is_null(self::$updater)) {
                        $user = \OC::$server->getUserSession()->getUser();
+                       if (!$user && $owner) {
+                               $user = \OC::$server->getUserManager()->get($owner);
+                       }
+                       if (!$user) {
+                               throw new \Exception("Inconsistent data, File unshared, but owner not found. Should not happen");
+                       }
+
                        $uid = '';
                        if ($user) {
                                $uid = $user->getUID();
                        }
+
+                       $setupManager = \OC::$server->get(SetupManager::class);
+                       if (!$setupManager->isSetupComplete($user)) {
+                               $setupManager->setupForUser($user);
+                       }
+
                        self::$updater = new Update(
                                new View(),
                                new Util(