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.

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

[stable24] use a lazy user for the file owner when listing a directory #32118

Merged
merged 1 commit into from
Apr 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions lib/composer/composer/autoload_classmap.php
Original file line number Diff line number Diff line change
Expand Up @@ -1541,6 +1541,7 @@
'OC\\User\\Backend' => $baseDir . '/lib/private/User/Backend.php',
'OC\\User\\Database' => $baseDir . '/lib/private/User/Database.php',
'OC\\User\\DisplayNameCache' => $baseDir . '/lib/private/User/DisplayNameCache.php',
'OC\\User\\LazyUser' => $baseDir . '/lib/private/User/LazyUser.php',
'OC\\User\\LoginException' => $baseDir . '/lib/private/User/LoginException.php',
'OC\\User\\Manager' => $baseDir . '/lib/private/User/Manager.php',
'OC\\User\\NoUserException' => $baseDir . '/lib/private/User/NoUserException.php',
Expand Down
1 change: 1 addition & 0 deletions lib/composer/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -1570,6 +1570,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\User\\Backend' => __DIR__ . '/../../..' . '/lib/private/User/Backend.php',
'OC\\User\\Database' => __DIR__ . '/../../..' . '/lib/private/User/Database.php',
'OC\\User\\DisplayNameCache' => __DIR__ . '/../../..' . '/lib/private/User/DisplayNameCache.php',
'OC\\User\\LazyUser' => __DIR__ . '/../../..' . '/lib/private/User/LazyUser.php',
'OC\\User\\LoginException' => __DIR__ . '/../../..' . '/lib/private/User/LoginException.php',
'OC\\User\\Manager' => __DIR__ . '/../../..' . '/lib/private/User/Manager.php',
'OC\\User\\NoUserException' => __DIR__ . '/../../..' . '/lib/private/User/NoUserException.php',
Expand Down
16 changes: 8 additions & 8 deletions lib/private/Files/View.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
use Icewind\Streams\CallbackWrapper;
use OC\Files\Mount\MoveableMount;
use OC\Files\Storage\Storage;
use OC\User\DisplayNameCache;
use OC\User\LazyUser;
use OC\User\User;
use OCA\Files_Sharing\SharedMount;
use OCP\Constants;
Expand Down Expand Up @@ -102,6 +104,8 @@ class View {
/** @var \OCP\ILogger */
private $logger;

private DisplayNameCache $displayNameCache;

/**
* @param string $root
* @throws \Exception If $root contains an invalid path
Expand All @@ -118,6 +122,7 @@ public function __construct($root = '') {
$this->lockingProvider = \OC::$server->getLockingProvider();
$this->lockingEnabled = !($this->lockingProvider instanceof \OC\Lock\NoopLockingProvider);
$this->userManager = \OC::$server->getUserManager();
$this->displayNameCache = \OC::$server->get(DisplayNameCache::class);
$this->logger = \OC::$server->getLogger();
}

Expand Down Expand Up @@ -1312,15 +1317,10 @@ public function hasUpdated($path, $time) {

/**
* @param string $ownerId
* @return \OC\User\User
* @return IUser
*/
private function getUserObjectForOwner($ownerId) {
$owner = $this->userManager->get($ownerId);
if ($owner instanceof IUser) {
return $owner;
} else {
return new User($ownerId, null, \OC::$server->getEventDispatcher());
}
private function getUserObjectForOwner(string $ownerId) {
return new LazyUser($ownerId, $this->displayNameCache, $this->userManager);
}

/**
Expand Down
149 changes: 149 additions & 0 deletions lib/private/User/LazyUser.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
<?php

declare(strict_types=1);
/**
* @copyright Copyright (c) 2022 Robin Appelman <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

namespace OC\User;

use OCP\IUser;
use OCP\IUserManager;

class LazyUser implements IUser {
private ?IUser $user = null;
private DisplayNameCache $displayNameCache;
private string $uid;
private IUserManager $userManager;

public function __construct(string $uid, DisplayNameCache $displayNameCache, IUserManager $userManager) {
$this->displayNameCache = $displayNameCache;
$this->uid = $uid;
$this->userManager = $userManager;
}

private function getUser(): IUser {
if ($this->user === null) {
$this->user = $this->userManager->get($this->uid);
}
/** @var IUser */
$user = $this->user;
return $user;
}

public function getUID() {
return $this->uid;
}

public function getDisplayName() {
return $this->displayNameCache->getDisplayName($this->uid);
}

public function setDisplayName($displayName) {
return $this->getUser()->setDisplayName($displayName);
}

public function getLastLogin() {
return $this->getUser()->getLastLogin();
}

public function updateLastLoginTimestamp() {
return $this->getUser()->updateLastLoginTimestamp();
}

public function delete() {
return $this->getUser()->delete();
}

public function setPassword($password, $recoveryPassword = null) {
return $this->getUser()->setPassword($password, $recoveryPassword);
}

public function getHome() {
return $this->getUser()->getHome();
}

public function getBackendClassName() {
return $this->getUser()->getBackendClassName();
}

public function getBackend() {
return $this->getUser()->getBackend();
}

public function canChangeAvatar() {
return $this->getUser()->canChangeAvatar();
}

public function canChangePassword() {
return $this->getUser()->canChangePassword();
}

public function canChangeDisplayName() {
return $this->getUser()->canChangeDisplayName();
}

public function isEnabled() {
return $this->getUser()->isEnabled();
}

public function setEnabled(bool $enabled = true) {
return $this->getUser()->setEnabled($enabled);
}

public function getEMailAddress() {
return $this->getUser()->getEMailAddress();
}

public function getSystemEMailAddress(): ?string {
return $this->getUser()->getSystemEMailAddress();
}

public function getPrimaryEMailAddress(): ?string {
return $this->getUser()->getPrimaryEMailAddress();
}

public function getAvatarImage($size) {
return $this->getUser()->getAvatarImage($size);
}

public function getCloudId() {
return $this->getUser()->getCloudId();
}

public function setEMailAddress($mailAddress) {
$this->getUser()->setEMailAddress($mailAddress);
}

public function setSystemEMailAddress(string $mailAddress): void {
$this->getUser()->setSystemEMailAddress($mailAddress);
}

public function setPrimaryEMailAddress(string $mailAddress): void {
$this->getUser()->setPrimaryEMailAddress($mailAddress);
}

public function getQuota() {
return $this->getUser()->getQuota();
}

public function setQuota($quota) {
$this->getUser()->setQuota($quota);
}
}