Skip to content

fix: check if we have a user session before setting-up restrictions #1364

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

Merged
skjnldsv merged 1 commit into from
Jul 29, 2025
Merged

fix: check if we have a user session before setting-up restrictions #1364

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
68 changes: 21 additions & 47 deletions lib/RestrictionManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,61 +23,35 @@
use Psr\Log\LoggerInterface;

class RestrictionManager {
/** @var AppWhitelist */
private $whitelist;

/** @var IRequest */
private $request;

/** @var IUserSession */
private $userSession;

/** @var IServerContainer */
private $server;

/** @var Hooks */
private $hooks;

/** @var GuestManager */
private $guestManager;

/** @var IMountProviderCollection */
private $mountProviderCollection;

/** @var Config */
private $config;

/** @var UserBackend */
private $userBackend;

public function __construct(
AppWhitelist $whitelist,
IRequest $request,
IUserSession $userSession,
IServerContainer $server,
Hooks $hooks,
GuestManager $guestManager,
IMountProviderCollection $mountProviderCollection,
Config $config,
UserBackend $userBackend,
private AppWhitelist $whitelist,
private IRequest $request,
private IUserSession $userSession,
private IServerContainer $server,
private Hooks $hooks,
private GuestManager $guestManager,
private IMountProviderCollection $mountProviderCollection,
private Config $config,
private UserBackend $userBackend,
private LoggerInterface $logger,
) {
$this->whitelist = $whitelist;
$this->request = $request;
$this->userSession = $userSession;
$this->server = $server;
$this->hooks = $hooks;
$this->guestManager = $guestManager;
$this->mountProviderCollection = $mountProviderCollection;
$this->config = $config;
$this->userBackend = $userBackend;
}

public function verifyAccess(): void {
$this->whitelist->verifyAccess($this->userSession->getUser(), $this->request);
}

public function setupRestrictions(): void {
if ($this->guestManager->isGuest($this->userSession->getUser())) {
$user = $this->userSession->getUser();

if ($user === null) {
// No user logged in, no restrictions needed
$this->logger->warning('No user session found, skipping guest restrictions setup.');
return;
}

if ($this->guestManager->isGuest($user)) {
\OCP\Util::connectHook('OC_Filesystem', 'preSetup', $this->hooks, 'setupReadonlyFilesystem');
if (!$this->config->allowExternalStorage()) {
$this->mountProviderCollection->registerMountFilter(function (IMountPoint $mountPoint, IUser $user) {
Expand All @@ -88,8 +62,8 @@ public function setupRestrictions(): void {
/** @var NavigationManager $navManager */
$navManager = \OCP\Server::get(INavigationManager::class);

$this->server->registerService(INavigationManager::class, function () use ($navManager) {
return new FilteredNavigationManager($this->userSession->getUser(), $navManager, $this->whitelist);
$this->server->registerService(INavigationManager::class, function () use ($navManager, $user) {
return new FilteredNavigationManager($user, $navManager, $this->whitelist);
});

$settingsManager = $this->server->get(IManager::class);
Expand Down
Loading