upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

fix: ensure all object store configuration have distict bucket names

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2025-09-05 18:26:54 +02:00 committed by Andy Scherzinger
parent 349ca3056c
commit 5cda1696d1
2 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/private/Files/ObjectStore/PrimaryObjectStoreConfig.php
View file

@ -115,7 +115,7 @@ class PrimaryObjectStoreConfig {
// new-style multibucket config uses the same 'objectstore' key but sets `'multibucket' => true`, transparently upgrade older style config
if ($objectStoreMultiBucket) {
$objectStoreMultiBucket['arguments']['multibucket'] = true;
return [
$configs = [
'default' => 'server1',
'server1' => $this->validateObjectStoreConfig($objectStoreMultiBucket),
'root' => 'server1',
@ -135,10 +135,23 @@ class PrimaryObjectStoreConfig {
if (!is_string($objectStore['default'])) {
throw new InvalidObjectStoreConfigurationException('The \'default\' object storage configuration is required to be a reference to another configuration.');
}
return array_map($this->validateObjectStoreConfig(...), $objectStore);
$configs = array_map($this->validateObjectStoreConfig(...), $objectStore);
} else {
return null;
}
$usedBuckets = [];
foreach ($configs as $config) {
if (is_array($config)) {
$bucket = $config['arguments']['bucket'] ?? '';
if (in_array($bucket, $usedBuckets)) {
throw new InvalidObjectStoreConfigurationException('Each object store configuration must use distinct bucket names');
}
$usedBuckets[] = $bucket;
}
}
return $configs;
}
/**

25
tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php
View file

@ -91,12 +91,14 @@ class PrimaryObjectStoreConfigTest extends TestCase {
'class' => StorageObjectStore::class,
'arguments' => [
'host' => 'server1',
'bucket' => '1',
],
],
'server2' => [
'class' => StorageObjectStore::class,
'arguments' => [
'host' => 'server2',
'bucket' => '2',
],
],
]);
@ -119,6 +121,7 @@ class PrimaryObjectStoreConfigTest extends TestCase {
'class' => StorageObjectStore::class,
'arguments' => [
'host' => 'server1',
'bucket' => '1',
],
],
]);
@ -134,14 +137,14 @@ class PrimaryObjectStoreConfigTest extends TestCase {
'host' => 'server1',
'multibucket' => true,
'num_buckets' => 8,
'bucket' => 'bucket-'
'bucket' => 'bucket1-'
],
],
]);
$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
$this->assertEquals('server1', $result['arguments']['host']);
$this->assertEquals('bucket-7', $result['arguments']['bucket']);
$this->assertEquals('bucket1-7', $result['arguments']['bucket']);
$this->setConfig('objectstore', [
'default' => 'server1',
@ -151,18 +154,18 @@ class PrimaryObjectStoreConfigTest extends TestCase {
'host' => 'server1',
'multibucket' => true,
'num_buckets' => 64,
'bucket' => 'bucket-'
'bucket' => 'bucket1-'
],
],
]);
$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
$this->assertEquals('server1', $result['arguments']['host']);
$this->assertEquals('bucket-7', $result['arguments']['bucket']);
$this->assertEquals('bucket1-7', $result['arguments']['bucket']);
$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test-foo'));
$this->assertEquals('server1', $result['arguments']['host']);
$this->assertEquals('bucket-40', $result['arguments']['bucket']);
$this->assertEquals('bucket1-40', $result['arguments']['bucket']);
$this->setConfig('objectstore', [
'default' => 'server2',
@ -172,7 +175,7 @@ class PrimaryObjectStoreConfigTest extends TestCase {
'host' => 'server1',
'multibucket' => true,
'num_buckets' => 64,
'bucket' => 'bucket-'
'bucket' => 'bucket1-'
],
],
'server2' => [
@ -181,18 +184,18 @@ class PrimaryObjectStoreConfigTest extends TestCase {
'host' => 'server2',
'multibucket' => true,
'num_buckets' => 16,
'bucket' => 'bucket-'
'bucket' => 'bucket2-'
],
],
]);
$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
$this->assertEquals('server1', $result['arguments']['host']);
$this->assertEquals('bucket-7', $result['arguments']['bucket']);
$this->assertEquals('bucket1-7', $result['arguments']['bucket']);
$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test-bar'));
$this->assertEquals('server2', $result['arguments']['host']);
$this->assertEquals('bucket-4', $result['arguments']['bucket']);
$this->assertEquals('bucket2-4', $result['arguments']['bucket']);
}
public function testMultibucketOldConfig() {
@ -249,12 +252,14 @@ class PrimaryObjectStoreConfigTest extends TestCase {
'class' => StorageObjectStore::class,
'arguments' => [
'host' => 'server1',
'bucket' => '1',
],
],
'server2' => [
'class' => StorageObjectStore::class,
'arguments' => [
'host' => 'server2',
'bucket' => '2',
],
],
]);
@ -269,12 +274,14 @@ class PrimaryObjectStoreConfigTest extends TestCase {
'class' => StorageObjectStore::class,
'arguments' => [
'host' => 'server1',
'bucket' => '1',
],
],
'server2' => [
'class' => StorageObjectStore::class,
'arguments' => [
'host' => 'server2',
'bucket' => '2',
],
],
]);