Fixes #8326: deletion of directories on S3

1 files changed, 12 insertions, 17 deletions

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index cfc9b5145d3..5d9c4d858c6 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -191,26 +191,17 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			return false;
 		}
 
-		$dh = $this->opendir($path);
-
-		if(is_resource($dh)) {
-			while (($file = readdir($dh)) !== false) {
-				if ($file === '.' || $file === '..') {
-					continue;
-				}
-
-				if ($this->is_dir($path . '/' . $file)) {
-					$this->rmdir($path . '/' . $file);
-				} else {
-					$this->unlink($path . '/' . $file);
-				}
-			}
-		}
+		// Since there are no real directories on S3, we need
+		// to delete all objects prefixed with the path.
+		$objects = $this->connection->listObjects([
+			'Bucket' => $this->bucket,
+			'Prefix' => $path . '/'
+		]);
 
 		try {
-			$result = $this->connection->deleteObject(array(
+			$result = $this->connection->deleteObjects(array(
 				'Bucket' => $this->bucket,
-				'Key' => $path . '/'
+				'Objects' => $objects['Contents']
 			));
 			$this->testTimeout();
 		} catch (S3Exception $e) {
@@ -311,6 +302,10 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 	public function unlink($path) {
 		$path = $this->normalizePath($path);
 
+		if ( $this->is_dir($path) ) {
+			return $this->rmdir($path);
+		}
+
 		try {
 			$result = $this->connection->deleteObject(array(
 				'Bucket' => $this->bucket,