Skip to content

fix: ensure all object store configuration have distict bucket names #54920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2025
+31 −11
Merged

fix: ensure all object store configuration have distict bucket names #54920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions lib/private/Files/ObjectStore/PrimaryObjectStoreConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public function getObjectStoreConfigs(): ?array {
// 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',
Expand All @@ -135,10 +135,23 @@ public function getObjectStoreConfigs(): ?array {
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;
}

/**
Expand Down
25 changes: 16 additions & 9 deletions tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,14 @@ public function testExistingUserKeepsStorage() {
'class' => StorageObjectStore::class,
'arguments' => [
'host' => 'server1',
'bucket' => '1',
],
],
'server2' => [
'class' => StorageObjectStore::class,
'arguments' => [
'host' => 'server2',
'bucket' => '2',
],
],
]);
Expand All @@ -119,6 +121,7 @@ public function testNestedAliases() {
'class' => StorageObjectStore::class,
'arguments' => [
'host' => 'server1',
'bucket' => '1',
],
],
]);
Expand All @@ -134,14 +137,14 @@ public function testMultibucketChangedConfig() {
'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',
Expand All @@ -151,18 +154,18 @@ public function testMultibucketChangedConfig() {
'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',
Expand All @@ -172,7 +175,7 @@ public function testMultibucketChangedConfig() {
'host' => 'server1',
'multibucket' => true,
'num_buckets' => 64,
'bucket' => 'bucket-'
'bucket' => 'bucket1-'
],
],
'server2' => [
Expand All @@ -181,18 +184,18 @@ public function testMultibucketChangedConfig() {
'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() {
Expand Down Expand Up @@ -249,12 +252,14 @@ public function testRoot() {
'class' => StorageObjectStore::class,
'arguments' => [
'host' => 'server1',
'bucket' => '1',
],
],
'server2' => [
'class' => StorageObjectStore::class,
'arguments' => [
'host' => 'server2',
'bucket' => '2',
],
],
]);
Expand All @@ -269,12 +274,14 @@ public function testRoot() {
'class' => StorageObjectStore::class,
'arguments' => [
'host' => 'server1',
'bucket' => '1',
],
],
'server2' => [
'class' => StorageObjectStore::class,
'arguments' => [
'host' => 'server2',
'bucket' => '2',
],
],
]);
Expand Down
Loading