From 2004ae46030734080fa2fcf73ec54a3893333408 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 9 Sep 2020 15:19:04 +0200
Subject: [PATCH] Set delimiter so that the CommonPrefixes response can
properly be determined
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
apps/files_external/lib/Lib/Storage/AmazonS3.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php
index dc725188979..4510de8b6ec 100644
--- a/apps/files_external/lib/Lib/Storage/AmazonS3.php
+++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php
@@ -163,8 +163,9 @@ class AmazonS3 extends \OC\Files\Storage\Common {
'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;
--
GitLab