nextcloud / server

lib/private/Files/ObjectStore/S3ConnectionTrait.php

Indentation +217 added lines, -217 removed lines

@@ -44,221 +44,221 @@
 use Psr\Log\LoggerInterface;
 
 trait S3ConnectionTrait {
-	/** @var array */
-	protected $params;
-
-	/** @var S3Client */
-	protected $connection;
-
-	/** @var string */
-	protected $id;
-
-	/** @var string */
-	protected $bucket;
-
-	/** @var int */
-	protected $timeout;
-
-	/** @var string */
-	protected $proxy;
-
-	/** @var string */
-	protected $storageClass;
-
-	/** @var int */
-	protected $uploadPartSize;
-
-	/** @var int */
-	private $putSizeLimit;
-
-	protected $test;
-
-	protected function parseParams($params) {
-		if (empty($params['bucket'])) {
-			throw new \Exception("Bucket has to be configured.");
-		}
-
-		$this->id = 'amazon::' . $params['bucket'];
-
-		$this->test = isset($params['test']);
-		$this->bucket = $params['bucket'];
-		$this->proxy = $params['proxy'] ?? false;
-		$this->timeout = $params['timeout'] ?? 15;
-		$this->storageClass = !empty($params['storageClass']) ? $params['storageClass'] : 'STANDARD';
-		$this->uploadPartSize = $params['uploadPartSize'] ?? 524288000;
-		$this->putSizeLimit = $params['putSizeLimit'] ?? 104857600;
-		$params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region'];
-		$params['hostname'] = empty($params['hostname']) ? 's3.' . $params['region'] . '.amazonaws.com' : $params['hostname'];
-		if (!isset($params['port']) || $params['port'] === '') {
-			$params['port'] = (isset($params['use_ssl']) && $params['use_ssl'] === false) ? 80 : 443;
-		}
-		$params['verify_bucket_exists'] = empty($params['verify_bucket_exists']) ? true : $params['verify_bucket_exists'];
-		$this->params = $params;
-	}
-
-	public function getBucket() {
-		return $this->bucket;
-	}
-
-	public function getProxy() {
-		return $this->proxy;
-	}
-
-	/**
-	 * Returns the connection
-	 *
-	 * @return S3Client connected client
-	 * @throws \Exception if connection could not be made
-	 */
-	public function getConnection() {
-		if (!is_null($this->connection)) {
-			return $this->connection;
-		}
-
-		$scheme = (isset($this->params['use_ssl']) && $this->params['use_ssl'] === false) ? 'http' : 'https';
-		$base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/';
-
-		// Adding explicit credential provider to the beginning chain.
-		// Including default credential provider (skipping AWS shared config files).
-		$provider = CredentialProvider::memoize(
-			CredentialProvider::chain(
-				$this->paramCredentialProvider(),
-				CredentialProvider::defaultProvider(['use_aws_shared_config_files' => false])
-			)
-		);
-
-		$options = [
-			'version' => isset($this->params['version']) ? $this->params['version'] : 'latest',
-			'credentials' => $provider,
-			'endpoint' => $base_url,
-			'region' => $this->params['region'],
-			'use_path_style_endpoint' => isset($this->params['use_path_style']) ? $this->params['use_path_style'] : false,
-			'signature_provider' => \Aws\or_chain([self::class, 'legacySignatureProvider'], ClientResolver::_default_signature_provider()),
-			'csm' => false,
-			'use_arn_region' => false,
-			'http' => ['verify' => $this->getCertificateBundlePath()],
-			'use_aws_shared_config_files' => false,
-		];
-		if ($this->getProxy()) {
-			$options['http']['proxy'] = $this->getProxy();
-		}
-		if (isset($this->params['legacy_auth']) && $this->params['legacy_auth']) {
-			$options['signature_version'] = 'v2';
-		}
-		$this->connection = new S3Client($options);
-
-		if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
-			$logger = \OC::$server->get(LoggerInterface::class);
-			$logger->debug('Bucket "' . $this->bucket . '" This bucket name is not dns compatible, it may contain invalid characters.',
-				['app' => 'objectstore']);
-		}
-
-		if ($this->params['verify_bucket_exists'] && !$this->connection->doesBucketExist($this->bucket)) {
-			$logger = \OC::$server->get(LoggerInterface::class);
-			try {
-				$logger->info('Bucket "' . $this->bucket . '" does not exist - creating it.', ['app' => 'objectstore']);
-				if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
-					throw new \Exception("The bucket will not be created because the name is not dns compatible, please correct it: " . $this->bucket);
-				}
-				$this->connection->createBucket(['Bucket' => $this->bucket]);
-				$this->testTimeout();
-			} catch (S3Exception $e) {
-				$logger->debug('Invalid remote storage.', [
-					'exception' => $e,
-					'app' => 'objectstore',
-				]);
-				throw new \Exception('Creation of bucket "' . $this->bucket . '" failed. ' . $e->getMessage());
-			}
-		}
-
-		// google cloud's s3 compatibility doesn't like the EncodingType parameter
-		if (strpos($base_url, 'storage.googleapis.com')) {
-			$this->connection->getHandlerList()->remove('s3.auto_encode');
-		}
-
-		return $this->connection;
-	}
-
-	/**
-	 * when running the tests wait to let the buckets catch up
-	 */
-	private function testTimeout() {
-		if ($this->test) {
-			sleep($this->timeout);
-		}
-	}
-
-	public static function legacySignatureProvider($version, $service, $region) {
-		switch ($version) {
-			case 'v2':
-			case 's3':
-				return new S3Signature();
-			default:
-				return null;
-		}
-	}
-
-	/**
-	 * This function creates a credential provider based on user parameter file
-	 */
-	protected function paramCredentialProvider(): callable {
-		return function () {
-			$key = empty($this->params['key']) ? null : $this->params['key'];
-			$secret = empty($this->params['secret']) ? null : $this->params['secret'];
-
-			if ($key && $secret) {
-				return Promise\promise_for(
-					new Credentials($key, $secret)
-				);
-			}
-
-			$msg = 'Could not find parameters set for credentials in config file.';
-			return new RejectedPromise(new CredentialsException($msg));
-		};
-	}
-
-	protected function getCertificateBundlePath(): ?string {
-		if ((int)($this->params['use_nextcloud_bundle'] ?? "0")) {
-			// since we store the certificate bundles on the primary storage, we can't get the bundle while setting up the primary storage
-			if (!isset($this->params['primary_storage'])) {
-				/** @var ICertificateManager $certManager */
-				$certManager = \OC::$server->get(ICertificateManager::class);
-				return $certManager->getAbsoluteBundlePath();
-			} else {
-				return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
-			}
-		} else {
-			return null;
-		}
-	}
-
-	protected function getSSECKey(): ?string {
-		if (isset($this->params['sse_c_key'])) {
-			return $this->params['sse_c_key'];
-		}
-
-		return null;
-	}
-
-	protected function getSSECParameters(bool $copy = false): array {
-		$key = $this->getSSECKey();
-
-		if ($key === null) {
-			return [];
-		}
-
-		$rawKey = base64_decode($key);
-		if ($copy) {
-			return [
-				'CopySourceSSECustomerAlgorithm' => 'AES256',
-				'CopySourceSSECustomerKey' => $rawKey,
-				'CopySourceSSECustomerKeyMD5' => md5($rawKey, true)
-			];
-		}
-		return [
-			'SSECustomerAlgorithm' => 'AES256',
-			'SSECustomerKey' => $rawKey,
-			'SSECustomerKeyMD5' => md5($rawKey, true)
-		];
-	}
+    /** @var array */
+    protected $params;
+
+    /** @var S3Client */
+    protected $connection;
+
+    /** @var string */
+    protected $id;
+
+    /** @var string */
+    protected $bucket;
+
+    /** @var int */
+    protected $timeout;
+
+    /** @var string */
+    protected $proxy;
+
+    /** @var string */
+    protected $storageClass;
+
+    /** @var int */
+    protected $uploadPartSize;
+
+    /** @var int */
+    private $putSizeLimit;
+
+    protected $test;
+
+    protected function parseParams($params) {
+        if (empty($params['bucket'])) {
+            throw new \Exception("Bucket has to be configured.");
+        }
+
+        $this->id = 'amazon::' . $params['bucket'];
+
+        $this->test = isset($params['test']);
+        $this->bucket = $params['bucket'];
+        $this->proxy = $params['proxy'] ?? false;
+        $this->timeout = $params['timeout'] ?? 15;
+        $this->storageClass = !empty($params['storageClass']) ? $params['storageClass'] : 'STANDARD';
+        $this->uploadPartSize = $params['uploadPartSize'] ?? 524288000;
+        $this->putSizeLimit = $params['putSizeLimit'] ?? 104857600;
+        $params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region'];
+        $params['hostname'] = empty($params['hostname']) ? 's3.' . $params['region'] . '.amazonaws.com' : $params['hostname'];
+        if (!isset($params['port']) || $params['port'] === '') {
+            $params['port'] = (isset($params['use_ssl']) && $params['use_ssl'] === false) ? 80 : 443;
+        }
+        $params['verify_bucket_exists'] = empty($params['verify_bucket_exists']) ? true : $params['verify_bucket_exists'];
+        $this->params = $params;
+    }
+
+    public function getBucket() {
+        return $this->bucket;
+    }
+
+    public function getProxy() {
+        return $this->proxy;
+    }
+
+    /**
+     * Returns the connection
+     *
+     * @return S3Client connected client
+     * @throws \Exception if connection could not be made
+     */
+    public function getConnection() {
+        if (!is_null($this->connection)) {
+            return $this->connection;
+        }
+
+        $scheme = (isset($this->params['use_ssl']) && $this->params['use_ssl'] === false) ? 'http' : 'https';
+        $base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/';
+
+        // Adding explicit credential provider to the beginning chain.
+        // Including default credential provider (skipping AWS shared config files).
+        $provider = CredentialProvider::memoize(
+            CredentialProvider::chain(
+                $this->paramCredentialProvider(),
+                CredentialProvider::defaultProvider(['use_aws_shared_config_files' => false])
+            )
+        );
+
+        $options = [
+            'version' => isset($this->params['version']) ? $this->params['version'] : 'latest',
+            'credentials' => $provider,
+            'endpoint' => $base_url,
+            'region' => $this->params['region'],
+            'use_path_style_endpoint' => isset($this->params['use_path_style']) ? $this->params['use_path_style'] : false,
+            'signature_provider' => \Aws\or_chain([self::class, 'legacySignatureProvider'], ClientResolver::_default_signature_provider()),
+            'csm' => false,
+            'use_arn_region' => false,
+            'http' => ['verify' => $this->getCertificateBundlePath()],
+            'use_aws_shared_config_files' => false,
+        ];
+        if ($this->getProxy()) {
+            $options['http']['proxy'] = $this->getProxy();
+        }
+        if (isset($this->params['legacy_auth']) && $this->params['legacy_auth']) {
+            $options['signature_version'] = 'v2';
+        }
+        $this->connection = new S3Client($options);
+
+        if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
+            $logger = \OC::$server->get(LoggerInterface::class);
+            $logger->debug('Bucket "' . $this->bucket . '" This bucket name is not dns compatible, it may contain invalid characters.',
+                ['app' => 'objectstore']);
+        }
+
+        if ($this->params['verify_bucket_exists'] && !$this->connection->doesBucketExist($this->bucket)) {
+            $logger = \OC::$server->get(LoggerInterface::class);
+            try {
+                $logger->info('Bucket "' . $this->bucket . '" does not exist - creating it.', ['app' => 'objectstore']);
+                if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
+                    throw new \Exception("The bucket will not be created because the name is not dns compatible, please correct it: " . $this->bucket);
+                }
+                $this->connection->createBucket(['Bucket' => $this->bucket]);
+                $this->testTimeout();
+            } catch (S3Exception $e) {
+                $logger->debug('Invalid remote storage.', [
+                    'exception' => $e,
+                    'app' => 'objectstore',
+                ]);
+                throw new \Exception('Creation of bucket "' . $this->bucket . '" failed. ' . $e->getMessage());
+            }
+        }
+
+        // google cloud's s3 compatibility doesn't like the EncodingType parameter
+        if (strpos($base_url, 'storage.googleapis.com')) {
+            $this->connection->getHandlerList()->remove('s3.auto_encode');
+        }
+
+        return $this->connection;
+    }
+
+    /**
+     * when running the tests wait to let the buckets catch up
+     */
+    private function testTimeout() {
+        if ($this->test) {
+            sleep($this->timeout);
+        }
+    }
+
+    public static function legacySignatureProvider($version, $service, $region) {
+        switch ($version) {
+            case 'v2':
+            case 's3':
+                return new S3Signature();
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * This function creates a credential provider based on user parameter file
+     */
+    protected function paramCredentialProvider(): callable {
+        return function () {
+            $key = empty($this->params['key']) ? null : $this->params['key'];
+            $secret = empty($this->params['secret']) ? null : $this->params['secret'];
+
+            if ($key && $secret) {
+                return Promise\promise_for(
+                    new Credentials($key, $secret)
+                );
+            }
+
+            $msg = 'Could not find parameters set for credentials in config file.';
+            return new RejectedPromise(new CredentialsException($msg));
+        };
+    }
+
+    protected function getCertificateBundlePath(): ?string {
+        if ((int)($this->params['use_nextcloud_bundle'] ?? "0")) {
+            // since we store the certificate bundles on the primary storage, we can't get the bundle while setting up the primary storage
+            if (!isset($this->params['primary_storage'])) {
+                /** @var ICertificateManager $certManager */
+                $certManager = \OC::$server->get(ICertificateManager::class);
+                return $certManager->getAbsoluteBundlePath();
+            } else {
+                return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
+            }
+        } else {
+            return null;
+        }
+    }
+
+    protected function getSSECKey(): ?string {
+        if (isset($this->params['sse_c_key'])) {
+            return $this->params['sse_c_key'];
+        }
+
+        return null;
+    }
+
+    protected function getSSECParameters(bool $copy = false): array {
+        $key = $this->getSSECKey();
+
+        if ($key === null) {
+            return [];
+        }
+
+        $rawKey = base64_decode($key);
+        if ($copy) {
+            return [
+                'CopySourceSSECustomerAlgorithm' => 'AES256',
+                'CopySourceSSECustomerKey' => $rawKey,
+                'CopySourceSSECustomerKeyMD5' => md5($rawKey, true)
+            ];
+        }
+        return [
+            'SSECustomerAlgorithm' => 'AES256',
+            'SSECustomerKey' => $rawKey,
+            'SSECustomerKeyMD5' => md5($rawKey, true)
+        ];
+    }
 }

lib/private/Files/ObjectStore/S3ObjectTrait.php

Indentation +155 added lines, -155 removed lines

@@ -35,159 +35,159 @@
 use Psr\Http\Message\StreamInterface;
 
 trait S3ObjectTrait {
-	/**
-	 * Returns the connection
-	 *
-	 * @return S3Client connected client
-	 * @throws \Exception if connection could not be made
-	 */
-	abstract protected function getConnection();
-
-	abstract protected function getCertificateBundlePath(): ?string;
-	abstract protected function getSSECParameters(bool $copy = false): array;
-
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 *
-	 * @return resource stream with the read data
-	 * @throws \Exception when something goes wrong, message will be logged
-	 * @since 7.0.0
-	 */
-	public function readObject($urn) {
-		return SeekableHttpStream::open(function ($range) use ($urn) {
-			$command = $this->getConnection()->getCommand('GetObject', [
-				'Bucket' => $this->bucket,
-				'Key' => $urn,
-				'Range' => 'bytes=' . $range,
-			] + $this->getSSECParameters());
-			$request = \Aws\serialize($command);
-			$headers = [];
-			foreach ($request->getHeaders() as $key => $values) {
-				foreach ($values as $value) {
-					$headers[] = "$key: $value";
-				}
-			}
-			$opts = [
-				'http' => [
-					'protocol_version' => $request->getProtocolVersion(),
-					'header' => $headers,
-				]
-			];
-			$bundle = $this->getCertificateBundlePath();
-			if ($bundle) {
-				$opts['ssl'] = [
-					'cafile' => $bundle
-				];
-			}
-
-			if ($this->getProxy()) {
-				$opts['http']['proxy'] = $this->getProxy();
-				$opts['http']['request_fulluri'] = true;
-			}
-
-			$context = stream_context_create($opts);
-			return fopen($request->getUri(), 'r', false, $context);
-		});
-	}
-
-
-	/**
-	 * Single object put helper
-	 *
-	 * @param string $urn the unified resource name used to identify the object
-	 * @param StreamInterface $stream stream with the data to write
-	 * @param string|null $mimetype the mimetype to set for the remove object @since 22.0.0
-	 * @throws \Exception when something goes wrong, message will be logged
-	 */
-	protected function writeSingle(string $urn, StreamInterface $stream, string $mimetype = null): void {
-		$this->getConnection()->putObject([
-			'Bucket' => $this->bucket,
-			'Key' => $urn,
-			'Body' => $stream,
-			'ACL' => 'private',
-			'ContentType' => $mimetype,
-			'StorageClass' => $this->storageClass,
-		] + $this->getSSECParameters());
-	}
-
-
-	/**
-	 * Multipart upload helper that tries to avoid orphaned fragments in S3
-	 *
-	 * @param string $urn the unified resource name used to identify the object
-	 * @param StreamInterface $stream stream with the data to write
-	 * @param string|null $mimetype the mimetype to set for the remove object
-	 * @throws \Exception when something goes wrong, message will be logged
-	 */
-	protected function writeMultiPart(string $urn, StreamInterface $stream, string $mimetype = null): void {
-		$uploader = new MultipartUploader($this->getConnection(), $stream, [
-			'bucket' => $this->bucket,
-			'key' => $urn,
-			'part_size' => $this->uploadPartSize,
-			'params' => [
-				'ContentType' => $mimetype,
-				'StorageClass' => $this->storageClass,
-			] + $this->getSSECParameters(),
-		]);
-
-		try {
-			$uploader->upload();
-		} catch (S3MultipartUploadException $e) {
-			// if anything goes wrong with multipart, make sure that you don´t poison and
-			// slow down s3 bucket with orphaned fragments
-			$uploadInfo = $e->getState()->getId();
-			if ($e->getState()->isInitiated() && (array_key_exists('UploadId', $uploadInfo))) {
-				$this->getConnection()->abortMultipartUpload($uploadInfo);
-			}
-			throw new \OCA\DAV\Connector\Sabre\Exception\BadGateway("Error while uploading to S3 bucket", 0, $e);
-		}
-	}
-
-
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @param resource $stream stream with the data to write
-	 * @param string|null $mimetype the mimetype to set for the remove object @since 22.0.0
-	 * @throws \Exception when something goes wrong, message will be logged
-	 * @since 7.0.0
-	 */
-	public function writeObject($urn, $stream, string $mimetype = null) {
-		$psrStream = Utils::streamFor($stream);
-
-		// ($psrStream->isSeekable() && $psrStream->getSize() !== null) evaluates to true for a On-Seekable stream
-		// so the optimisation does not apply
-		$buffer = new Psr7\Stream(fopen("php://memory", 'rwb+'));
-		Utils::copyToStream($psrStream, $buffer, $this->putSizeLimit);
-		$buffer->seek(0);
-		if ($buffer->getSize() < $this->putSizeLimit) {
-			// buffer is fully seekable, so use it directly for the small upload
-			$this->writeSingle($urn, $buffer, $mimetype);
-		} else {
-			$loadStream = new Psr7\AppendStream([$buffer, $psrStream]);
-			$this->writeMultiPart($urn, $loadStream, $mimetype);
-		}
-	}
-
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @return void
-	 * @throws \Exception when something goes wrong, message will be logged
-	 * @since 7.0.0
-	 */
-	public function deleteObject($urn) {
-		$this->getConnection()->deleteObject([
-			'Bucket' => $this->bucket,
-			'Key' => $urn,
-		]);
-	}
-
-	public function objectExists($urn) {
-		return $this->getConnection()->doesObjectExist($this->bucket, $urn, $this->getSSECParameters());
-	}
-
-	public function copyObject($from, $to) {
-		$this->getConnection()->copy($this->getBucket(), $from, $this->getBucket(), $to, 'private', [
-			'params' => $this->getSSECParameters() + $this->getSSECParameters(true)
-		]);
-	}
+    /**
+     * Returns the connection
+     *
+     * @return S3Client connected client
+     * @throws \Exception if connection could not be made
+     */
+    abstract protected function getConnection();
+
+    abstract protected function getCertificateBundlePath(): ?string;
+    abstract protected function getSSECParameters(bool $copy = false): array;
+
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     *
+     * @return resource stream with the read data
+     * @throws \Exception when something goes wrong, message will be logged
+     * @since 7.0.0
+     */
+    public function readObject($urn) {
+        return SeekableHttpStream::open(function ($range) use ($urn) {
+            $command = $this->getConnection()->getCommand('GetObject', [
+                'Bucket' => $this->bucket,
+                'Key' => $urn,
+                'Range' => 'bytes=' . $range,
+            ] + $this->getSSECParameters());
+            $request = \Aws\serialize($command);
+            $headers = [];
+            foreach ($request->getHeaders() as $key => $values) {
+                foreach ($values as $value) {
+                    $headers[] = "$key: $value";
+                }
+            }
+            $opts = [
+                'http' => [
+                    'protocol_version' => $request->getProtocolVersion(),
+                    'header' => $headers,
+                ]
+            ];
+            $bundle = $this->getCertificateBundlePath();
+            if ($bundle) {
+                $opts['ssl'] = [
+                    'cafile' => $bundle
+                ];
+            }
+
+            if ($this->getProxy()) {
+                $opts['http']['proxy'] = $this->getProxy();
+                $opts['http']['request_fulluri'] = true;
+            }
+
+            $context = stream_context_create($opts);
+            return fopen($request->getUri(), 'r', false, $context);
+        });
+    }
+
+
+    /**
+     * Single object put helper
+     *
+     * @param string $urn the unified resource name used to identify the object
+     * @param StreamInterface $stream stream with the data to write
+     * @param string|null $mimetype the mimetype to set for the remove object @since 22.0.0
+     * @throws \Exception when something goes wrong, message will be logged
+     */
+    protected function writeSingle(string $urn, StreamInterface $stream, string $mimetype = null): void {
+        $this->getConnection()->putObject([
+            'Bucket' => $this->bucket,
+            'Key' => $urn,
+            'Body' => $stream,
+            'ACL' => 'private',
+            'ContentType' => $mimetype,
+            'StorageClass' => $this->storageClass,
+        ] + $this->getSSECParameters());
+    }
+
+
+    /**
+     * Multipart upload helper that tries to avoid orphaned fragments in S3
+     *
+     * @param string $urn the unified resource name used to identify the object
+     * @param StreamInterface $stream stream with the data to write
+     * @param string|null $mimetype the mimetype to set for the remove object
+     * @throws \Exception when something goes wrong, message will be logged
+     */
+    protected function writeMultiPart(string $urn, StreamInterface $stream, string $mimetype = null): void {
+        $uploader = new MultipartUploader($this->getConnection(), $stream, [
+            'bucket' => $this->bucket,
+            'key' => $urn,
+            'part_size' => $this->uploadPartSize,
+            'params' => [
+                'ContentType' => $mimetype,
+                'StorageClass' => $this->storageClass,
+            ] + $this->getSSECParameters(),
+        ]);
+
+        try {
+            $uploader->upload();
+        } catch (S3MultipartUploadException $e) {
+            // if anything goes wrong with multipart, make sure that you don´t poison and
+            // slow down s3 bucket with orphaned fragments
+            $uploadInfo = $e->getState()->getId();
+            if ($e->getState()->isInitiated() && (array_key_exists('UploadId', $uploadInfo))) {
+                $this->getConnection()->abortMultipartUpload($uploadInfo);
+            }
+            throw new \OCA\DAV\Connector\Sabre\Exception\BadGateway("Error while uploading to S3 bucket", 0, $e);
+        }
+    }
+
+
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @param resource $stream stream with the data to write
+     * @param string|null $mimetype the mimetype to set for the remove object @since 22.0.0
+     * @throws \Exception when something goes wrong, message will be logged
+     * @since 7.0.0
+     */
+    public function writeObject($urn, $stream, string $mimetype = null) {
+        $psrStream = Utils::streamFor($stream);
+
+        // ($psrStream->isSeekable() && $psrStream->getSize() !== null) evaluates to true for a On-Seekable stream
+        // so the optimisation does not apply
+        $buffer = new Psr7\Stream(fopen("php://memory", 'rwb+'));
+        Utils::copyToStream($psrStream, $buffer, $this->putSizeLimit);
+        $buffer->seek(0);
+        if ($buffer->getSize() < $this->putSizeLimit) {
+            // buffer is fully seekable, so use it directly for the small upload
+            $this->writeSingle($urn, $buffer, $mimetype);
+        } else {
+            $loadStream = new Psr7\AppendStream([$buffer, $psrStream]);
+            $this->writeMultiPart($urn, $loadStream, $mimetype);
+        }
+    }
+
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @return void
+     * @throws \Exception when something goes wrong, message will be logged
+     * @since 7.0.0
+     */
+    public function deleteObject($urn) {
+        $this->getConnection()->deleteObject([
+            'Bucket' => $this->bucket,
+            'Key' => $urn,
+        ]);
+    }
+
+    public function objectExists($urn) {
+        return $this->getConnection()->doesObjectExist($this->bucket, $urn, $this->getSSECParameters());
+    }
+
+    public function copyObject($from, $to) {
+        $this->getConnection()->copy($this->getBucket(), $from, $this->getBucket(), $to, 'private', [
+            'params' => $this->getSSECParameters() + $this->getSSECParameters(true)
+        ]);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -54,11 +54,11 @@
 	 * @since 7.0.0
 	 */
 	public function readObject($urn) {
-		return SeekableHttpStream::open(function ($range) use ($urn) {
+		return SeekableHttpStream::open(function($range) use ($urn) {
 			$command = $this->getConnection()->getCommand('GetObject', [
 				'Bucket' => $this->bucket,
 				'Key' => $urn,
-				'Range' => 'bytes=' . $range,
+				'Range' => 'bytes='.$range,
 			] + $this->getSSECParameters());
 			$request = \Aws\serialize($command);
 			$headers = [];