Skip to content

fix s3 doesDirectoryExist check for empty directories #22747

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
MorrisJobke merged 2 commits into from
Sep 10, 2020
Merged

fix s3 doesDirectoryExist check for empty directories #22747

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc96fa0
fix s3 doesDirectoryExist check for empty directories
icewind1991 Sep 9, 2020
2004ae4
Set delimiter so that the CommonPrefixes response can properly be det…
juliusknorr Sep 9, 2020
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
Prev Previous commit
Set delimiter so that the CommonPrefixes response can properly be det… 
…ermined

Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Sep 10, 2020
commit 2004ae46030734080fa2fcf73ec54a3893333408
3 changes: 2 additions & 1 deletion 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 @@ -163,8 +163,9 @@ private function doesDirectoryExist($path) {
'Bucket' => $this->bucket,
'Prefix' => rtrim($path, '/'),
'MaxKeys' => 1,
'Delimiter' => '/',
]);
$this->directoryCache[$path] = $result['Contents'] || $result['CommonPrefixes'];
$this->directoryCache[$path] = ($result['Contents'][0]['Key'] === rtrim($path, '/') . '/') || $result['CommonPrefixes'];
} catch (S3Exception $e) {
if ($e->getStatusCode() === 403) {
$this->directoryCache[$path] = false;
Expand Down