upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 18:50:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #55964 from nextcloud/backport/55374/stable30
Some checks failed
Integration sqlite / changes (push) Has been cancelled
Details
Psalm static code analysis / static-code-analysis (push) Has been cancelled
Details
Psalm static code analysis / static-code-analysis-security (push) Has been cancelled
Details
Psalm static code analysis / static-code-analysis-ocp (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, --tags ~@large files_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, capabilities_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, collaboration_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, comments_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, dav_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, federation_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, filesdrop_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, ldap_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, openldap_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, openldap_numerical_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, remoteapi_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, setup_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, sharees_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, sharing_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, theming_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite (8.1, stable30, videoverification_features) (push) Has been cancelled
Details
Integration sqlite / integration-sqlite-summary (push) Has been cancelled
Details

Browse source 
[stable30] fix(files): Stop overwriting scan_permissions
This commit is contained in:
Arthur Schiwon 2025-11-18 14:12:01 +01:00 committed by GitHub
commit e8cfbd93ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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

@ -169,7 +169,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

@ -120,7 +120,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;
@ -135,7 +135,7 @@ class PermissionsMask extends Wrapper {
public function getDirectoryContent($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;