Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable23] Fix hook encryption with cron job #32987

Merged
merged 1 commit into from
Jul 7, 2022
Merged

[stable23] Fix hook encryption with cron job #32987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/files_sharing/lib/ExpireSharesJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function run($argument) {
)
);

$shares = $qb->execute();
$shares = $qb->executeQuery();
while ($share = $shares->fetch()) {
if ((int)$share['share_type'] === IShare::TYPE_LINK) {
$id = 'ocinternal';
Expand Down
35 changes: 22 additions & 13 deletions lib/private/Encryption/HookManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,36 +28,45 @@
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(
Expand Down