upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 17:52:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

fix(files): Stop overwriting scan_permissions

Browse source 
Signed-off-by: provokateurin <kate@provokateurin.de>
This commit is contained in:
provokateurin 2025-09-28 14:03:53 +02:00 committed by backportbot[bot]
parent 10609e9cc4
commit 9985baeb09
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -173,7 +173,7 @@ class Cache implements ICache {
$data['storage_mtime'] = $data['mtime'];
}
if (isset($data['f_permissions'])) {
$data['scan_permissions'] = $data['f_permissions'];
$data['scan_permissions'] ??= $data['f_permissions'];
}
$data['permissions'] = (int)$data['permissions'];
if (isset($data['creation_time'])) {

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

@ -24,7 +24,7 @@ class CachePermissionsMask extends CacheWrapper {
protected function formatCacheEntry($entry) {
if (isset($entry['permissions'])) {
$entry['scan_permissions'] = $entry['permissions'];
$entry['scan_permissions'] ??= $entry['permissions'];
$entry['permissions'] &= $this->mask;
}
return $entry;

4
lib/private/Files/Storage/Wrapper/PermissionsMask.php
View file

@ -114,7 +114,7 @@ class PermissionsMask extends Wrapper {
$data = parent::getMetaData($path);
if ($data && isset($data['permissions'])) {
$data['scan_permissions'] = $data['scan_permissions'] ?? $data['permissions'];
$data['scan_permissions'] ??= $data['permissions'];
$data['permissions'] &= $this->mask;
}
return $data;
@ -129,7 +129,7 @@ class PermissionsMask extends Wrapper {
public function getDirectoryContent(string $directory): \Traversable {
foreach ($this->getWrapperStorage()->getDirectoryContent($directory) as $data) {
$data['scan_permissions'] = $data['scan_permissions'] ?? $data['permissions'];
$data['scan_permissions'] ??= $data['permissions'];
$data['permissions'] &= $this->mask;
yield $data;