Skip to content

fix(s3): ignore prefixes with repeating delimiters #59597

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
leftybournes merged 1 commit into from
Apr 22, 2026
+6 −0
Merged

fix(s3): ignore prefixes with repeating delimiters #59597

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
6 changes: 6 additions & 0 deletions apps/files_external/lib/Lib/Storage/AmazonS3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,12 @@ public function getDirectoryContent(string $directory): \Traversable {
// sub folders
if (is_array($result['CommonPrefixes'])) {
foreach ($result['CommonPrefixes'] as $prefix) {
if (preg_match('/\/{2,}$/', $prefix['Prefix'])) {
Copy link
Copy Markdown
Collaborator

@artonge artonge Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I trust that it works, but I don't get it.

  1. Where are those repeated / coming from? From the NC config or from Amazon?
  2. Do I understand it correctly that this is ignoring repeated / coming from Amazon response?

Copy link
Copy Markdown
Member Author

@leftybournes leftybournes Apr 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. It's coming from Amazon.
  2. Yes, that's right. It's ignoring it but anything after it is also ignored as a result.

$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;
Expand Down
Loading