Merge pull request #59597 from nextcloud/fix/s3_repeating_delimiter

fix(s3): ignore prefixes with repeating delimiters
This commit is contained in:
Kent Delante 2026-04-22 17:30:55 +08:00 committed by GitHub
commit fdfcc004dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -608,6 +608,12 @@ class AmazonS3 extends Common {
// sub folders
if (is_array($result['CommonPrefixes'])) {
foreach ($result['CommonPrefixes'] as $prefix) {
if (preg_match('/\/{2,}$/', $prefix['Prefix'])) {
$this->logger->warning('Detected a repeating delimiter in prefix \'' . $prefix['Prefix']
. '\'. This is unsupported and its contents have been ignored.');
continue;
}
$dir = $this->getDirectoryMetaData($prefix['Prefix']);
if ($dir) {
yield $dir;