upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-13 17:10:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix hook encryption with cron job

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

Backport of #29674

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
This commit is contained in:
Carl Schwan 2022-03-31 11:18:03 +02:00
parent 63fb2e0281
commit 003b2a4e4f
2 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files_sharing/lib/ExpireSharesJob.php
View file

@ -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';

35
lib/private/Encryption/HookManager.php
View file

@ -28,36 +28,45 @@ use OC\Files\View;
use Psr\Log\LoggerInterface;
class HookManager {
/**
* @var Update
*/
private static $updater;
/** @var ?Update */
private static $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();
}
\OC_Util::setupFS($uid);
self::$updater = new Update(
new View(),
new Util(