upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #53733 from nextcloud/copy-all-permissions

Browse source 
fix: give target file all permissions on copy
This commit is contained in:
Robin Appelman 2026-03-10 18:09:33 +01:00 committed by GitHub
commit 38a42d9ad4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,7 @@ use OC\Files\Search\SearchComparison;
use OC\Files\Search\SearchQuery;
use OC\Files\Storage\Wrapper\Encryption;
use OC\SystemConfig;
use OCP\Constants;
use OCP\DB\Exception;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\EventDispatcher\IEventDispatcher;
@ -1224,6 +1225,12 @@ class Cache implements ICache {
throw new \RuntimeException('Invalid source cache entry on copyFromCache');
}
$data = $this->cacheEntryToArray($sourceEntry);
// since we are essentially creating a new file, we don't have to obey the source permissions
if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
$data['permissions'] = Constants::PERMISSION_ALL;
} else {
$data['permissions'] = Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE;
}
// when moving from an encrypted storage to a non-encrypted storage remove the `encrypted` mark
if ($sourceCache instanceof Cache

7
lib/private/Files/ObjectStore/ObjectStoreStorage.php
View file

@ -44,8 +44,6 @@ class ObjectStoreStorage extends Common implements IChunkedFileWrite {
private string $objectPrefix = 'urn:oid:';
private LoggerInterface $logger;
private bool $handleCopiesAsOwned;
protected bool $validateWrites = true;
private bool $preserveCacheItemsOnDelete = false;
private ?int $totalSizeLimit = null;
@ -71,7 +69,6 @@ class ObjectStoreStorage extends Common implements IChunkedFileWrite {
if (isset($parameters['validateWrites'])) {
$this->validateWrites = (bool)$parameters['validateWrites'];
}
$this->handleCopiesAsOwned = (bool)($parameters['handleCopiesAsOwned'] ?? false);
if (isset($parameters['totalSizeLimit'])) {
$this->totalSizeLimit = $parameters['totalSizeLimit'];
}
@ -734,10 +731,6 @@ class ObjectStoreStorage extends Common implements IChunkedFileWrite {
try {
$this->objectStore->copyObject($sourceUrn, $targetUrn);
if ($this->handleCopiesAsOwned) {
// Copied the file thus we gain all permissions as we are the owner now ! warning while this aligns with local storage it should not be used and instead fix local storage !
$cache->update($targetId, ['permissions' => Constants::PERMISSION_ALL]);
}
} catch (\Exception $e) {
$cache->remove($to);

22
tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php
View file

@ -223,28 +223,8 @@ class ObjectStoreStorageTest extends Storage {
$this->assertEquals('3', $this->instance->file_get_contents('b/target/sub/3.txt'));
}
public function testCopyPreservesPermissions(): void {
$cache = $this->instance->getCache();
$this->instance->file_put_contents('test.txt', 'foo');
$this->assertTrue($cache->inCache('test.txt'));
$cache->update($cache->getId('test.txt'), ['permissions' => Constants::PERMISSION_READ]);
$this->assertEquals(Constants::PERMISSION_READ, $this->instance->getPermissions('test.txt'));
$this->assertTrue($this->instance->copy('test.txt', 'new.txt'));
$this->assertTrue($cache->inCache('new.txt'));
$this->assertEquals(Constants::PERMISSION_READ, $this->instance->getPermissions('new.txt'));
}
/**
* Test that copying files will drop permissions like local storage does
* TODO: Drop this and fix local storage
*/
public function testCopyGrantsPermissions(): void {
$config['objectstore'] = $this->objectStorage;
$config['handleCopiesAsOwned'] = true;
$instance = new ObjectStoreStorageOverwrite($config);
$cache = $instance->getCache();
@ -258,7 +238,7 @@ class ObjectStoreStorageTest extends Storage {
$this->assertTrue($instance->copy('test.txt', 'new.txt'));
$this->assertTrue($cache->inCache('new.txt'));
$this->assertEquals(Constants::PERMISSION_ALL, $instance->getPermissions('new.txt'));
$this->assertEquals(Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE, $instance->getPermissions('new.txt'));
}
public function testCopyFolderSize(): void {