1 files changed, 53 insertions, 24 deletions

diff --git a/lib/private/Files/ObjectStore/S3.php b/lib/private/Files/ObjectStore/S3.php
index b1cd89388ae..72e1751e23d 100644
--- a/lib/private/Files/ObjectStore/S3.php
+++ b/lib/private/Files/ObjectStore/S3.php
@@ -1,38 +1,23 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2016 Robin Appelman <robin@icewind.nl>
- *
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OC\Files\ObjectStore;
 
 use Aws\Result;
 use Exception;
 use OCP\Files\ObjectStore\IObjectStore;
+use OCP\Files\ObjectStore\IObjectStoreMetaData;
 use OCP\Files\ObjectStore\IObjectStoreMultiPartUpload;
 
-class S3 implements IObjectStore, IObjectStoreMultiPartUpload {
+class S3 implements IObjectStore, IObjectStoreMultiPartUpload, IObjectStoreMetaData {
 	use S3ConnectionTrait;
 	use S3ObjectTrait;
 
-	public function __construct($parameters) {
+	public function __construct(array $parameters) {
 		$parameters['primary_storage'] = true;
 		$this->parseParams($parameters);
 	}
@@ -79,7 +64,7 @@ class S3 implements IObjectStore, IObjectStoreMultiPartUpload {
 				'Key' => $urn,
 				'UploadId' => $uploadId,
 				'MaxParts' => 1000,
-				'PartNumberMarker' => $partNumberMarker
+				'PartNumberMarker' => $partNumberMarker,
 			] + $this->getSSECParameters());
 			$parts = array_merge($parts, $result->get('Parts') ?? []);
 			$isTruncated = $result->get('IsTruncated');
@@ -107,7 +92,51 @@ class S3 implements IObjectStore, IObjectStoreMultiPartUpload {
 		$this->getConnection()->abortMultipartUpload([
 			'Bucket' => $this->bucket,
 			'Key' => $urn,
-			'UploadId' => $uploadId
+			'UploadId' => $uploadId,
 		]);
 	}
+
+	private function parseS3Metadata(array $metadata): array {
+		$result = [];
+		foreach ($metadata as $key => $value) {
+			if (str_starts_with($key, 'x-amz-meta-')) {
+				$result[substr($key, strlen('x-amz-meta-'))] = $value;
+			}
+		}
+		return $result;
+	}
+
+	public function getObjectMetaData(string $urn): array {
+		$object = $this->getConnection()->headObject([
+			'Bucket' => $this->bucket,
+			'Key' => $urn
+		] + $this->getSSECParameters())->toArray();
+		return [
+			'mtime' => $object['LastModified'],
+			'etag' => trim($object['ETag'], '"'),
+			'size' => (int)($object['Size'] ?? $object['ContentLength']),
+		] + $this->parseS3Metadata($object['Metadata'] ?? []);
+	}
+
+	public function listObjects(string $prefix = ''): \Iterator {
+		$results = $this->getConnection()->getPaginator('ListObjectsV2', [
+			'Bucket' => $this->bucket,
+			'Prefix' => $prefix,
+		] + $this->getSSECParameters());
+
+		foreach ($results as $result) {
+			if (is_array($result['Contents'])) {
+				foreach ($result['Contents'] as $object) {
+					yield [
+						'urn' => basename($object['Key']),
+						'metadata' => [
+							'mtime' => $object['LastModified'],
+							'etag' => trim($object['ETag'], '"'),
+							'size' => (int)($object['Size'] ?? $object['ContentLength']),
+						],
+					];
+				}
+			}
+		}
+	}
 }