Skip to content

refactor(files_sharing): clarify failed shared-storage cache handling #62485

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

Draft
joshtrichards wants to merge 1 commit into
base: master
Choose a base branch
from
+36 −15
Draft

refactor(files_sharing): clarify failed shared-storage cache handling #62485

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
51 changes: 36 additions & 15 deletions apps/files_sharing/lib/SharedStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,13 @@ class SharedStorage extends Jail implements LegacyISharedStorage, ISharedStorage
private $initialized = false;

/**
* @var ICacheEntry
* The cache entry for the source node, or false when it cannot be found.
*
* `null` means the entry has not been resolved yet.
*
* @var ICacheEntry|false|null
*/
private $sourceRootInfo;
private ICacheEntry|false|null $sourceRootInfo = null;

/** @var string */
private $user;
Expand Down Expand Up @@ -120,18 +124,25 @@ public function __construct(array $parameters) {
}

/**
* @return ICacheEntry
* Resolve the source node's cache entry.
*
* A failed storage supplies a synthetic root entry through FailedCache. Its
* permissions do not include sharing, so isValid() safely denies access.
*
* @return ICacheEntry|false
*/
private function getSourceRootInfo() {
if (is_null($this->sourceRootInfo)) {
if (is_null($this->superShare->getNodeCacheEntry())) {
$this->init();
$this->sourceRootInfo = $this->nonMaskedStorage->getCache()->get($this->rootPath);
} else {
$this->sourceRootInfo = $this->superShare->getNodeCacheEntry();
}
private function getSourceRootInfo(): ICacheEntry|false {
if ($this->sourceRootInfo !== null) {
return $this->sourceRootInfo;
}

$sourceRootInfo = $this->superShare->getNodeCacheEntry();
if ($sourceRootInfo === null) {
$this->init();
$sourceRootInfo = $this->nonMaskedStorage->getCache()->get($this->rootPath);
}
return $this->sourceRootInfo;

return $this->sourceRootInfo = $sourceRootInfo;
}

/**
Expand Down Expand Up @@ -236,7 +247,9 @@ public function getShareId() {
}

private function isValid(): bool {
return $this->getSourceRootInfo() && ($this->getSourceRootInfo()->getPermissions() & Constants::PERMISSION_SHARE) === Constants::PERMISSION_SHARE;
$sourceRootInfo = $this->getSourceRootInfo();
return $sourceRootInfo !== false
&& ($sourceRootInfo->getPermissions() & Constants::PERMISSION_SHARE) === Constants::PERMISSION_SHARE;
}

#[\Override]
Expand Down Expand Up @@ -419,12 +432,19 @@ public function getCache(string $path = '', ?IStorage $storage = null): ICache {
if ($this->cache) {
return $this->cache;
}

$this->init();
if ($this->cache) {
return $this->cache;
}

if (!$storage) {
$storage = $this;
}

$sourceRoot = $this->getSourceRootInfo();
if ($this->storage instanceof FailedStorage) {
return new FailedCache();
if ($sourceRoot === false) {
return $this->cache = new FailedCache();
}

$this->cache = new Cache(
Expand All @@ -433,6 +453,7 @@ public function getCache(string $path = '', ?IStorage $storage = null): ICache {
$this->cacheDependencies,
$this->getShare()
);

return $this->cache;
}

Expand Down
Loading