Skip to content

[stable16] Fix directory detection for s3 #17271

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
rullzer merged 6 commits into from
Sep 30, 2019
Merged

[stable16] Fix directory detection for s3 #17271

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd7548a
Add method to check if directory exists
kesselb Sep 28, 2018
2b090ff
Rename $location to $path
kesselb Sep 29, 2018
b07f656
Change visibility to private (from protected)
kesselb Sep 29, 2018
1a4b07c
Fill directory cache from opendir
kesselb Jan 1, 2019
42b905c
Don't strip path from directory prefix
kesselb Feb 14, 2019
0263bc2
Use local variable for directory name
kesselb Mar 30, 2019
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
Next Next commit
Rename $location to $path 
Signed-off-by: Daniel Kesselberg <[email protected]>
  • Loading branch information
@kesselb
kesselb authored and Backportbot committed Sep 26, 2019
commit 2b090ffa6f917be77ed48c185a079b448b14b79b
14 changes: 7 additions & 7 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 @@ -148,30 +148,30 @@ private function headObject($key) {
* Implementation from flysystem-aws-s3-v3:
* https://github.com/thephpleague/flysystem-aws-s3-v3/blob/8241e9cc5b28f981e0d24cdaf9867f14c7498ae4/src/AwsS3Adapter.php#L670-L694
*
* @param $location
* @param $path
* @return bool
* @throws \Exception
*/
protected function doesDirectoryExist($location) {
if (!isset($this->directoryCache[$location])) {
protected function doesDirectoryExist($path) {
if (!isset($this->directoryCache[$path])) {
// Maybe this isn't an actual key, but a prefix.
// Do a prefix listing of objects to determine.
try {
$result = $this->getConnection()->listObjects([
'Bucket' => $this->bucket,
'Prefix' => rtrim($location, '/') . '/',
'Prefix' => rtrim($path, '/') . '/',
'MaxKeys' => 1,
]);
$this->directoryCache[$location] = $result['Contents'] || $result['CommonPrefixes'];
$this->directoryCache[$path] = $result['Contents'] || $result['CommonPrefixes'];
} catch (S3Exception $e) {
if ($e->getStatusCode() === 403) {
$this->directoryCache[$location] = false;
$this->directoryCache[$path] = false;
}
throw $e;
}
}

return $this->directoryCache[$location];
return $this->directoryCache[$path];
}

/**
Expand Down