upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

properly handle cases where cache wrappers block access

Browse source 
`CacheWrapper::formatCacheEntry` can return false for files that should be filtered out

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2021-08-11 17:35:37 +02:00 committed by John Molakvoæ
parent 63d3931e80
commit 118c647f61
No known key found for this signature in database
GPG key ID: 60C25B8C072916CF
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/psalm-baseline.xml
View file

@ -3509,9 +3509,6 @@
<code>string</code>
<code>string</code>
</InvalidReturnType>
<NullableReturnStatement occurrences="1">
<code>$this-&gt;view-&gt;hash($type, $this-&gt;path, $raw)</code>
</NullableReturnStatement>
<UndefinedThisPropertyAssignment occurrences="1">
<code>$this-&gt;exists</code>
</UndefinedThisPropertyAssignment>

2
lib/private/Files/Cache/Wrapper/CacheJail.php
View file

@ -328,7 +328,7 @@ class CacheJail extends CacheWrapper {
if ($rawEntry) {
$jailedPath = $this->getJailedPath($rawEntry->getPath());
if ($jailedPath !== null) {
return $this->formatCacheEntry(clone $rawEntry);
return $this->formatCacheEntry(clone $rawEntry) ?: null;
}
}

5
lib/private/Files/Cache/Wrapper/CacheWrapper.php
View file

@ -60,7 +60,7 @@ class CacheWrapper extends Cache {
* Make it easy for wrappers to modify every returned cache entry
*
* @param ICacheEntry $entry
* @return ICacheEntry
* @return ICacheEntry|false
*/
protected function formatCacheEntry($entry) {
return $entry;
@ -311,7 +311,8 @@ class CacheWrapper extends Cache {
public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEntry {
$rawEntry = $this->getCache()->getCacheEntryFromSearchResult($rawEntry);
if ($rawEntry) {
return $this->formatCacheEntry(clone $rawEntry);
$entry = $this->formatCacheEntry(clone $rawEntry);
return $entry ?: null;
}
return null;