mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix s3 doesDirectoryExist check for empty directories 

if a directory is empty, only the 'marker' object `/` exists.

since not all s3 implementations return just the prefix when listing objects by prefix,
when listing objects by the folder prefix, nothing will be returned if the directory is empty.
by not including the trailing slash in the prefix, the folder marked will always be returned if it exists

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2020-09-09 14:29:11 +02:00 committed by backportbot[bot]
parent c8381c5d17
commit 30ea77c673
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_external/lib/Lib/Storage/AmazonS3.php
View File

@ -160,7 +160,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
try { try {
$result = $this->getConnection()->listObjects([ $result = $this->getConnection()->listObjects([
'Bucket' => $this->bucket, 'Bucket' => $this->bucket,
'Prefix' => rtrim($path, '/') . '/', 'Prefix' => rtrim($path, '/'),
'MaxKeys' => 1, 'MaxKeys' => 1,
]); ]);
$this->directoryCache[$path] = $result['Contents'] || $result['CommonPrefixes']; $this->directoryCache[$path] = $result['Contents'] || $result['CommonPrefixes'];