nextcloud / server

lib/public/Files/ObjectStore/IObjectStore.php

Indentation +48 added lines, -48 removed lines

@@ -15,58 +15,58 @@
  * @since 7.0.0
  */
 interface IObjectStore {
-	/**
-	 * @return string the container or bucket name where objects are stored
-	 * @since 7.0.0
-	 */
-	public function getStorageId();
+    /**
+     * @return string the container or bucket name where objects are stored
+     * @since 7.0.0
+     */
+    public function getStorageId();
 
-	/**
-	 * @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
-	 * @throws NotFoundException if file does not exist
-	 * @since 7.0.0
-	 */
-	public function readObject($urn);
+    /**
+     * @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
+     * @throws NotFoundException if file does not exist
+     * @since 7.0.0
+     */
+    public function readObject($urn);
 
-	/**
-	 * @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);
+    /**
+     * @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);
 
-	/**
-	 * @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);
+    /**
+     * @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);
 
-	/**
-	 * Check if an object exists in the object store
-	 *
-	 * @param string $urn
-	 * @return bool
-	 * @since 16.0.0
-	 */
-	public function objectExists($urn);
+    /**
+     * Check if an object exists in the object store
+     *
+     * @param string $urn
+     * @return bool
+     * @since 16.0.0
+     */
+    public function objectExists($urn);
 
-	/**
-	 * @param string $from the unified resource name used to identify the source object
-	 * @param string $to the unified resource name used to identify the target object
-	 * @return void
-	 * @since 21.0.0
-	 */
-	public function copyObject($from, $to);
+    /**
+     * @param string $from the unified resource name used to identify the source object
+     * @param string $to the unified resource name used to identify the target object
+     * @return void
+     * @since 21.0.0
+     */
+    public function copyObject($from, $to);
 
-	/**
-	 * Get pre signed url for an object
-	 * @since 33.0.0
-	 */
-	public function preSignedUrl(string $urn, \DateTimeInterface $expiration): ?string;
+    /**
+     * Get pre signed url for an object
+     * @since 33.0.0
+     */
+    public function preSignedUrl(string $urn, \DateTimeInterface $expiration): ?string;
 }

lib/public/Files/Storage/IStorage.php

Indentation +391 added lines, -391 removed lines

@@ -26,395 +26,395 @@
  * @since 31.0.0 Moved the constructor to IConstructableStorage so that wrappers can use DI
  */
 interface IStorage {
-	/**
-	 * Get the identifier for the storage,
-	 * the returned id should be the same for every storage object that is created with the same parameters
-	 * and two storage objects with the same id should refer to two storages that display the same files.
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getId();
-
-	/**
-	 * see https://www.php.net/manual/en/function.mkdir.php
-	 * implementations need to implement a recursive mkdir
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function mkdir(string $path);
-
-	/**
-	 * see https://www.php.net/manual/en/function.rmdir.php
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function rmdir(string $path);
-
-	/**
-	 * see https://www.php.net/manual/en/function.opendir.php
-	 *
-	 * @return resource|false
-	 * @since 9.0.0
-	 */
-	public function opendir(string $path);
-
-	/**
-	 * see https://www.php.net/manual/en/function.is-dir.php
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function is_dir(string $path);
-
-	/**
-	 * see https://www.php.net/manual/en/function.is-file.php
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function is_file(string $path);
-
-	/**
-	 * see https://www.php.net/manual/en/function.stat.php
-	 * only the following keys are required in the result: size and mtime
-	 *
-	 * @return array|false
-	 * @since 9.0.0
-	 */
-	public function stat(string $path);
-
-	/**
-	 * see https://www.php.net/manual/en/function.filetype.php
-	 *
-	 * @return string|false
-	 * @since 9.0.0
-	 */
-	public function filetype(string $path);
-
-	/**
-	 * see https://www.php.net/manual/en/function.filesize.php
-	 * The result for filesize when called on a folder is required to be 0
-	 *
-	 * @return int|float|false
-	 * @since 9.0.0
-	 */
-	public function filesize(string $path);
-
-	/**
-	 * check if a file can be created in $path
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function isCreatable(string $path);
-
-	/**
-	 * check if a file can be read
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function isReadable(string $path);
-
-	/**
-	 * check if a file can be written to
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function isUpdatable(string $path);
-
-	/**
-	 * check if a file can be deleted
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function isDeletable(string $path);
-
-	/**
-	 * check if a file can be shared
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function isSharable(string $path);
-
-	/**
-	 * get the full permissions of a path.
-	 * Should return a combination of the PERMISSION_ constants defined in lib/public/constants.php
-	 *
-	 * @return int
-	 * @since 9.0.0
-	 */
-	public function getPermissions(string $path);
-
-	/**
-	 * see https://www.php.net/manual/en/function.file-exists.php
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function file_exists(string $path);
-
-	/**
-	 * see https://www.php.net/manual/en/function.filemtime.php
-	 *
-	 * @return int|false
-	 * @since 9.0.0
-	 */
-	public function filemtime(string $path);
-
-	/**
-	 * see https://www.php.net/manual/en/function.file-get-contents.php
-	 *
-	 * @return string|false
-	 * @since 9.0.0
-	 */
-	public function file_get_contents(string $path);
-
-	/**
-	 * see https://www.php.net/manual/en/function.file-put-contents.php
-	 *
-	 * @return int|float|false
-	 * @since 9.0.0
-	 */
-	public function file_put_contents(string $path, mixed $data);
-
-	/**
-	 * see https://www.php.net/manual/en/function.unlink.php
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function unlink(string $path);
-
-	/**
-	 * see https://www.php.net/manual/en/function.rename.php
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function rename(string $source, string $target);
-
-	/**
-	 * see https://www.php.net/manual/en/function.copy.php
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function copy(string $source, string $target);
-
-	/**
-	 * see https://www.php.net/manual/en/function.fopen.php
-	 *
-	 * @return resource|false
-	 * @since 9.0.0
-	 */
-	public function fopen(string $path, string $mode);
-
-	/**
-	 * get the mimetype for a file or folder
-	 * The mimetype for a folder is required to be "httpd/unix-directory"
-	 *
-	 * @return string|false
-	 * @since 9.0.0
-	 */
-	public function getMimeType(string $path);
-
-	/**
-	 * see https://www.php.net/manual/en/function.hash-file.php
-	 *
-	 * @return string|false
-	 * @since 9.0.0
-	 */
-	public function hash(string $type, string $path, bool $raw = false);
-
-	/**
-	 * see https://www.php.net/manual/en/function.disk-free-space.php
-	 *
-	 * @return int|float|false
-	 * @since 9.0.0
-	 */
-	public function free_space(string $path);
-
-	/**
-	 * see https://www.php.net/manual/en/function.touch.php
-	 * If the backend does not support the operation, false should be returned
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function touch(string $path, ?int $mtime = null);
-
-	/**
-	 * get the path to a local version of the file.
-	 * The local version of the file can be temporary and doesn't have to be persistent across requests
-	 *
-	 * @return string|false
-	 * @since 9.0.0
-	 */
-	public function getLocalFile(string $path);
-
-	/**
-	 * check if a file or folder has been updated since $time
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 *
-	 * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed.
-	 * returning true for other changes in the folder is optional
-	 */
-	public function hasUpdated(string $path, int $time);
-
-	/**
-	 * get the ETag for a file or folder
-	 *
-	 * @return string|false
-	 * @since 9.0.0
-	 */
-	public function getETag(string $path);
-
-	/**
-	 * Returns whether the storage is local, which means that files
-	 * are stored on the local filesystem instead of remotely.
-	 * Calling getLocalFile() for local storages should always
-	 * return the local files, whereas for non-local storages
-	 * it might return a temporary file.
-	 *
-	 * @return bool true if the files are stored locally, false otherwise
-	 * @since 9.0.0
-	 */
-	public function isLocal();
-
-	/**
-	 * Check if the storage is an instance of $class or is a wrapper for a storage that is an instance of $class
-	 *
-	 * @template T of IStorage
-	 * @psalm-param class-string<T> $class
-	 * @return bool
-	 * @since 9.0.0
-	 * @psalm-assert-if-true T $this
-	 */
-	public function instanceOfStorage(string $class);
-
-	/**
-	 * A custom storage implementation can return a url for direct download of a give file.
-	 *
-	 * For now the returned array can hold the parameter url and expiration - in future more attributes might follow.
-	 *
-	 * @param string $path Either the path or the fileId
-	 * @return array{url: ?string, expiration: ?int}|false
-	 * @since 9.0.0
-	 * @deprecated Use IStorage::getDirectDownloadById instead.
-	 */
-	public function getDirectDownload(string $path);
-
-	/**
-	 * A custom storage implementation can return a url for direct download of a give file.
-	 *
-	 * For now the returned array can hold the parameter url and expiration - in future more attributes might follow.
-	 *
-	 * @param string $fileId The fileId of the file.
-	 * @return array{url: ?string, expiration: ?int}|false
-	 * @since 33.0.0
-	 */
-	public function getDirectDownloadById(string $fileId): array|false;
-
-	/**
-	 * @return void
-	 * @throws InvalidPathException
-	 * @since 9.0.0
-	 */
-	public function verifyPath(string $path, string $fileName);
-
-	/**
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function copyFromStorage(IStorage $sourceStorage, string $sourceInternalPath, string $targetInternalPath);
-
-	/**
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function moveFromStorage(IStorage $sourceStorage, string $sourceInternalPath, string $targetInternalPath);
-
-	/**
-	 * Test a storage for availability
-	 *
-	 * @since 9.0.0
-	 * @return bool
-	 */
-	public function test();
-
-	/**
-	 * @since 9.0.0
-	 * @return array [ available, last_checked ]
-	 */
-	public function getAvailability();
-
-	/**
-	 * @since 9.0.0
-	 * @return void
-	 */
-	public function setAvailability(bool $isAvailable);
-
-	/**
-	 * @since 12.0.0
-	 * @since 31.0.0 moved from Storage to IStorage
-	 * @return bool
-	 */
-	public function needsPartFile();
-
-	/**
-	 * @return string|false
-	 * @since 9.0.0
-	 */
-	public function getOwner(string $path);
-
-	/**
-	 * @return ICache
-	 * @since 9.0.0
-	 */
-	public function getCache(string $path = '', ?IStorage $storage = null);
-
-	/**
-	 * @return IPropagator
-	 * @since 9.0.0
-	 */
-	public function getPropagator();
-
-	/**
-	 * @return IScanner
-	 * @since 9.0.0
-	 */
-	public function getScanner();
-
-	/**
-	 * @return IUpdater
-	 * @since 9.0.0
-	 */
-	public function getUpdater();
-
-	/**
-	 * @return IWatcher
-	 * @since 9.0.0
-	 */
-	public function getWatcher();
-
-	/**
-	 * Allow setting the storage owner
-	 *
-	 * This can be used for storages that do not have a dedicated owner, where we want to
-	 * pass the user that we setup the mountpoint for along to the storage layer
-	 *
-	 * @param ?string $user Owner user id
-	 * @return void
-	 * @since 30.0.0
-	 */
-	public function setOwner(?string $user): void;
+    /**
+     * Get the identifier for the storage,
+     * the returned id should be the same for every storage object that is created with the same parameters
+     * and two storage objects with the same id should refer to two storages that display the same files.
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getId();
+
+    /**
+     * see https://www.php.net/manual/en/function.mkdir.php
+     * implementations need to implement a recursive mkdir
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function mkdir(string $path);
+
+    /**
+     * see https://www.php.net/manual/en/function.rmdir.php
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function rmdir(string $path);
+
+    /**
+     * see https://www.php.net/manual/en/function.opendir.php
+     *
+     * @return resource|false
+     * @since 9.0.0
+     */
+    public function opendir(string $path);
+
+    /**
+     * see https://www.php.net/manual/en/function.is-dir.php
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function is_dir(string $path);
+
+    /**
+     * see https://www.php.net/manual/en/function.is-file.php
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function is_file(string $path);
+
+    /**
+     * see https://www.php.net/manual/en/function.stat.php
+     * only the following keys are required in the result: size and mtime
+     *
+     * @return array|false
+     * @since 9.0.0
+     */
+    public function stat(string $path);
+
+    /**
+     * see https://www.php.net/manual/en/function.filetype.php
+     *
+     * @return string|false
+     * @since 9.0.0
+     */
+    public function filetype(string $path);
+
+    /**
+     * see https://www.php.net/manual/en/function.filesize.php
+     * The result for filesize when called on a folder is required to be 0
+     *
+     * @return int|float|false
+     * @since 9.0.0
+     */
+    public function filesize(string $path);
+
+    /**
+     * check if a file can be created in $path
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function isCreatable(string $path);
+
+    /**
+     * check if a file can be read
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function isReadable(string $path);
+
+    /**
+     * check if a file can be written to
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function isUpdatable(string $path);
+
+    /**
+     * check if a file can be deleted
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function isDeletable(string $path);
+
+    /**
+     * check if a file can be shared
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function isSharable(string $path);
+
+    /**
+     * get the full permissions of a path.
+     * Should return a combination of the PERMISSION_ constants defined in lib/public/constants.php
+     *
+     * @return int
+     * @since 9.0.0
+     */
+    public function getPermissions(string $path);
+
+    /**
+     * see https://www.php.net/manual/en/function.file-exists.php
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function file_exists(string $path);
+
+    /**
+     * see https://www.php.net/manual/en/function.filemtime.php
+     *
+     * @return int|false
+     * @since 9.0.0
+     */
+    public function filemtime(string $path);
+
+    /**
+     * see https://www.php.net/manual/en/function.file-get-contents.php
+     *
+     * @return string|false
+     * @since 9.0.0
+     */
+    public function file_get_contents(string $path);
+
+    /**
+     * see https://www.php.net/manual/en/function.file-put-contents.php
+     *
+     * @return int|float|false
+     * @since 9.0.0
+     */
+    public function file_put_contents(string $path, mixed $data);
+
+    /**
+     * see https://www.php.net/manual/en/function.unlink.php
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function unlink(string $path);
+
+    /**
+     * see https://www.php.net/manual/en/function.rename.php
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function rename(string $source, string $target);
+
+    /**
+     * see https://www.php.net/manual/en/function.copy.php
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function copy(string $source, string $target);
+
+    /**
+     * see https://www.php.net/manual/en/function.fopen.php
+     *
+     * @return resource|false
+     * @since 9.0.0
+     */
+    public function fopen(string $path, string $mode);
+
+    /**
+     * get the mimetype for a file or folder
+     * The mimetype for a folder is required to be "httpd/unix-directory"
+     *
+     * @return string|false
+     * @since 9.0.0
+     */
+    public function getMimeType(string $path);
+
+    /**
+     * see https://www.php.net/manual/en/function.hash-file.php
+     *
+     * @return string|false
+     * @since 9.0.0
+     */
+    public function hash(string $type, string $path, bool $raw = false);
+
+    /**
+     * see https://www.php.net/manual/en/function.disk-free-space.php
+     *
+     * @return int|float|false
+     * @since 9.0.0
+     */
+    public function free_space(string $path);
+
+    /**
+     * see https://www.php.net/manual/en/function.touch.php
+     * If the backend does not support the operation, false should be returned
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function touch(string $path, ?int $mtime = null);
+
+    /**
+     * get the path to a local version of the file.
+     * The local version of the file can be temporary and doesn't have to be persistent across requests
+     *
+     * @return string|false
+     * @since 9.0.0
+     */
+    public function getLocalFile(string $path);
+
+    /**
+     * check if a file or folder has been updated since $time
+     *
+     * @return bool
+     * @since 9.0.0
+     *
+     * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed.
+     * returning true for other changes in the folder is optional
+     */
+    public function hasUpdated(string $path, int $time);
+
+    /**
+     * get the ETag for a file or folder
+     *
+     * @return string|false
+     * @since 9.0.0
+     */
+    public function getETag(string $path);
+
+    /**
+     * Returns whether the storage is local, which means that files
+     * are stored on the local filesystem instead of remotely.
+     * Calling getLocalFile() for local storages should always
+     * return the local files, whereas for non-local storages
+     * it might return a temporary file.
+     *
+     * @return bool true if the files are stored locally, false otherwise
+     * @since 9.0.0
+     */
+    public function isLocal();
+
+    /**
+     * Check if the storage is an instance of $class or is a wrapper for a storage that is an instance of $class
+     *
+     * @template T of IStorage
+     * @psalm-param class-string<T> $class
+     * @return bool
+     * @since 9.0.0
+     * @psalm-assert-if-true T $this
+     */
+    public function instanceOfStorage(string $class);
+
+    /**
+     * A custom storage implementation can return a url for direct download of a give file.
+     *
+     * For now the returned array can hold the parameter url and expiration - in future more attributes might follow.
+     *
+     * @param string $path Either the path or the fileId
+     * @return array{url: ?string, expiration: ?int}|false
+     * @since 9.0.0
+     * @deprecated Use IStorage::getDirectDownloadById instead.
+     */
+    public function getDirectDownload(string $path);
+
+    /**
+     * A custom storage implementation can return a url for direct download of a give file.
+     *
+     * For now the returned array can hold the parameter url and expiration - in future more attributes might follow.
+     *
+     * @param string $fileId The fileId of the file.
+     * @return array{url: ?string, expiration: ?int}|false
+     * @since 33.0.0
+     */
+    public function getDirectDownloadById(string $fileId): array|false;
+
+    /**
+     * @return void
+     * @throws InvalidPathException
+     * @since 9.0.0
+     */
+    public function verifyPath(string $path, string $fileName);
+
+    /**
+     * @return bool
+     * @since 9.0.0
+     */
+    public function copyFromStorage(IStorage $sourceStorage, string $sourceInternalPath, string $targetInternalPath);
+
+    /**
+     * @return bool
+     * @since 9.0.0
+     */
+    public function moveFromStorage(IStorage $sourceStorage, string $sourceInternalPath, string $targetInternalPath);
+
+    /**
+     * Test a storage for availability
+     *
+     * @since 9.0.0
+     * @return bool
+     */
+    public function test();
+
+    /**
+     * @since 9.0.0
+     * @return array [ available, last_checked ]
+     */
+    public function getAvailability();
+
+    /**
+     * @since 9.0.0
+     * @return void
+     */
+    public function setAvailability(bool $isAvailable);
+
+    /**
+     * @since 12.0.0
+     * @since 31.0.0 moved from Storage to IStorage
+     * @return bool
+     */
+    public function needsPartFile();
+
+    /**
+     * @return string|false
+     * @since 9.0.0
+     */
+    public function getOwner(string $path);
+
+    /**
+     * @return ICache
+     * @since 9.0.0
+     */
+    public function getCache(string $path = '', ?IStorage $storage = null);
+
+    /**
+     * @return IPropagator
+     * @since 9.0.0
+     */
+    public function getPropagator();
+
+    /**
+     * @return IScanner
+     * @since 9.0.0
+     */
+    public function getScanner();
+
+    /**
+     * @return IUpdater
+     * @since 9.0.0
+     */
+    public function getUpdater();
+
+    /**
+     * @return IWatcher
+     * @since 9.0.0
+     */
+    public function getWatcher();
+
+    /**
+     * Allow setting the storage owner
+     *
+     * This can be used for storages that do not have a dedicated owner, where we want to
+     * pass the user that we setup the mountpoint for along to the storage layer
+     *
+     * @param ?string $user Owner user id
+     * @return void
+     * @since 30.0.0
+     */
+    public function setOwner(?string $user): void;
 }

Spacing +1 added lines, -1 removed lines

@@ -322,7 +322,7 @@
 	 * @return array{url: ?string, expiration: ?int}|false
 	 * @since 33.0.0
 	 */
-	public function getDirectDownloadById(string $fileId): array|false;
+	public function getDirectDownloadById(string $fileId): array | false;
 
 	/**
 	 * @return void

lib/private/Lockdown/Filesystem/NullStorage.php

Indentation +117 added lines, -117 removed lines

@@ -13,159 +13,159 @@
 use OCP\Files\Storage\IStorage;
 
 class NullStorage extends Common {
-	public function __construct(array $parameters) {
-		parent::__construct($parameters);
-	}
+    public function __construct(array $parameters) {
+        parent::__construct($parameters);
+    }
 
-	public function getId(): string {
-		return 'null';
-	}
+    public function getId(): string {
+        return 'null';
+    }
 
-	public function mkdir(string $path): never {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function mkdir(string $path): never {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function rmdir(string $path): never {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function rmdir(string $path): never {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function opendir(string $path): IteratorDirectory {
-		return new IteratorDirectory();
-	}
+    public function opendir(string $path): IteratorDirectory {
+        return new IteratorDirectory();
+    }
 
-	public function is_dir(string $path): bool {
-		return $path === '';
-	}
+    public function is_dir(string $path): bool {
+        return $path === '';
+    }
 
-	public function is_file(string $path): bool {
-		return false;
-	}
+    public function is_file(string $path): bool {
+        return false;
+    }
 
-	public function stat(string $path): never {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function stat(string $path): never {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function filetype(string $path): string|false {
-		return ($path === '') ? 'dir' : false;
-	}
+    public function filetype(string $path): string|false {
+        return ($path === '') ? 'dir' : false;
+    }
 
-	public function filesize(string $path): never {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function filesize(string $path): never {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function isCreatable(string $path): bool {
-		return false;
-	}
+    public function isCreatable(string $path): bool {
+        return false;
+    }
 
-	public function isReadable(string $path): bool {
-		return $path === '';
-	}
+    public function isReadable(string $path): bool {
+        return $path === '';
+    }
 
-	public function isUpdatable(string $path): bool {
-		return false;
-	}
+    public function isUpdatable(string $path): bool {
+        return false;
+    }
 
-	public function isDeletable(string $path): bool {
-		return false;
-	}
+    public function isDeletable(string $path): bool {
+        return false;
+    }
 
-	public function isSharable(string $path): bool {
-		return false;
-	}
+    public function isSharable(string $path): bool {
+        return false;
+    }
 
-	public function getPermissions(string $path): int {
-		return 0;
-	}
+    public function getPermissions(string $path): int {
+        return 0;
+    }
 
-	public function file_exists(string $path): bool {
-		return $path === '';
-	}
+    public function file_exists(string $path): bool {
+        return $path === '';
+    }
 
-	public function filemtime(string $path): int|false {
-		return ($path === '') ? time() : false;
-	}
+    public function filemtime(string $path): int|false {
+        return ($path === '') ? time() : false;
+    }
 
-	public function file_get_contents(string $path): never {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function file_get_contents(string $path): never {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function file_put_contents(string $path, mixed $data): never {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function file_put_contents(string $path, mixed $data): never {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function unlink(string $path): never {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function unlink(string $path): never {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function rename(string $source, string $target): never {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function rename(string $source, string $target): never {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function copy(string $source, string $target): never {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function copy(string $source, string $target): never {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function fopen(string $path, string $mode): never {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function fopen(string $path, string $mode): never {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function getMimeType(string $path): never {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function getMimeType(string $path): never {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function hash(string $type, string $path, bool $raw = false): never {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function hash(string $type, string $path, bool $raw = false): never {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function free_space(string $path): int {
-		return FileInfo::SPACE_UNKNOWN;
-	}
+    public function free_space(string $path): int {
+        return FileInfo::SPACE_UNKNOWN;
+    }
 
-	public function touch(string $path, ?int $mtime = null): never {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function touch(string $path, ?int $mtime = null): never {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function getLocalFile(string $path): string|false {
-		return false;
-	}
+    public function getLocalFile(string $path): string|false {
+        return false;
+    }
 
-	public function hasUpdated(string $path, int $time): bool {
-		return false;
-	}
+    public function hasUpdated(string $path, int $time): bool {
+        return false;
+    }
 
-	public function getETag(string $path): string {
-		return '';
-	}
+    public function getETag(string $path): string {
+        return '';
+    }
 
-	public function isLocal(): bool {
-		return false;
-	}
+    public function isLocal(): bool {
+        return false;
+    }
 
-	public function getDirectDownload(string $path): array|false {
-		return false;
-	}
+    public function getDirectDownload(string $path): array|false {
+        return false;
+    }
 
-	public function getDirectDownloadById(string $fileId): array|false {
-		return false;
-	}
+    public function getDirectDownloadById(string $fileId): array|false {
+        return false;
+    }
 
-	public function copyFromStorage(IStorage $sourceStorage, string $sourceInternalPath, string $targetInternalPath, bool $preserveMtime = false): never {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function copyFromStorage(IStorage $sourceStorage, string $sourceInternalPath, string $targetInternalPath, bool $preserveMtime = false): never {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function moveFromStorage(IStorage $sourceStorage, string $sourceInternalPath, string $targetInternalPath): never {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function moveFromStorage(IStorage $sourceStorage, string $sourceInternalPath, string $targetInternalPath): never {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function test(): bool {
-		return true;
-	}
+    public function test(): bool {
+        return true;
+    }
 
-	public function getOwner(string $path): string|false {
-		return false;
-	}
+    public function getOwner(string $path): string|false {
+        return false;
+    }
 
-	public function getCache(string $path = '', ?IStorage $storage = null): ICache {
-		return new NullCache();
-	}
+    public function getCache(string $path = '', ?IStorage $storage = null): ICache {
+        return new NullCache();
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -45,7 +45,7 @@ 
 		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
 	}
 
-	public function filetype(string $path): string|false {
+	public function filetype(string $path): string | false {
 		return ($path === '') ? 'dir' : false;
 	}
 
@@ -81,7 +81,7 @@ 
 		return $path === '';
 	}
 
-	public function filemtime(string $path): int|false {
+	public function filemtime(string $path): int | false {
 		return ($path === '') ? time() : false;
 	}
 
@@ -125,7 +125,7 @@ 
 		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
 	}
 
-	public function getLocalFile(string $path): string|false {
+	public function getLocalFile(string $path): string | false {
 		return false;
 	}
 
@@ -141,11 +141,11 @@ 
 		return false;
 	}
 
-	public function getDirectDownload(string $path): array|false {
+	public function getDirectDownload(string $path): array | false {
 		return false;
 	}
 
-	public function getDirectDownloadById(string $fileId): array|false {
+	public function getDirectDownloadById(string $fileId): array | false {
 		return false;
 	}
 
@@ -161,7 +161,7 @@ 
 		return true;
 	}
 
-	public function getOwner(string $path): string|false {
+	public function getOwner(string $path): string | false {
 		return false;
 	}
 

lib/private/Files/ObjectStore/S3ObjectTrait.php

Indentation +296 added lines, -296 removed lines

@@ -19,300 +19,300 @@
 use Psr\Http\Message\StreamInterface;
 
 trait S3ObjectTrait {
-	use S3ConfigTrait;
-
-	/**
-	 * 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) {
-		$fh = 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);
-		});
-		if (!$fh) {
-			throw new \Exception("Failed to read object $urn");
-		}
-		return $fh;
-	}
-
-	private function buildS3Metadata(array $metadata): array {
-		$result = [];
-		foreach ($metadata as $key => $value) {
-			if (mb_check_encoding($value, 'ASCII')) {
-				$result['x-amz-meta-' . $key] = $value;
-			} else {
-				$result['x-amz-meta-' . $key] = 'base64:' . base64_encode($value);
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * 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 array $metaData the metadata to set for the object
-	 * @throws \Exception when something goes wrong, message will be logged
-	 */
-	protected function writeSingle(string $urn, StreamInterface $stream, array $metaData): void {
-		$mimetype = $metaData['mimetype'] ?? null;
-		unset($metaData['mimetype']);
-		unset($metaData['size']);
-
-		$args = [
-			'Bucket' => $this->bucket,
-			'Key' => $urn,
-			'Body' => $stream,
-			'ACL' => 'private',
-			'ContentType' => $mimetype,
-			'Metadata' => $this->buildS3Metadata($metaData),
-			'StorageClass' => $this->storageClass,
-		] + $this->getSSECParameters();
-
-		if ($size = $stream->getSize()) {
-			$args['ContentLength'] = $size;
-		}
-
-		$this->getConnection()->putObject($args);
-	}
-
-
-	/**
-	 * 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 array $metaData the metadata to set for the object
-	 * @throws \Exception when something goes wrong, message will be logged
-	 */
-	protected function writeMultiPart(string $urn, StreamInterface $stream, array $metaData): void {
-		$mimetype = $metaData['mimetype'] ?? null;
-		unset($metaData['mimetype']);
-		unset($metaData['size']);
-
-		$attempts = 0;
-		$uploaded = false;
-		$concurrency = $this->concurrency;
-		$exception = null;
-		$state = null;
-		$size = $stream->getSize();
-		$totalWritten = 0;
-
-		// retry multipart upload once with concurrency at half on failure
-		while (!$uploaded && $attempts <= 1) {
-			$uploader = new MultipartUploader($this->getConnection(), $stream, [
-				'bucket' => $this->bucket,
-				'concurrency' => $concurrency,
-				'key' => $urn,
-				'part_size' => $this->uploadPartSize,
-				'state' => $state,
-				'params' => [
-					'ContentType' => $mimetype,
-					'Metadata' => $this->buildS3Metadata($metaData),
-					'StorageClass' => $this->storageClass,
-				] + $this->getSSECParameters(),
-				'before_upload' => function (Command $command) use (&$totalWritten) {
-					$totalWritten += $command['ContentLength'];
-				},
-				'before_complete' => function ($_command) use (&$totalWritten, $size, &$uploader, &$attempts) {
-					if ($size !== null && $totalWritten != $size) {
-						$e = new \Exception('Incomplete multi part upload, expected ' . $size . ' bytes, wrote ' . $totalWritten);
-						throw new MultipartUploadException($uploader->getState(), $e);
-					}
-				},
-			]);
-
-			try {
-				$uploader->upload();
-				$uploaded = true;
-			} catch (S3MultipartUploadException $e) {
-				$exception = $e;
-				$attempts++;
-
-				if ($concurrency > 1) {
-					$concurrency = round($concurrency / 2);
-				}
-
-				if ($stream->isSeekable()) {
-					$stream->rewind();
-				}
-			} catch (MultipartUploadException $e) {
-				$exception = $e;
-				break;
-			}
-		}
-
-		if (!$uploaded) {
-			// if anything goes wrong with multipart, make sure that you don´t poison and
-			// slow down s3 bucket with orphaned fragments
-			$uploadInfo = $exception->getState()->getId();
-			if ($exception->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, $exception);
-		}
-	}
-
-	public function writeObject($urn, $stream, ?string $mimetype = null) {
-		$metaData = [];
-		if ($mimetype) {
-			$metaData['mimetype'] = $mimetype;
-		}
-		$this->writeObjectWithMetaData($urn, $stream, $metaData);
-	}
-
-	public function writeObjectWithMetaData(string $urn, $stream, array $metaData): void {
-		$canSeek = fseek($stream, 0, SEEK_CUR) === 0;
-		$psrStream = Utils::streamFor($stream, [
-			'size' => $metaData['size'] ?? null,
-		]);
-
-
-		$size = $psrStream->getSize();
-		if ($size === null || !$canSeek) {
-			// The s3 single-part upload requires the size to be known for the stream.
-			// So for input streams that don't have a known size, we need to copy (part of)
-			// the input into a temporary stream so the size can be determined
-			$buffer = new Psr7\Stream(fopen('php://temp', 'rw+'));
-			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, $metaData);
-			} else {
-				if ($psrStream->isSeekable()) {
-					// If the body is seekable, just rewind the body.
-					$psrStream->rewind();
-					$loadStream = $psrStream;
-				} else {
-					// If the body is non-seekable, stitch the rewind the buffer and
-					// the partially read body together into one stream. This avoids
-					// unnecessary disk usage and does not require seeking on the
-					// original stream.
-					$buffer->rewind();
-					$loadStream = new Psr7\AppendStream([$buffer, $psrStream]);
-				}
-
-				$this->writeMultiPart($urn, $loadStream, $metaData);
-			}
-		} else {
-			if ($size < $this->putSizeLimit) {
-				$this->writeSingle($urn, $psrStream, $metaData);
-			} else {
-				$this->writeMultiPart($urn, $psrStream, $metaData);
-			}
-		}
-		$psrStream->close();
-	}
-
-	/**
-	 * @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, array $options = []) {
-		$sourceMetadata = $this->getConnection()->headObject([
-			'Bucket' => $this->getBucket(),
-			'Key' => $from,
-		] + $this->getSSECParameters());
-
-		$size = (int)($sourceMetadata->get('Size') ?? $sourceMetadata->get('ContentLength'));
-
-		if ($this->useMultipartCopy && $size > $this->copySizeLimit) {
-			$copy = new MultipartCopy($this->getConnection(), [
-				'source_bucket' => $this->getBucket(),
-				'source_key' => $from
-			], array_merge([
-				'bucket' => $this->getBucket(),
-				'key' => $to,
-				'acl' => 'private',
-				'params' => $this->getSSECParameters() + $this->getSSECParameters(true),
-				'source_metadata' => $sourceMetadata
-			], $options));
-			$copy->copy();
-		} else {
-			$this->getConnection()->copy($this->getBucket(), $from, $this->getBucket(), $to, 'private', array_merge([
-				'params' => $this->getSSECParameters() + $this->getSSECParameters(true),
-				'mup_threshold' => PHP_INT_MAX,
-			], $options));
-		}
-	}
-
-	public function preSignedUrl(string $urn, \DateTimeInterface $expiration): ?string {
-		$command = $this->getConnection()->getCommand('GetObject', [
-			'Bucket' => $this->getBucket(),
-			'Key' => $urn,
-		]);
-
-		if (!$this->isUsePresignedUrl()) {
-			return null;
-		}
-
-		try {
-			return (string)$this->getConnection()->createPresignedRequest($command, $expiration, [
-				'signPayload' => true,
-			])->getUri();
-		} catch (AwsException) {
-			return null;
-		}
-	}
+    use S3ConfigTrait;
+
+    /**
+     * 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) {
+        $fh = 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);
+        });
+        if (!$fh) {
+            throw new \Exception("Failed to read object $urn");
+        }
+        return $fh;
+    }
+
+    private function buildS3Metadata(array $metadata): array {
+        $result = [];
+        foreach ($metadata as $key => $value) {
+            if (mb_check_encoding($value, 'ASCII')) {
+                $result['x-amz-meta-' . $key] = $value;
+            } else {
+                $result['x-amz-meta-' . $key] = 'base64:' . base64_encode($value);
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * 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 array $metaData the metadata to set for the object
+     * @throws \Exception when something goes wrong, message will be logged
+     */
+    protected function writeSingle(string $urn, StreamInterface $stream, array $metaData): void {
+        $mimetype = $metaData['mimetype'] ?? null;
+        unset($metaData['mimetype']);
+        unset($metaData['size']);
+
+        $args = [
+            'Bucket' => $this->bucket,
+            'Key' => $urn,
+            'Body' => $stream,
+            'ACL' => 'private',
+            'ContentType' => $mimetype,
+            'Metadata' => $this->buildS3Metadata($metaData),
+            'StorageClass' => $this->storageClass,
+        ] + $this->getSSECParameters();
+
+        if ($size = $stream->getSize()) {
+            $args['ContentLength'] = $size;
+        }
+
+        $this->getConnection()->putObject($args);
+    }
+
+
+    /**
+     * 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 array $metaData the metadata to set for the object
+     * @throws \Exception when something goes wrong, message will be logged
+     */
+    protected function writeMultiPart(string $urn, StreamInterface $stream, array $metaData): void {
+        $mimetype = $metaData['mimetype'] ?? null;
+        unset($metaData['mimetype']);
+        unset($metaData['size']);
+
+        $attempts = 0;
+        $uploaded = false;
+        $concurrency = $this->concurrency;
+        $exception = null;
+        $state = null;
+        $size = $stream->getSize();
+        $totalWritten = 0;
+
+        // retry multipart upload once with concurrency at half on failure
+        while (!$uploaded && $attempts <= 1) {
+            $uploader = new MultipartUploader($this->getConnection(), $stream, [
+                'bucket' => $this->bucket,
+                'concurrency' => $concurrency,
+                'key' => $urn,
+                'part_size' => $this->uploadPartSize,
+                'state' => $state,
+                'params' => [
+                    'ContentType' => $mimetype,
+                    'Metadata' => $this->buildS3Metadata($metaData),
+                    'StorageClass' => $this->storageClass,
+                ] + $this->getSSECParameters(),
+                'before_upload' => function (Command $command) use (&$totalWritten) {
+                    $totalWritten += $command['ContentLength'];
+                },
+                'before_complete' => function ($_command) use (&$totalWritten, $size, &$uploader, &$attempts) {
+                    if ($size !== null && $totalWritten != $size) {
+                        $e = new \Exception('Incomplete multi part upload, expected ' . $size . ' bytes, wrote ' . $totalWritten);
+                        throw new MultipartUploadException($uploader->getState(), $e);
+                    }
+                },
+            ]);
+
+            try {
+                $uploader->upload();
+                $uploaded = true;
+            } catch (S3MultipartUploadException $e) {
+                $exception = $e;
+                $attempts++;
+
+                if ($concurrency > 1) {
+                    $concurrency = round($concurrency / 2);
+                }
+
+                if ($stream->isSeekable()) {
+                    $stream->rewind();
+                }
+            } catch (MultipartUploadException $e) {
+                $exception = $e;
+                break;
+            }
+        }
+
+        if (!$uploaded) {
+            // if anything goes wrong with multipart, make sure that you don´t poison and
+            // slow down s3 bucket with orphaned fragments
+            $uploadInfo = $exception->getState()->getId();
+            if ($exception->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, $exception);
+        }
+    }
+
+    public function writeObject($urn, $stream, ?string $mimetype = null) {
+        $metaData = [];
+        if ($mimetype) {
+            $metaData['mimetype'] = $mimetype;
+        }
+        $this->writeObjectWithMetaData($urn, $stream, $metaData);
+    }
+
+    public function writeObjectWithMetaData(string $urn, $stream, array $metaData): void {
+        $canSeek = fseek($stream, 0, SEEK_CUR) === 0;
+        $psrStream = Utils::streamFor($stream, [
+            'size' => $metaData['size'] ?? null,
+        ]);
+
+
+        $size = $psrStream->getSize();
+        if ($size === null || !$canSeek) {
+            // The s3 single-part upload requires the size to be known for the stream.
+            // So for input streams that don't have a known size, we need to copy (part of)
+            // the input into a temporary stream so the size can be determined
+            $buffer = new Psr7\Stream(fopen('php://temp', 'rw+'));
+            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, $metaData);
+            } else {
+                if ($psrStream->isSeekable()) {
+                    // If the body is seekable, just rewind the body.
+                    $psrStream->rewind();
+                    $loadStream = $psrStream;
+                } else {
+                    // If the body is non-seekable, stitch the rewind the buffer and
+                    // the partially read body together into one stream. This avoids
+                    // unnecessary disk usage and does not require seeking on the
+                    // original stream.
+                    $buffer->rewind();
+                    $loadStream = new Psr7\AppendStream([$buffer, $psrStream]);
+                }
+
+                $this->writeMultiPart($urn, $loadStream, $metaData);
+            }
+        } else {
+            if ($size < $this->putSizeLimit) {
+                $this->writeSingle($urn, $psrStream, $metaData);
+            } else {
+                $this->writeMultiPart($urn, $psrStream, $metaData);
+            }
+        }
+        $psrStream->close();
+    }
+
+    /**
+     * @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, array $options = []) {
+        $sourceMetadata = $this->getConnection()->headObject([
+            'Bucket' => $this->getBucket(),
+            'Key' => $from,
+        ] + $this->getSSECParameters());
+
+        $size = (int)($sourceMetadata->get('Size') ?? $sourceMetadata->get('ContentLength'));
+
+        if ($this->useMultipartCopy && $size > $this->copySizeLimit) {
+            $copy = new MultipartCopy($this->getConnection(), [
+                'source_bucket' => $this->getBucket(),
+                'source_key' => $from
+            ], array_merge([
+                'bucket' => $this->getBucket(),
+                'key' => $to,
+                'acl' => 'private',
+                'params' => $this->getSSECParameters() + $this->getSSECParameters(true),
+                'source_metadata' => $sourceMetadata
+            ], $options));
+            $copy->copy();
+        } else {
+            $this->getConnection()->copy($this->getBucket(), $from, $this->getBucket(), $to, 'private', array_merge([
+                'params' => $this->getSSECParameters() + $this->getSSECParameters(true),
+                'mup_threshold' => PHP_INT_MAX,
+            ], $options));
+        }
+    }
+
+    public function preSignedUrl(string $urn, \DateTimeInterface $expiration): ?string {
+        $command = $this->getConnection()->getCommand('GetObject', [
+            'Bucket' => $this->getBucket(),
+            'Key' => $urn,
+        ]);
+
+        if (!$this->isUsePresignedUrl()) {
+            return null;
+        }
+
+        try {
+            return (string)$this->getConnection()->createPresignedRequest($command, $expiration, [
+                'signPayload' => true,
+            ])->getUri();
+        } catch (AwsException) {
+            return null;
+        }
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -40,11 +40,11 @@ 
 	 * @since 7.0.0
 	 */
 	public function readObject($urn) {
-		$fh = SeekableHttpStream::open(function ($range) use ($urn) {
+		$fh = 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 = [];
@@ -84,9 +84,9 @@ 
 		$result = [];
 		foreach ($metadata as $key => $value) {
 			if (mb_check_encoding($value, 'ASCII')) {
-				$result['x-amz-meta-' . $key] = $value;
+				$result['x-amz-meta-'.$key] = $value;
 			} else {
-				$result['x-amz-meta-' . $key] = 'base64:' . base64_encode($value);
+				$result['x-amz-meta-'.$key] = 'base64:'.base64_encode($value);
 			}
 		}
 		return $result;
@@ -157,12 +157,12 @@ 
 					'Metadata' => $this->buildS3Metadata($metaData),
 					'StorageClass' => $this->storageClass,
 				] + $this->getSSECParameters(),
-				'before_upload' => function (Command $command) use (&$totalWritten) {
+				'before_upload' => function(Command $command) use (&$totalWritten) {
 					$totalWritten += $command['ContentLength'];
 				},
-				'before_complete' => function ($_command) use (&$totalWritten, $size, &$uploader, &$attempts) {
+				'before_complete' => function($_command) use (&$totalWritten, $size, &$uploader, &$attempts) {
 					if ($size !== null && $totalWritten != $size) {
-						$e = new \Exception('Incomplete multi part upload, expected ' . $size . ' bytes, wrote ' . $totalWritten);
+						$e = new \Exception('Incomplete multi part upload, expected '.$size.' bytes, wrote '.$totalWritten);
 						throw new MultipartUploadException($uploader->getState(), $e);
 					}
 				},
@@ -275,7 +275,7 @@ 
 			'Key' => $from,
 		] + $this->getSSECParameters());
 
-		$size = (int)($sourceMetadata->get('Size') ?? $sourceMetadata->get('ContentLength'));
+		$size = (int) ($sourceMetadata->get('Size') ?? $sourceMetadata->get('ContentLength'));
 
 		if ($this->useMultipartCopy && $size > $this->copySizeLimit) {
 			$copy = new MultipartCopy($this->getConnection(), [
@@ -308,7 +308,7 @@ 
 		}
 
 		try {
-			return (string)$this->getConnection()->createPresignedRequest($command, $expiration, [
+			return (string) $this->getConnection()->createPresignedRequest($command, $expiration, [
 				'signPayload' => true,
 			])->getUri();
 		} catch (AwsException) {

lib/private/Files/ObjectStore/ObjectStoreStorage.php

Indentation +827 added lines, -827 removed lines

@@ -33,834 +33,834 @@
 use Psr\Log\LoggerInterface;
 
 class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFileWrite {
-	use CopyDirectory;
-
-	protected IObjectStore $objectStore;
-	protected string $id;
-	private string $objectPrefix = 'urn:oid:';
-
-	private LoggerInterface $logger;
-
-	private bool $handleCopiesAsOwned;
-	protected bool $validateWrites = true;
-	private bool $preserveCacheItemsOnDelete = false;
-	private ?int $totalSizeLimit = null;
-
-	/**
-	 * @param array $parameters
-	 * @throws \Exception
-	 */
-	public function __construct(array $parameters) {
-		if (isset($parameters['objectstore']) && $parameters['objectstore'] instanceof IObjectStore) {
-			$this->objectStore = $parameters['objectstore'];
-		} else {
-			throw new \Exception('missing IObjectStore instance');
-		}
-		if (isset($parameters['storageid'])) {
-			$this->id = 'object::store:' . $parameters['storageid'];
-		} else {
-			$this->id = 'object::store:' . $this->objectStore->getStorageId();
-		}
-		if (isset($parameters['objectPrefix'])) {
-			$this->objectPrefix = $parameters['objectPrefix'];
-		}
-		if (isset($parameters['validateWrites'])) {
-			$this->validateWrites = (bool)$parameters['validateWrites'];
-		}
-		$this->handleCopiesAsOwned = (bool)($parameters['handleCopiesAsOwned'] ?? false);
-		if (isset($parameters['totalSizeLimit'])) {
-			$this->totalSizeLimit = $parameters['totalSizeLimit'];
-		}
-
-		$this->logger = \OCP\Server::get(LoggerInterface::class);
-	}
-
-	public function mkdir(string $path, bool $force = false, array $metadata = []): bool {
-		$path = $this->normalizePath($path);
-		if (!$force && $this->file_exists($path)) {
-			$this->logger->warning("Tried to create an object store folder that already exists: $path");
-			return false;
-		}
-
-		$mTime = time();
-		$data = [
-			'mimetype' => 'httpd/unix-directory',
-			'size' => $metadata['size'] ?? 0,
-			'mtime' => $mTime,
-			'storage_mtime' => $mTime,
-			'permissions' => \OCP\Constants::PERMISSION_ALL,
-		];
-		if ($path === '') {
-			//create root on the fly
-			$data['etag'] = $this->getETag('');
-			$this->getCache()->put('', $data);
-			return true;
-		} else {
-			// if parent does not exist, create it
-			$parent = $this->normalizePath(dirname($path));
-			$parentType = $this->filetype($parent);
-			if ($parentType === false) {
-				if (!$this->mkdir($parent)) {
-					// something went wrong
-					$this->logger->warning("Parent folder ($parent) doesn't exist and couldn't be created");
-					return false;
-				}
-			} elseif ($parentType === 'file') {
-				// parent is a file
-				$this->logger->warning("Parent ($parent) is a file");
-				return false;
-			}
-			// finally create the new dir
-			$mTime = time(); // update mtime
-			$data['mtime'] = $mTime;
-			$data['storage_mtime'] = $mTime;
-			$data['etag'] = $this->getETag($path);
-			$this->getCache()->put($path, $data);
-			return true;
-		}
-	}
-
-	private function normalizePath(string $path): string {
-		$path = trim($path, '/');
-		//FIXME why do we sometimes get a path like 'files//username'?
-		$path = str_replace('//', '/', $path);
-
-		// dirname('/folder') returns '.' but internally (in the cache) we store the root as ''
-		if (!$path || $path === '.') {
-			$path = '';
-		}
-
-		return $path;
-	}
-
-	/**
-	 * Object Stores use a NoopScanner because metadata is directly stored in
-	 * the file cache and cannot really scan the filesystem. The storage passed in is not used anywhere.
-	 */
-	public function getScanner(string $path = '', ?IStorage $storage = null): IScanner {
-		if (!$storage) {
-			$storage = $this;
-		}
-		if (!isset($this->scanner)) {
-			$this->scanner = new ObjectStoreScanner($storage);
-		}
-		/** @var \OC\Files\ObjectStore\ObjectStoreScanner */
-		return $this->scanner;
-	}
-
-	public function getId(): string {
-		return $this->id;
-	}
-
-	public function rmdir(string $path): bool {
-		$path = $this->normalizePath($path);
-		$entry = $this->getCache()->get($path);
-
-		if (!$entry || $entry->getMimeType() !== ICacheEntry::DIRECTORY_MIMETYPE) {
-			return false;
-		}
-
-		return $this->rmObjects($entry);
-	}
-
-	private function rmObjects(ICacheEntry $entry): bool {
-		$children = $this->getCache()->getFolderContentsById($entry->getId());
-		foreach ($children as $child) {
-			if ($child->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
-				if (!$this->rmObjects($child)) {
-					return false;
-				}
-			} else {
-				if (!$this->rmObject($child)) {
-					return false;
-				}
-			}
-		}
-
-		if (!$this->preserveCacheItemsOnDelete) {
-			$this->getCache()->remove($entry->getPath());
-		}
-
-		return true;
-	}
-
-	public function unlink(string $path): bool {
-		$path = $this->normalizePath($path);
-		$entry = $this->getCache()->get($path);
-
-		if ($entry instanceof ICacheEntry) {
-			if ($entry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
-				return $this->rmObjects($entry);
-			} else {
-				return $this->rmObject($entry);
-			}
-		}
-		return false;
-	}
-
-	public function rmObject(ICacheEntry $entry): bool {
-		try {
-			$this->objectStore->deleteObject($this->getURN($entry->getId()));
-		} catch (\Exception $ex) {
-			if ($ex->getCode() !== 404) {
-				$this->logger->error(
-					'Could not delete object ' . $this->getURN($entry->getId()) . ' for ' . $entry->getPath(),
-					[
-						'app' => 'objectstore',
-						'exception' => $ex,
-					]
-				);
-				return false;
-			}
-			//removing from cache is ok as it does not exist in the objectstore anyway
-		}
-		if (!$this->preserveCacheItemsOnDelete) {
-			$this->getCache()->remove($entry->getPath());
-		}
-		return true;
-	}
-
-	public function stat(string $path): array|false {
-		$path = $this->normalizePath($path);
-		$cacheEntry = $this->getCache()->get($path);
-		if ($cacheEntry instanceof CacheEntry) {
-			return $cacheEntry->getData();
-		} else {
-			if ($path === '') {
-				$this->mkdir('', true);
-				$cacheEntry = $this->getCache()->get($path);
-				if ($cacheEntry instanceof CacheEntry) {
-					return $cacheEntry->getData();
-				}
-			}
-			return false;
-		}
-	}
-
-	public function getPermissions(string $path): int {
-		$stat = $this->stat($path);
-
-		if (is_array($stat) && isset($stat['permissions'])) {
-			return $stat['permissions'];
-		}
-
-		return parent::getPermissions($path);
-	}
-
-	/**
-	 * Override this method if you need a different unique resource identifier for your object storage implementation.
-	 * The default implementations just appends the fileId to 'urn:oid:'. Make sure the URN is unique over all users.
-	 * You may need a mapping table to store your URN if it cannot be generated from the fileid.
-	 *
-	 * @return string the unified resource name used to identify the object
-	 */
-	public function getURN(int $fileId): string {
-		return $this->objectPrefix . $fileId;
-	}
-
-	public function opendir(string $path) {
-		$path = $this->normalizePath($path);
-
-		try {
-			$files = [];
-			$folderContents = $this->getCache()->getFolderContents($path);
-			foreach ($folderContents as $file) {
-				$files[] = $file['name'];
-			}
-
-			return IteratorDirectory::wrap($files);
-		} catch (\Exception $e) {
-			$this->logger->error($e->getMessage(), ['exception' => $e]);
-			return false;
-		}
-	}
-
-	public function filetype(string $path): string|false {
-		$path = $this->normalizePath($path);
-		$stat = $this->stat($path);
-		if ($stat) {
-			if ($stat['mimetype'] === 'httpd/unix-directory') {
-				return 'dir';
-			}
-			return 'file';
-		} else {
-			return false;
-		}
-	}
-
-	public function fopen(string $path, string $mode) {
-		$path = $this->normalizePath($path);
-
-		if (strrpos($path, '.') !== false) {
-			$ext = substr($path, strrpos($path, '.'));
-		} else {
-			$ext = '';
-		}
-
-		switch ($mode) {
-			case 'r':
-			case 'rb':
-				$stat = $this->stat($path);
-				if (is_array($stat)) {
-					$filesize = $stat['size'] ?? 0;
-					// Reading 0 sized files is a waste of time
-					if ($filesize === 0) {
-						return fopen('php://memory', $mode);
-					}
-
-					try {
-						$handle = $this->objectStore->readObject($this->getURN($stat['fileid']));
-						if ($handle === false) {
-							return false; // keep backward compatibility
-						}
-						$streamStat = fstat($handle);
-						$actualSize = $streamStat['size'] ?? -1;
-						if ($actualSize > -1 && $actualSize !== $filesize) {
-							$this->getCache()->update((int)$stat['fileid'], ['size' => $actualSize]);
-						}
-						return $handle;
-					} catch (NotFoundException $e) {
-						$this->logger->error(
-							'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
-							[
-								'app' => 'objectstore',
-								'exception' => $e,
-							]
-						);
-						throw $e;
-					} catch (\Exception $e) {
-						$this->logger->error(
-							'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
-							[
-								'app' => 'objectstore',
-								'exception' => $e,
-							]
-						);
-						return false;
-					}
-				} else {
-					return false;
-				}
-				// no break
-			case 'w':
-			case 'wb':
-			case 'w+':
-			case 'wb+':
-				$dirName = dirname($path);
-				$parentExists = $this->is_dir($dirName);
-				if (!$parentExists) {
-					return false;
-				}
-
-				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
-				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
-					$this->writeBack($tmpFile, $path);
-					unlink($tmpFile);
-				});
-			case 'a':
-			case 'ab':
-			case 'r+':
-			case 'a+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
-				if ($this->file_exists($path)) {
-					$source = $this->fopen($path, 'r');
-					file_put_contents($tmpFile, $source);
-				}
-				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
-					$this->writeBack($tmpFile, $path);
-					unlink($tmpFile);
-				});
-		}
-		return false;
-	}
-
-	public function file_exists(string $path): bool {
-		$path = $this->normalizePath($path);
-		return (bool)$this->stat($path);
-	}
-
-	public function rename(string $source, string $target): bool {
-		$source = $this->normalizePath($source);
-		$target = $this->normalizePath($target);
-		$this->remove($target);
-		$this->getCache()->move($source, $target);
-		$this->touch(dirname($target));
-		return true;
-	}
-
-	public function getMimeType(string $path): string|false {
-		$path = $this->normalizePath($path);
-		return parent::getMimeType($path);
-	}
-
-	public function touch(string $path, ?int $mtime = null): bool {
-		if (is_null($mtime)) {
-			$mtime = time();
-		}
-
-		$path = $this->normalizePath($path);
-		$dirName = dirname($path);
-		$parentExists = $this->is_dir($dirName);
-		if (!$parentExists) {
-			return false;
-		}
-
-		$stat = $this->stat($path);
-		if (is_array($stat)) {
-			// update existing mtime in db
-			$stat['mtime'] = $mtime;
-			$this->getCache()->update($stat['fileid'], $stat);
-		} else {
-			try {
-				//create a empty file, need to have at least on char to make it
-				// work with all object storage implementations
-				$this->file_put_contents($path, ' ');
-			} catch (\Exception $ex) {
-				$this->logger->error(
-					'Could not create object for ' . $path,
-					[
-						'app' => 'objectstore',
-						'exception' => $ex,
-					]
-				);
-				throw $ex;
-			}
-		}
-		return true;
-	}
-
-	public function writeBack(string $tmpFile, string $path) {
-		$size = filesize($tmpFile);
-		$this->writeStream($path, fopen($tmpFile, 'r'), $size);
-	}
-
-	public function hasUpdated(string $path, int $time): bool {
-		return false;
-	}
-
-	public function needsPartFile(): bool {
-		return false;
-	}
-
-	public function file_put_contents(string $path, mixed $data): int {
-		$fh = fopen('php://temp', 'w+');
-		fwrite($fh, $data);
-		rewind($fh);
-		return $this->writeStream($path, $fh, strlen($data));
-	}
-
-	public function writeStream(string $path, $stream, ?int $size = null): int {
-		if ($size === null) {
-			$stats = fstat($stream);
-			if (is_array($stats) && isset($stats['size'])) {
-				$size = $stats['size'];
-			}
-		}
-
-		$stat = $this->stat($path);
-		if (empty($stat)) {
-			// create new file
-			$stat = [
-				'permissions' => \OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE,
-			];
-		}
-		// update stat with new data
-		$mTime = time();
-		$stat['size'] = (int)$size;
-		$stat['mtime'] = $mTime;
-		$stat['storage_mtime'] = $mTime;
-
-		$mimetypeDetector = \OC::$server->getMimeTypeDetector();
-		$mimetype = $mimetypeDetector->detectPath($path);
-		$metadata = [
-			'mimetype' => $mimetype,
-			'original-storage' => $this->getId(),
-			'original-path' => $path,
-		];
-		if ($size) {
-			$metadata['size'] = $size;
-		}
-
-		$stat['mimetype'] = $mimetype;
-		$stat['etag'] = $this->getETag($path);
-		$stat['checksum'] = '';
-
-		$exists = $this->getCache()->inCache($path);
-		$uploadPath = $exists ? $path : $path . '.part';
-
-		if ($exists) {
-			$fileId = $stat['fileid'];
-		} else {
-			$parent = $this->normalizePath(dirname($path));
-			if (!$this->is_dir($parent)) {
-				throw new \InvalidArgumentException("trying to upload a file ($path) inside a non-directory ($parent)");
-			}
-			$fileId = $this->getCache()->put($uploadPath, $stat);
-		}
-
-		$urn = $this->getURN($fileId);
-		try {
-			//upload to object storage
-
-			$totalWritten = 0;
-			$countStream = CountWrapper::wrap($stream, function ($writtenSize) use ($fileId, $size, $exists, &$totalWritten) {
-				if (is_null($size) && !$exists) {
-					$this->getCache()->update($fileId, [
-						'size' => $writtenSize,
-					]);
-				}
-				$totalWritten = $writtenSize;
-			});
-
-			if ($this->objectStore instanceof IObjectStoreMetaData) {
-				$this->objectStore->writeObjectWithMetaData($urn, $countStream, $metadata);
-			} else {
-				$this->objectStore->writeObject($urn, $countStream, $metadata['mimetype']);
-			}
-			if (is_resource($countStream)) {
-				fclose($countStream);
-			}
-
-			$stat['size'] = $totalWritten;
-		} catch (\Exception $ex) {
-			if (!$exists) {
-				/*
+    use CopyDirectory;
+
+    protected IObjectStore $objectStore;
+    protected string $id;
+    private string $objectPrefix = 'urn:oid:';
+
+    private LoggerInterface $logger;
+
+    private bool $handleCopiesAsOwned;
+    protected bool $validateWrites = true;
+    private bool $preserveCacheItemsOnDelete = false;
+    private ?int $totalSizeLimit = null;
+
+    /**
+     * @param array $parameters
+     * @throws \Exception
+     */
+    public function __construct(array $parameters) {
+        if (isset($parameters['objectstore']) && $parameters['objectstore'] instanceof IObjectStore) {
+            $this->objectStore = $parameters['objectstore'];
+        } else {
+            throw new \Exception('missing IObjectStore instance');
+        }
+        if (isset($parameters['storageid'])) {
+            $this->id = 'object::store:' . $parameters['storageid'];
+        } else {
+            $this->id = 'object::store:' . $this->objectStore->getStorageId();
+        }
+        if (isset($parameters['objectPrefix'])) {
+            $this->objectPrefix = $parameters['objectPrefix'];
+        }
+        if (isset($parameters['validateWrites'])) {
+            $this->validateWrites = (bool)$parameters['validateWrites'];
+        }
+        $this->handleCopiesAsOwned = (bool)($parameters['handleCopiesAsOwned'] ?? false);
+        if (isset($parameters['totalSizeLimit'])) {
+            $this->totalSizeLimit = $parameters['totalSizeLimit'];
+        }
+
+        $this->logger = \OCP\Server::get(LoggerInterface::class);
+    }
+
+    public function mkdir(string $path, bool $force = false, array $metadata = []): bool {
+        $path = $this->normalizePath($path);
+        if (!$force && $this->file_exists($path)) {
+            $this->logger->warning("Tried to create an object store folder that already exists: $path");
+            return false;
+        }
+
+        $mTime = time();
+        $data = [
+            'mimetype' => 'httpd/unix-directory',
+            'size' => $metadata['size'] ?? 0,
+            'mtime' => $mTime,
+            'storage_mtime' => $mTime,
+            'permissions' => \OCP\Constants::PERMISSION_ALL,
+        ];
+        if ($path === '') {
+            //create root on the fly
+            $data['etag'] = $this->getETag('');
+            $this->getCache()->put('', $data);
+            return true;
+        } else {
+            // if parent does not exist, create it
+            $parent = $this->normalizePath(dirname($path));
+            $parentType = $this->filetype($parent);
+            if ($parentType === false) {
+                if (!$this->mkdir($parent)) {
+                    // something went wrong
+                    $this->logger->warning("Parent folder ($parent) doesn't exist and couldn't be created");
+                    return false;
+                }
+            } elseif ($parentType === 'file') {
+                // parent is a file
+                $this->logger->warning("Parent ($parent) is a file");
+                return false;
+            }
+            // finally create the new dir
+            $mTime = time(); // update mtime
+            $data['mtime'] = $mTime;
+            $data['storage_mtime'] = $mTime;
+            $data['etag'] = $this->getETag($path);
+            $this->getCache()->put($path, $data);
+            return true;
+        }
+    }
+
+    private function normalizePath(string $path): string {
+        $path = trim($path, '/');
+        //FIXME why do we sometimes get a path like 'files//username'?
+        $path = str_replace('//', '/', $path);
+
+        // dirname('/folder') returns '.' but internally (in the cache) we store the root as ''
+        if (!$path || $path === '.') {
+            $path = '';
+        }
+
+        return $path;
+    }
+
+    /**
+     * Object Stores use a NoopScanner because metadata is directly stored in
+     * the file cache and cannot really scan the filesystem. The storage passed in is not used anywhere.
+     */
+    public function getScanner(string $path = '', ?IStorage $storage = null): IScanner {
+        if (!$storage) {
+            $storage = $this;
+        }
+        if (!isset($this->scanner)) {
+            $this->scanner = new ObjectStoreScanner($storage);
+        }
+        /** @var \OC\Files\ObjectStore\ObjectStoreScanner */
+        return $this->scanner;
+    }
+
+    public function getId(): string {
+        return $this->id;
+    }
+
+    public function rmdir(string $path): bool {
+        $path = $this->normalizePath($path);
+        $entry = $this->getCache()->get($path);
+
+        if (!$entry || $entry->getMimeType() !== ICacheEntry::DIRECTORY_MIMETYPE) {
+            return false;
+        }
+
+        return $this->rmObjects($entry);
+    }
+
+    private function rmObjects(ICacheEntry $entry): bool {
+        $children = $this->getCache()->getFolderContentsById($entry->getId());
+        foreach ($children as $child) {
+            if ($child->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
+                if (!$this->rmObjects($child)) {
+                    return false;
+                }
+            } else {
+                if (!$this->rmObject($child)) {
+                    return false;
+                }
+            }
+        }
+
+        if (!$this->preserveCacheItemsOnDelete) {
+            $this->getCache()->remove($entry->getPath());
+        }
+
+        return true;
+    }
+
+    public function unlink(string $path): bool {
+        $path = $this->normalizePath($path);
+        $entry = $this->getCache()->get($path);
+
+        if ($entry instanceof ICacheEntry) {
+            if ($entry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
+                return $this->rmObjects($entry);
+            } else {
+                return $this->rmObject($entry);
+            }
+        }
+        return false;
+    }
+
+    public function rmObject(ICacheEntry $entry): bool {
+        try {
+            $this->objectStore->deleteObject($this->getURN($entry->getId()));
+        } catch (\Exception $ex) {
+            if ($ex->getCode() !== 404) {
+                $this->logger->error(
+                    'Could not delete object ' . $this->getURN($entry->getId()) . ' for ' . $entry->getPath(),
+                    [
+                        'app' => 'objectstore',
+                        'exception' => $ex,
+                    ]
+                );
+                return false;
+            }
+            //removing from cache is ok as it does not exist in the objectstore anyway
+        }
+        if (!$this->preserveCacheItemsOnDelete) {
+            $this->getCache()->remove($entry->getPath());
+        }
+        return true;
+    }
+
+    public function stat(string $path): array|false {
+        $path = $this->normalizePath($path);
+        $cacheEntry = $this->getCache()->get($path);
+        if ($cacheEntry instanceof CacheEntry) {
+            return $cacheEntry->getData();
+        } else {
+            if ($path === '') {
+                $this->mkdir('', true);
+                $cacheEntry = $this->getCache()->get($path);
+                if ($cacheEntry instanceof CacheEntry) {
+                    return $cacheEntry->getData();
+                }
+            }
+            return false;
+        }
+    }
+
+    public function getPermissions(string $path): int {
+        $stat = $this->stat($path);
+
+        if (is_array($stat) && isset($stat['permissions'])) {
+            return $stat['permissions'];
+        }
+
+        return parent::getPermissions($path);
+    }
+
+    /**
+     * Override this method if you need a different unique resource identifier for your object storage implementation.
+     * The default implementations just appends the fileId to 'urn:oid:'. Make sure the URN is unique over all users.
+     * You may need a mapping table to store your URN if it cannot be generated from the fileid.
+     *
+     * @return string the unified resource name used to identify the object
+     */
+    public function getURN(int $fileId): string {
+        return $this->objectPrefix . $fileId;
+    }
+
+    public function opendir(string $path) {
+        $path = $this->normalizePath($path);
+
+        try {
+            $files = [];
+            $folderContents = $this->getCache()->getFolderContents($path);
+            foreach ($folderContents as $file) {
+                $files[] = $file['name'];
+            }
+
+            return IteratorDirectory::wrap($files);
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage(), ['exception' => $e]);
+            return false;
+        }
+    }
+
+    public function filetype(string $path): string|false {
+        $path = $this->normalizePath($path);
+        $stat = $this->stat($path);
+        if ($stat) {
+            if ($stat['mimetype'] === 'httpd/unix-directory') {
+                return 'dir';
+            }
+            return 'file';
+        } else {
+            return false;
+        }
+    }
+
+    public function fopen(string $path, string $mode) {
+        $path = $this->normalizePath($path);
+
+        if (strrpos($path, '.') !== false) {
+            $ext = substr($path, strrpos($path, '.'));
+        } else {
+            $ext = '';
+        }
+
+        switch ($mode) {
+            case 'r':
+            case 'rb':
+                $stat = $this->stat($path);
+                if (is_array($stat)) {
+                    $filesize = $stat['size'] ?? 0;
+                    // Reading 0 sized files is a waste of time
+                    if ($filesize === 0) {
+                        return fopen('php://memory', $mode);
+                    }
+
+                    try {
+                        $handle = $this->objectStore->readObject($this->getURN($stat['fileid']));
+                        if ($handle === false) {
+                            return false; // keep backward compatibility
+                        }
+                        $streamStat = fstat($handle);
+                        $actualSize = $streamStat['size'] ?? -1;
+                        if ($actualSize > -1 && $actualSize !== $filesize) {
+                            $this->getCache()->update((int)$stat['fileid'], ['size' => $actualSize]);
+                        }
+                        return $handle;
+                    } catch (NotFoundException $e) {
+                        $this->logger->error(
+                            'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
+                            [
+                                'app' => 'objectstore',
+                                'exception' => $e,
+                            ]
+                        );
+                        throw $e;
+                    } catch (\Exception $e) {
+                        $this->logger->error(
+                            'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
+                            [
+                                'app' => 'objectstore',
+                                'exception' => $e,
+                            ]
+                        );
+                        return false;
+                    }
+                } else {
+                    return false;
+                }
+                // no break
+            case 'w':
+            case 'wb':
+            case 'w+':
+            case 'wb+':
+                $dirName = dirname($path);
+                $parentExists = $this->is_dir($dirName);
+                if (!$parentExists) {
+                    return false;
+                }
+
+                $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
+                $handle = fopen($tmpFile, $mode);
+                return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+                    $this->writeBack($tmpFile, $path);
+                    unlink($tmpFile);
+                });
+            case 'a':
+            case 'ab':
+            case 'r+':
+            case 'a+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
+                if ($this->file_exists($path)) {
+                    $source = $this->fopen($path, 'r');
+                    file_put_contents($tmpFile, $source);
+                }
+                $handle = fopen($tmpFile, $mode);
+                return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+                    $this->writeBack($tmpFile, $path);
+                    unlink($tmpFile);
+                });
+        }
+        return false;
+    }
+
+    public function file_exists(string $path): bool {
+        $path = $this->normalizePath($path);
+        return (bool)$this->stat($path);
+    }
+
+    public function rename(string $source, string $target): bool {
+        $source = $this->normalizePath($source);
+        $target = $this->normalizePath($target);
+        $this->remove($target);
+        $this->getCache()->move($source, $target);
+        $this->touch(dirname($target));
+        return true;
+    }
+
+    public function getMimeType(string $path): string|false {
+        $path = $this->normalizePath($path);
+        return parent::getMimeType($path);
+    }
+
+    public function touch(string $path, ?int $mtime = null): bool {
+        if (is_null($mtime)) {
+            $mtime = time();
+        }
+
+        $path = $this->normalizePath($path);
+        $dirName = dirname($path);
+        $parentExists = $this->is_dir($dirName);
+        if (!$parentExists) {
+            return false;
+        }
+
+        $stat = $this->stat($path);
+        if (is_array($stat)) {
+            // update existing mtime in db
+            $stat['mtime'] = $mtime;
+            $this->getCache()->update($stat['fileid'], $stat);
+        } else {
+            try {
+                //create a empty file, need to have at least on char to make it
+                // work with all object storage implementations
+                $this->file_put_contents($path, ' ');
+            } catch (\Exception $ex) {
+                $this->logger->error(
+                    'Could not create object for ' . $path,
+                    [
+                        'app' => 'objectstore',
+                        'exception' => $ex,
+                    ]
+                );
+                throw $ex;
+            }
+        }
+        return true;
+    }
+
+    public function writeBack(string $tmpFile, string $path) {
+        $size = filesize($tmpFile);
+        $this->writeStream($path, fopen($tmpFile, 'r'), $size);
+    }
+
+    public function hasUpdated(string $path, int $time): bool {
+        return false;
+    }
+
+    public function needsPartFile(): bool {
+        return false;
+    }
+
+    public function file_put_contents(string $path, mixed $data): int {
+        $fh = fopen('php://temp', 'w+');
+        fwrite($fh, $data);
+        rewind($fh);
+        return $this->writeStream($path, $fh, strlen($data));
+    }
+
+    public function writeStream(string $path, $stream, ?int $size = null): int {
+        if ($size === null) {
+            $stats = fstat($stream);
+            if (is_array($stats) && isset($stats['size'])) {
+                $size = $stats['size'];
+            }
+        }
+
+        $stat = $this->stat($path);
+        if (empty($stat)) {
+            // create new file
+            $stat = [
+                'permissions' => \OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE,
+            ];
+        }
+        // update stat with new data
+        $mTime = time();
+        $stat['size'] = (int)$size;
+        $stat['mtime'] = $mTime;
+        $stat['storage_mtime'] = $mTime;
+
+        $mimetypeDetector = \OC::$server->getMimeTypeDetector();
+        $mimetype = $mimetypeDetector->detectPath($path);
+        $metadata = [
+            'mimetype' => $mimetype,
+            'original-storage' => $this->getId(),
+            'original-path' => $path,
+        ];
+        if ($size) {
+            $metadata['size'] = $size;
+        }
+
+        $stat['mimetype'] = $mimetype;
+        $stat['etag'] = $this->getETag($path);
+        $stat['checksum'] = '';
+
+        $exists = $this->getCache()->inCache($path);
+        $uploadPath = $exists ? $path : $path . '.part';
+
+        if ($exists) {
+            $fileId = $stat['fileid'];
+        } else {
+            $parent = $this->normalizePath(dirname($path));
+            if (!$this->is_dir($parent)) {
+                throw new \InvalidArgumentException("trying to upload a file ($path) inside a non-directory ($parent)");
+            }
+            $fileId = $this->getCache()->put($uploadPath, $stat);
+        }
+
+        $urn = $this->getURN($fileId);
+        try {
+            //upload to object storage
+
+            $totalWritten = 0;
+            $countStream = CountWrapper::wrap($stream, function ($writtenSize) use ($fileId, $size, $exists, &$totalWritten) {
+                if (is_null($size) && !$exists) {
+                    $this->getCache()->update($fileId, [
+                        'size' => $writtenSize,
+                    ]);
+                }
+                $totalWritten = $writtenSize;
+            });
+
+            if ($this->objectStore instanceof IObjectStoreMetaData) {
+                $this->objectStore->writeObjectWithMetaData($urn, $countStream, $metadata);
+            } else {
+                $this->objectStore->writeObject($urn, $countStream, $metadata['mimetype']);
+            }
+            if (is_resource($countStream)) {
+                fclose($countStream);
+            }
+
+            $stat['size'] = $totalWritten;
+        } catch (\Exception $ex) {
+            if (!$exists) {
+                /*
 				 * Only remove the entry if we are dealing with a new file.
 				 * Else people lose access to existing files
 				 */
-				$this->getCache()->remove($uploadPath);
-				$this->logger->error(
-					'Could not create object ' . $urn . ' for ' . $path,
-					[
-						'app' => 'objectstore',
-						'exception' => $ex,
-					]
-				);
-			} else {
-				$this->logger->error(
-					'Could not update object ' . $urn . ' for ' . $path,
-					[
-						'app' => 'objectstore',
-						'exception' => $ex,
-					]
-				);
-			}
-			throw new GenericFileException('Error while writing stream to object store', 0, $ex);
-		}
-
-		if ($exists) {
-			// Always update the unencrypted size, for encryption the Encryption wrapper will update this afterwards anyways
-			$stat['unencrypted_size'] = $stat['size'];
-			$this->getCache()->update($fileId, $stat);
-		} else {
-			if (!$this->validateWrites || $this->objectStore->objectExists($urn)) {
-				$this->getCache()->move($uploadPath, $path);
-			} else {
-				$this->getCache()->remove($uploadPath);
-				throw new \Exception("Object not found after writing (urn: $urn, path: $path)", 404);
-			}
-		}
-
-		return $totalWritten;
-	}
-
-	public function getObjectStore(): IObjectStore {
-		return $this->objectStore;
-	}
-
-	public function copyFromStorage(
-		IStorage $sourceStorage,
-		string $sourceInternalPath,
-		string $targetInternalPath,
-		bool $preserveMtime = false,
-	): bool {
-		if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class)) {
-			/** @var ObjectStoreStorage $sourceStorage */
-			if ($sourceStorage->getObjectStore()->getStorageId() === $this->getObjectStore()->getStorageId()) {
-				/** @var CacheEntry $sourceEntry */
-				$sourceEntry = $sourceStorage->getCache()->get($sourceInternalPath);
-				$sourceEntryData = $sourceEntry->getData();
-				// $sourceEntry['permissions'] here is the permissions from the jailed storage for the current
-				// user. Instead we use $sourceEntryData['scan_permissions'] that are the permissions from the
-				// unjailed storage.
-				if (is_array($sourceEntryData) && array_key_exists('scan_permissions', $sourceEntryData)) {
-					$sourceEntry['permissions'] = $sourceEntryData['scan_permissions'];
-				}
-				$this->copyInner($sourceStorage->getCache(), $sourceEntry, $targetInternalPath);
-				return true;
-			}
-		}
-
-		return parent::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
-	}
-
-	public function moveFromStorage(IStorage $sourceStorage, string $sourceInternalPath, string $targetInternalPath, ?ICacheEntry $sourceCacheEntry = null): bool {
-		$sourceCache = $sourceStorage->getCache();
-		if (
-			$sourceStorage->instanceOfStorage(ObjectStoreStorage::class)
-			&& $sourceStorage->getObjectStore()->getStorageId() === $this->getObjectStore()->getStorageId()
-		) {
-			if ($this->getCache()->get($targetInternalPath)) {
-				$this->unlink($targetInternalPath);
-				$this->getCache()->remove($targetInternalPath);
-			}
-			$this->getCache()->moveFromCache($sourceCache, $sourceInternalPath, $targetInternalPath);
-			// Do not import any data when source and target bucket are identical.
-			return true;
-		}
-		if (!$sourceCacheEntry) {
-			$sourceCacheEntry = $sourceCache->get($sourceInternalPath);
-		}
-
-		$this->copyObjects($sourceStorage, $sourceCache, $sourceCacheEntry);
-		if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class)) {
-			/** @var ObjectStoreStorage $sourceStorage */
-			$sourceStorage->setPreserveCacheOnDelete(true);
-		}
-		if ($sourceCacheEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
-			$sourceStorage->rmdir($sourceInternalPath);
-		} else {
-			$sourceStorage->unlink($sourceInternalPath);
-		}
-		if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class)) {
-			/** @var ObjectStoreStorage $sourceStorage */
-			$sourceStorage->setPreserveCacheOnDelete(false);
-		}
-		if ($this->getCache()->get($targetInternalPath)) {
-			$this->unlink($targetInternalPath);
-			$this->getCache()->remove($targetInternalPath);
-		}
-		$this->getCache()->moveFromCache($sourceCache, $sourceInternalPath, $targetInternalPath);
-
-		return true;
-	}
-
-	/**
-	 * Copy the object(s) of a file or folder into this storage, without touching the cache
-	 */
-	private function copyObjects(IStorage $sourceStorage, ICache $sourceCache, ICacheEntry $sourceCacheEntry) {
-		$copiedFiles = [];
-		try {
-			foreach ($this->getAllChildObjects($sourceCache, $sourceCacheEntry) as $file) {
-				$sourceStream = $sourceStorage->fopen($file->getPath(), 'r');
-				if (!$sourceStream) {
-					throw new \Exception("Failed to open source file {$file->getPath()} ({$file->getId()})");
-				}
-				$this->objectStore->writeObject($this->getURN($file->getId()), $sourceStream, $file->getMimeType());
-				if (is_resource($sourceStream)) {
-					fclose($sourceStream);
-				}
-				$copiedFiles[] = $file->getId();
-			}
-		} catch (\Exception $e) {
-			foreach ($copiedFiles as $fileId) {
-				try {
-					$this->objectStore->deleteObject($this->getURN($fileId));
-				} catch (\Exception $e) {
-					// ignore
-				}
-			}
-			throw $e;
-		}
-	}
-
-	/**
-	 * @return \Iterator<ICacheEntry>
-	 */
-	private function getAllChildObjects(ICache $cache, ICacheEntry $entry): \Iterator {
-		if ($entry->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
-			foreach ($cache->getFolderContentsById($entry->getId()) as $child) {
-				yield from $this->getAllChildObjects($cache, $child);
-			}
-		} else {
-			yield $entry;
-		}
-	}
-
-	public function copy(string $source, string $target): bool {
-		$source = $this->normalizePath($source);
-		$target = $this->normalizePath($target);
-
-		$cache = $this->getCache();
-		$sourceEntry = $cache->get($source);
-		if (!$sourceEntry) {
-			throw new NotFoundException('Source object not found');
-		}
-
-		$this->copyInner($cache, $sourceEntry, $target);
-
-		return true;
-	}
-
-	private function copyInner(ICache $sourceCache, ICacheEntry $sourceEntry, string $to) {
-		$cache = $this->getCache();
-
-		if ($sourceEntry->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
-			if ($cache->inCache($to)) {
-				$cache->remove($to);
-			}
-			$this->mkdir($to, false, ['size' => $sourceEntry->getSize()]);
-
-			foreach ($sourceCache->getFolderContentsById($sourceEntry->getId()) as $child) {
-				$this->copyInner($sourceCache, $child, $to . '/' . $child->getName());
-			}
-		} else {
-			$this->copyFile($sourceEntry, $to);
-		}
-	}
-
-	private function copyFile(ICacheEntry $sourceEntry, string $to) {
-		$cache = $this->getCache();
-
-		$sourceUrn = $this->getURN($sourceEntry->getId());
-
-		if (!$cache instanceof Cache) {
-			throw new \Exception('Invalid source cache for object store copy');
-		}
-
-		$targetId = $cache->copyFromCache($cache, $sourceEntry, $to);
-
-		$targetUrn = $this->getURN($targetId);
-
-		try {
-			$this->objectStore->copyObject($sourceUrn, $targetUrn);
-			if ($this->handleCopiesAsOwned) {
-				// Copied the file thus we gain all permissions as we are the owner now ! warning while this aligns with local storage it should not be used and instead fix local storage !
-				$cache->update($targetId, ['permissions' => \OCP\Constants::PERMISSION_ALL]);
-			}
-		} catch (\Exception $e) {
-			$cache->remove($to);
-
-			throw $e;
-		}
-	}
-
-	public function startChunkedWrite(string $targetPath): string {
-		if (!$this->objectStore instanceof IObjectStoreMultiPartUpload) {
-			throw new GenericFileException('Object store does not support multipart upload');
-		}
-		$cacheEntry = $this->getCache()->get($targetPath);
-		$urn = $this->getURN($cacheEntry->getId());
-		return $this->objectStore->initiateMultipartUpload($urn);
-	}
-
-	/**
-	 * @throws GenericFileException
-	 */
-	public function putChunkedWritePart(
-		string $targetPath,
-		string $writeToken,
-		string $chunkId,
-		$data,
-		$size = null,
-	): ?array {
-		if (!$this->objectStore instanceof IObjectStoreMultiPartUpload) {
-			throw new GenericFileException('Object store does not support multipart upload');
-		}
-
-		$cacheEntry = $this->getCache()->get($targetPath);
-		$urn = $this->getURN($cacheEntry->getId());
-
-		$result = $this->objectStore->uploadMultipartPart($urn, $writeToken, (int)$chunkId, $data, $size);
-
-		$parts[$chunkId] = [
-			'PartNumber' => $chunkId,
-			'ETag' => trim($result->get('ETag'), '"'),
-		];
-		return $parts[$chunkId];
-	}
-
-	public function completeChunkedWrite(string $targetPath, string $writeToken): int {
-		if (!$this->objectStore instanceof IObjectStoreMultiPartUpload) {
-			throw new GenericFileException('Object store does not support multipart upload');
-		}
-		$cacheEntry = $this->getCache()->get($targetPath);
-		$urn = $this->getURN($cacheEntry->getId());
-		$parts = $this->objectStore->getMultipartUploads($urn, $writeToken);
-		$sortedParts = array_values($parts);
-		sort($sortedParts);
-		try {
-			$size = $this->objectStore->completeMultipartUpload($urn, $writeToken, $sortedParts);
-			$stat = $this->stat($targetPath);
-			$mtime = time();
-			if (is_array($stat)) {
-				$stat['size'] = $size;
-				$stat['mtime'] = $mtime;
-				$stat['mimetype'] = $this->getMimeType($targetPath);
-				$this->getCache()->update($stat['fileid'], $stat);
-			}
-		} catch (S3MultipartUploadException|S3Exception $e) {
-			$this->objectStore->abortMultipartUpload($urn, $writeToken);
-			$this->logger->error(
-				'Could not complete multipart upload ' . $urn . ' with uploadId ' . $writeToken,
-				[
-					'app' => 'objectstore',
-					'exception' => $e,
-				]
-			);
-			throw new GenericFileException('Could not write chunked file');
-		}
-		return $size;
-	}
-
-	public function cancelChunkedWrite(string $targetPath, string $writeToken): void {
-		if (!$this->objectStore instanceof IObjectStoreMultiPartUpload) {
-			throw new GenericFileException('Object store does not support multipart upload');
-		}
-		$cacheEntry = $this->getCache()->get($targetPath);
-		$urn = $this->getURN($cacheEntry->getId());
-		$this->objectStore->abortMultipartUpload($urn, $writeToken);
-	}
-
-	public function setPreserveCacheOnDelete(bool $preserve) {
-		$this->preserveCacheItemsOnDelete = $preserve;
-	}
-
-	public function free_space(string $path): int|float|false {
-		if ($this->totalSizeLimit === null) {
-			return FileInfo::SPACE_UNLIMITED;
-		}
-
-		// To avoid iterating all objects in the object store, calculate the sum of the cached sizes of the root folders of all object storages.
-		$qb = Server::get(IDBConnection::class)->getQueryBuilder();
-		$result = $qb->select($qb->func()->sum('f.size'))
-			->from('storages', 's')
-			->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('f.storage', 's.numeric_id'))
-			->where($qb->expr()->like('s.id', $qb->createNamedParameter('object::%'), IQueryBuilder::PARAM_STR))
-			->andWhere($qb->expr()->eq('f.path', $qb->createNamedParameter('')))
-			->executeQuery();
-		$used = $result->fetchOne();
-		$result->closeCursor();
-
-		$available = $this->totalSizeLimit - $used;
-		if ($available < 0) {
-			$available = 0;
-		}
-
-		return $available;
-	}
-
-	#[Override]
-	public function getDirectDownloadById(string $fileId): array|false {
-		$expiration = new \DateTimeImmutable('+60 minutes');
-		$url = $this->objectStore->preSignedUrl($this->getURN((int)$fileId), $expiration);
-		return $url ? ['url' => $url, 'expiration' => $expiration->getTimestamp()] : false;
-	}
-
-	#[Override]
-	public function getDirectDownload(string $path): array|false {
-		$path = $this->normalizePath($path);
-		$cacheEntry = $this->getCache()->get($path);
-
-		if (!$cacheEntry || $cacheEntry->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
-			return false;
-		}
-		return $this->getDirectDownloadById((string)$cacheEntry->getId());
-	}
+                $this->getCache()->remove($uploadPath);
+                $this->logger->error(
+                    'Could not create object ' . $urn . ' for ' . $path,
+                    [
+                        'app' => 'objectstore',
+                        'exception' => $ex,
+                    ]
+                );
+            } else {
+                $this->logger->error(
+                    'Could not update object ' . $urn . ' for ' . $path,
+                    [
+                        'app' => 'objectstore',
+                        'exception' => $ex,
+                    ]
+                );
+            }
+            throw new GenericFileException('Error while writing stream to object store', 0, $ex);
+        }
+
+        if ($exists) {
+            // Always update the unencrypted size, for encryption the Encryption wrapper will update this afterwards anyways
+            $stat['unencrypted_size'] = $stat['size'];
+            $this->getCache()->update($fileId, $stat);
+        } else {
+            if (!$this->validateWrites || $this->objectStore->objectExists($urn)) {
+                $this->getCache()->move($uploadPath, $path);
+            } else {
+                $this->getCache()->remove($uploadPath);
+                throw new \Exception("Object not found after writing (urn: $urn, path: $path)", 404);
+            }
+        }
+
+        return $totalWritten;
+    }
+
+    public function getObjectStore(): IObjectStore {
+        return $this->objectStore;
+    }
+
+    public function copyFromStorage(
+        IStorage $sourceStorage,
+        string $sourceInternalPath,
+        string $targetInternalPath,
+        bool $preserveMtime = false,
+    ): bool {
+        if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class)) {
+            /** @var ObjectStoreStorage $sourceStorage */
+            if ($sourceStorage->getObjectStore()->getStorageId() === $this->getObjectStore()->getStorageId()) {
+                /** @var CacheEntry $sourceEntry */
+                $sourceEntry = $sourceStorage->getCache()->get($sourceInternalPath);
+                $sourceEntryData = $sourceEntry->getData();
+                // $sourceEntry['permissions'] here is the permissions from the jailed storage for the current
+                // user. Instead we use $sourceEntryData['scan_permissions'] that are the permissions from the
+                // unjailed storage.
+                if (is_array($sourceEntryData) && array_key_exists('scan_permissions', $sourceEntryData)) {
+                    $sourceEntry['permissions'] = $sourceEntryData['scan_permissions'];
+                }
+                $this->copyInner($sourceStorage->getCache(), $sourceEntry, $targetInternalPath);
+                return true;
+            }
+        }
+
+        return parent::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+    }
+
+    public function moveFromStorage(IStorage $sourceStorage, string $sourceInternalPath, string $targetInternalPath, ?ICacheEntry $sourceCacheEntry = null): bool {
+        $sourceCache = $sourceStorage->getCache();
+        if (
+            $sourceStorage->instanceOfStorage(ObjectStoreStorage::class)
+            && $sourceStorage->getObjectStore()->getStorageId() === $this->getObjectStore()->getStorageId()
+        ) {
+            if ($this->getCache()->get($targetInternalPath)) {
+                $this->unlink($targetInternalPath);
+                $this->getCache()->remove($targetInternalPath);
+            }
+            $this->getCache()->moveFromCache($sourceCache, $sourceInternalPath, $targetInternalPath);
+            // Do not import any data when source and target bucket are identical.
+            return true;
+        }
+        if (!$sourceCacheEntry) {
+            $sourceCacheEntry = $sourceCache->get($sourceInternalPath);
+        }
+
+        $this->copyObjects($sourceStorage, $sourceCache, $sourceCacheEntry);
+        if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class)) {
+            /** @var ObjectStoreStorage $sourceStorage */
+            $sourceStorage->setPreserveCacheOnDelete(true);
+        }
+        if ($sourceCacheEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
+            $sourceStorage->rmdir($sourceInternalPath);
+        } else {
+            $sourceStorage->unlink($sourceInternalPath);
+        }
+        if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class)) {
+            /** @var ObjectStoreStorage $sourceStorage */
+            $sourceStorage->setPreserveCacheOnDelete(false);
+        }
+        if ($this->getCache()->get($targetInternalPath)) {
+            $this->unlink($targetInternalPath);
+            $this->getCache()->remove($targetInternalPath);
+        }
+        $this->getCache()->moveFromCache($sourceCache, $sourceInternalPath, $targetInternalPath);
+
+        return true;
+    }
+
+    /**
+     * Copy the object(s) of a file or folder into this storage, without touching the cache
+     */
+    private function copyObjects(IStorage $sourceStorage, ICache $sourceCache, ICacheEntry $sourceCacheEntry) {
+        $copiedFiles = [];
+        try {
+            foreach ($this->getAllChildObjects($sourceCache, $sourceCacheEntry) as $file) {
+                $sourceStream = $sourceStorage->fopen($file->getPath(), 'r');
+                if (!$sourceStream) {
+                    throw new \Exception("Failed to open source file {$file->getPath()} ({$file->getId()})");
+                }
+                $this->objectStore->writeObject($this->getURN($file->getId()), $sourceStream, $file->getMimeType());
+                if (is_resource($sourceStream)) {
+                    fclose($sourceStream);
+                }
+                $copiedFiles[] = $file->getId();
+            }
+        } catch (\Exception $e) {
+            foreach ($copiedFiles as $fileId) {
+                try {
+                    $this->objectStore->deleteObject($this->getURN($fileId));
+                } catch (\Exception $e) {
+                    // ignore
+                }
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * @return \Iterator<ICacheEntry>
+     */
+    private function getAllChildObjects(ICache $cache, ICacheEntry $entry): \Iterator {
+        if ($entry->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
+            foreach ($cache->getFolderContentsById($entry->getId()) as $child) {
+                yield from $this->getAllChildObjects($cache, $child);
+            }
+        } else {
+            yield $entry;
+        }
+    }
+
+    public function copy(string $source, string $target): bool {
+        $source = $this->normalizePath($source);
+        $target = $this->normalizePath($target);
+
+        $cache = $this->getCache();
+        $sourceEntry = $cache->get($source);
+        if (!$sourceEntry) {
+            throw new NotFoundException('Source object not found');
+        }
+
+        $this->copyInner($cache, $sourceEntry, $target);
+
+        return true;
+    }
+
+    private function copyInner(ICache $sourceCache, ICacheEntry $sourceEntry, string $to) {
+        $cache = $this->getCache();
+
+        if ($sourceEntry->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
+            if ($cache->inCache($to)) {
+                $cache->remove($to);
+            }
+            $this->mkdir($to, false, ['size' => $sourceEntry->getSize()]);
+
+            foreach ($sourceCache->getFolderContentsById($sourceEntry->getId()) as $child) {
+                $this->copyInner($sourceCache, $child, $to . '/' . $child->getName());
+            }
+        } else {
+            $this->copyFile($sourceEntry, $to);
+        }
+    }
+
+    private function copyFile(ICacheEntry $sourceEntry, string $to) {
+        $cache = $this->getCache();
+
+        $sourceUrn = $this->getURN($sourceEntry->getId());
+
+        if (!$cache instanceof Cache) {
+            throw new \Exception('Invalid source cache for object store copy');
+        }
+
+        $targetId = $cache->copyFromCache($cache, $sourceEntry, $to);
+
+        $targetUrn = $this->getURN($targetId);
+
+        try {
+            $this->objectStore->copyObject($sourceUrn, $targetUrn);
+            if ($this->handleCopiesAsOwned) {
+                // Copied the file thus we gain all permissions as we are the owner now ! warning while this aligns with local storage it should not be used and instead fix local storage !
+                $cache->update($targetId, ['permissions' => \OCP\Constants::PERMISSION_ALL]);
+            }
+        } catch (\Exception $e) {
+            $cache->remove($to);
+
+            throw $e;
+        }
+    }
+
+    public function startChunkedWrite(string $targetPath): string {
+        if (!$this->objectStore instanceof IObjectStoreMultiPartUpload) {
+            throw new GenericFileException('Object store does not support multipart upload');
+        }
+        $cacheEntry = $this->getCache()->get($targetPath);
+        $urn = $this->getURN($cacheEntry->getId());
+        return $this->objectStore->initiateMultipartUpload($urn);
+    }
+
+    /**
+     * @throws GenericFileException
+     */
+    public function putChunkedWritePart(
+        string $targetPath,
+        string $writeToken,
+        string $chunkId,
+        $data,
+        $size = null,
+    ): ?array {
+        if (!$this->objectStore instanceof IObjectStoreMultiPartUpload) {
+            throw new GenericFileException('Object store does not support multipart upload');
+        }
+
+        $cacheEntry = $this->getCache()->get($targetPath);
+        $urn = $this->getURN($cacheEntry->getId());
+
+        $result = $this->objectStore->uploadMultipartPart($urn, $writeToken, (int)$chunkId, $data, $size);
+
+        $parts[$chunkId] = [
+            'PartNumber' => $chunkId,
+            'ETag' => trim($result->get('ETag'), '"'),
+        ];
+        return $parts[$chunkId];
+    }
+
+    public function completeChunkedWrite(string $targetPath, string $writeToken): int {
+        if (!$this->objectStore instanceof IObjectStoreMultiPartUpload) {
+            throw new GenericFileException('Object store does not support multipart upload');
+        }
+        $cacheEntry = $this->getCache()->get($targetPath);
+        $urn = $this->getURN($cacheEntry->getId());
+        $parts = $this->objectStore->getMultipartUploads($urn, $writeToken);
+        $sortedParts = array_values($parts);
+        sort($sortedParts);
+        try {
+            $size = $this->objectStore->completeMultipartUpload($urn, $writeToken, $sortedParts);
+            $stat = $this->stat($targetPath);
+            $mtime = time();
+            if (is_array($stat)) {
+                $stat['size'] = $size;
+                $stat['mtime'] = $mtime;
+                $stat['mimetype'] = $this->getMimeType($targetPath);
+                $this->getCache()->update($stat['fileid'], $stat);
+            }
+        } catch (S3MultipartUploadException|S3Exception $e) {
+            $this->objectStore->abortMultipartUpload($urn, $writeToken);
+            $this->logger->error(
+                'Could not complete multipart upload ' . $urn . ' with uploadId ' . $writeToken,
+                [
+                    'app' => 'objectstore',
+                    'exception' => $e,
+                ]
+            );
+            throw new GenericFileException('Could not write chunked file');
+        }
+        return $size;
+    }
+
+    public function cancelChunkedWrite(string $targetPath, string $writeToken): void {
+        if (!$this->objectStore instanceof IObjectStoreMultiPartUpload) {
+            throw new GenericFileException('Object store does not support multipart upload');
+        }
+        $cacheEntry = $this->getCache()->get($targetPath);
+        $urn = $this->getURN($cacheEntry->getId());
+        $this->objectStore->abortMultipartUpload($urn, $writeToken);
+    }
+
+    public function setPreserveCacheOnDelete(bool $preserve) {
+        $this->preserveCacheItemsOnDelete = $preserve;
+    }
+
+    public function free_space(string $path): int|float|false {
+        if ($this->totalSizeLimit === null) {
+            return FileInfo::SPACE_UNLIMITED;
+        }
+
+        // To avoid iterating all objects in the object store, calculate the sum of the cached sizes of the root folders of all object storages.
+        $qb = Server::get(IDBConnection::class)->getQueryBuilder();
+        $result = $qb->select($qb->func()->sum('f.size'))
+            ->from('storages', 's')
+            ->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('f.storage', 's.numeric_id'))
+            ->where($qb->expr()->like('s.id', $qb->createNamedParameter('object::%'), IQueryBuilder::PARAM_STR))
+            ->andWhere($qb->expr()->eq('f.path', $qb->createNamedParameter('')))
+            ->executeQuery();
+        $used = $result->fetchOne();
+        $result->closeCursor();
+
+        $available = $this->totalSizeLimit - $used;
+        if ($available < 0) {
+            $available = 0;
+        }
+
+        return $available;
+    }
+
+    #[Override]
+    public function getDirectDownloadById(string $fileId): array|false {
+        $expiration = new \DateTimeImmutable('+60 minutes');
+        $url = $this->objectStore->preSignedUrl($this->getURN((int)$fileId), $expiration);
+        return $url ? ['url' => $url, 'expiration' => $expiration->getTimestamp()] : false;
+    }
+
+    #[Override]
+    public function getDirectDownload(string $path): array|false {
+        $path = $this->normalizePath($path);
+        $cacheEntry = $this->getCache()->get($path);
+
+        if (!$cacheEntry || $cacheEntry->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
+            return false;
+        }
+        return $this->getDirectDownloadById((string)$cacheEntry->getId());
+    }
 }

Spacing +30 added lines, -30 removed lines

@@ -57,17 +57,17 @@ 
 			throw new \Exception('missing IObjectStore instance');
 		}
 		if (isset($parameters['storageid'])) {
-			$this->id = 'object::store:' . $parameters['storageid'];
+			$this->id = 'object::store:'.$parameters['storageid'];
 		} else {
-			$this->id = 'object::store:' . $this->objectStore->getStorageId();
+			$this->id = 'object::store:'.$this->objectStore->getStorageId();
 		}
 		if (isset($parameters['objectPrefix'])) {
 			$this->objectPrefix = $parameters['objectPrefix'];
 		}
 		if (isset($parameters['validateWrites'])) {
-			$this->validateWrites = (bool)$parameters['validateWrites'];
+			$this->validateWrites = (bool) $parameters['validateWrites'];
 		}
-		$this->handleCopiesAsOwned = (bool)($parameters['handleCopiesAsOwned'] ?? false);
+		$this->handleCopiesAsOwned = (bool) ($parameters['handleCopiesAsOwned'] ?? false);
 		if (isset($parameters['totalSizeLimit'])) {
 			$this->totalSizeLimit = $parameters['totalSizeLimit'];
 		}
@@ -204,7 +204,7 @@ 
 		} catch (\Exception $ex) {
 			if ($ex->getCode() !== 404) {
 				$this->logger->error(
-					'Could not delete object ' . $this->getURN($entry->getId()) . ' for ' . $entry->getPath(),
+					'Could not delete object '.$this->getURN($entry->getId()).' for '.$entry->getPath(),
 					[
 						'app' => 'objectstore',
 						'exception' => $ex,
@@ -220,7 +220,7 @@ 
 		return true;
 	}
 
-	public function stat(string $path): array|false {
+	public function stat(string $path): array | false {
 		$path = $this->normalizePath($path);
 		$cacheEntry = $this->getCache()->get($path);
 		if ($cacheEntry instanceof CacheEntry) {
@@ -255,7 +255,7 @@ 
 	 * @return string the unified resource name used to identify the object
 	 */
 	public function getURN(int $fileId): string {
-		return $this->objectPrefix . $fileId;
+		return $this->objectPrefix.$fileId;
 	}
 
 	public function opendir(string $path) {
@@ -275,7 +275,7 @@ 
 		}
 	}
 
-	public function filetype(string $path): string|false {
+	public function filetype(string $path): string | false {
 		$path = $this->normalizePath($path);
 		$stat = $this->stat($path);
 		if ($stat) {
@@ -316,12 +316,12 @@ 
 						$streamStat = fstat($handle);
 						$actualSize = $streamStat['size'] ?? -1;
 						if ($actualSize > -1 && $actualSize !== $filesize) {
-							$this->getCache()->update((int)$stat['fileid'], ['size' => $actualSize]);
+							$this->getCache()->update((int) $stat['fileid'], ['size' => $actualSize]);
 						}
 						return $handle;
 					} catch (NotFoundException $e) {
 						$this->logger->error(
-							'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
+							'Could not get object '.$this->getURN($stat['fileid']).' for file '.$path,
 							[
 								'app' => 'objectstore',
 								'exception' => $e,
@@ -330,7 +330,7 @@ 
 						throw $e;
 					} catch (\Exception $e) {
 						$this->logger->error(
-							'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
+							'Could not get object '.$this->getURN($stat['fileid']).' for file '.$path,
 							[
 								'app' => 'objectstore',
 								'exception' => $e,
@@ -354,7 +354,7 @@ 
 
 				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
 				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 					$this->writeBack($tmpFile, $path);
 					unlink($tmpFile);
 				});
@@ -372,7 +372,7 @@ 
 					file_put_contents($tmpFile, $source);
 				}
 				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 					$this->writeBack($tmpFile, $path);
 					unlink($tmpFile);
 				});
@@ -382,7 +382,7 @@ 
 
 	public function file_exists(string $path): bool {
 		$path = $this->normalizePath($path);
-		return (bool)$this->stat($path);
+		return (bool) $this->stat($path);
 	}
 
 	public function rename(string $source, string $target): bool {
@@ -394,7 +394,7 @@ 
 		return true;
 	}
 
-	public function getMimeType(string $path): string|false {
+	public function getMimeType(string $path): string | false {
 		$path = $this->normalizePath($path);
 		return parent::getMimeType($path);
 	}
@@ -423,7 +423,7 @@ 
 				$this->file_put_contents($path, ' ');
 			} catch (\Exception $ex) {
 				$this->logger->error(
-					'Could not create object for ' . $path,
+					'Could not create object for '.$path,
 					[
 						'app' => 'objectstore',
 						'exception' => $ex,
@@ -472,7 +472,7 @@ 
 		}
 		// update stat with new data
 		$mTime = time();
-		$stat['size'] = (int)$size;
+		$stat['size'] = (int) $size;
 		$stat['mtime'] = $mTime;
 		$stat['storage_mtime'] = $mTime;
 
@@ -492,7 +492,7 @@ 
 		$stat['checksum'] = '';
 
 		$exists = $this->getCache()->inCache($path);
-		$uploadPath = $exists ? $path : $path . '.part';
+		$uploadPath = $exists ? $path : $path.'.part';
 
 		if ($exists) {
 			$fileId = $stat['fileid'];
@@ -509,7 +509,7 @@ 
 			//upload to object storage
 
 			$totalWritten = 0;
-			$countStream = CountWrapper::wrap($stream, function ($writtenSize) use ($fileId, $size, $exists, &$totalWritten) {
+			$countStream = CountWrapper::wrap($stream, function($writtenSize) use ($fileId, $size, $exists, &$totalWritten) {
 				if (is_null($size) && !$exists) {
 					$this->getCache()->update($fileId, [
 						'size' => $writtenSize,
@@ -536,7 +536,7 @@ 
 				 */
 				$this->getCache()->remove($uploadPath);
 				$this->logger->error(
-					'Could not create object ' . $urn . ' for ' . $path,
+					'Could not create object '.$urn.' for '.$path,
 					[
 						'app' => 'objectstore',
 						'exception' => $ex,
@@ -544,7 +544,7 @@ 
 				);
 			} else {
 				$this->logger->error(
-					'Could not update object ' . $urn . ' for ' . $path,
+					'Could not update object '.$urn.' for '.$path,
 					[
 						'app' => 'objectstore',
 						'exception' => $ex,
@@ -708,7 +708,7 @@ 
 			$this->mkdir($to, false, ['size' => $sourceEntry->getSize()]);
 
 			foreach ($sourceCache->getFolderContentsById($sourceEntry->getId()) as $child) {
-				$this->copyInner($sourceCache, $child, $to . '/' . $child->getName());
+				$this->copyInner($sourceCache, $child, $to.'/'.$child->getName());
 			}
 		} else {
 			$this->copyFile($sourceEntry, $to);
@@ -767,7 +767,7 @@ 
 		$cacheEntry = $this->getCache()->get($targetPath);
 		$urn = $this->getURN($cacheEntry->getId());
 
-		$result = $this->objectStore->uploadMultipartPart($urn, $writeToken, (int)$chunkId, $data, $size);
+		$result = $this->objectStore->uploadMultipartPart($urn, $writeToken, (int) $chunkId, $data, $size);
 
 		$parts[$chunkId] = [
 			'PartNumber' => $chunkId,
@@ -795,10 +795,10 @@ 
 				$stat['mimetype'] = $this->getMimeType($targetPath);
 				$this->getCache()->update($stat['fileid'], $stat);
 			}
-		} catch (S3MultipartUploadException|S3Exception $e) {
+		} catch (S3MultipartUploadException | S3Exception $e) {
 			$this->objectStore->abortMultipartUpload($urn, $writeToken);
 			$this->logger->error(
-				'Could not complete multipart upload ' . $urn . ' with uploadId ' . $writeToken,
+				'Could not complete multipart upload '.$urn.' with uploadId '.$writeToken,
 				[
 					'app' => 'objectstore',
 					'exception' => $e,
@@ -822,7 +822,7 @@ 
 		$this->preserveCacheItemsOnDelete = $preserve;
 	}
 
-	public function free_space(string $path): int|float|false {
+	public function free_space(string $path): int | float | false {
 		if ($this->totalSizeLimit === null) {
 			return FileInfo::SPACE_UNLIMITED;
 		}
@@ -847,20 +847,20 @@ 
 	}
 
 	#[Override]
-	public function getDirectDownloadById(string $fileId): array|false {
+	public function getDirectDownloadById(string $fileId): array | false {
 		$expiration = new \DateTimeImmutable('+60 minutes');
-		$url = $this->objectStore->preSignedUrl($this->getURN((int)$fileId), $expiration);
+		$url = $this->objectStore->preSignedUrl($this->getURN((int) $fileId), $expiration);
 		return $url ? ['url' => $url, 'expiration' => $expiration->getTimestamp()] : false;
 	}
 
 	#[Override]
-	public function getDirectDownload(string $path): array|false {
+	public function getDirectDownload(string $path): array | false {
 		$path = $this->normalizePath($path);
 		$cacheEntry = $this->getCache()->get($path);
 
 		if (!$cacheEntry || $cacheEntry->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
 			return false;
 		}
-		return $this->getDirectDownloadById((string)$cacheEntry->getId());
+		return $this->getDirectDownloadById((string) $cacheEntry->getId());
 	}
 }

lib/private/Files/ObjectStore/Azure.php

Indentation +99 added lines, -99 removed lines

@@ -12,113 +12,113 @@
 use OCP\Files\ObjectStore\IObjectStore;
 
 class Azure implements IObjectStore {
-	/** @var string */
-	private $containerName;
-	/** @var string */
-	private $accountName;
-	/** @var string */
-	private $accountKey;
-	/** @var BlobRestProxy|null */
-	private $blobClient = null;
-	/** @var string|null */
-	private $endpoint = null;
-	/** @var bool */
-	private $autoCreate = false;
+    /** @var string */
+    private $containerName;
+    /** @var string */
+    private $accountName;
+    /** @var string */
+    private $accountKey;
+    /** @var BlobRestProxy|null */
+    private $blobClient = null;
+    /** @var string|null */
+    private $endpoint = null;
+    /** @var bool */
+    private $autoCreate = false;
 
-	/**
-	 * @param array $parameters
-	 */
-	public function __construct(array $parameters) {
-		$this->containerName = $parameters['container'];
-		$this->accountName = $parameters['account_name'];
-		$this->accountKey = $parameters['account_key'];
-		if (isset($parameters['endpoint'])) {
-			$this->endpoint = $parameters['endpoint'];
-		}
-		if (isset($parameters['autocreate'])) {
-			$this->autoCreate = $parameters['autocreate'];
-		}
-	}
+    /**
+     * @param array $parameters
+     */
+    public function __construct(array $parameters) {
+        $this->containerName = $parameters['container'];
+        $this->accountName = $parameters['account_name'];
+        $this->accountKey = $parameters['account_key'];
+        if (isset($parameters['endpoint'])) {
+            $this->endpoint = $parameters['endpoint'];
+        }
+        if (isset($parameters['autocreate'])) {
+            $this->autoCreate = $parameters['autocreate'];
+        }
+    }
 
-	/**
-	 * @return BlobRestProxy
-	 */
-	private function getBlobClient() {
-		if (!$this->blobClient) {
-			$protocol = $this->endpoint ? substr($this->endpoint, 0, strpos($this->endpoint, ':')) : 'https';
-			$connectionString = 'DefaultEndpointsProtocol=' . $protocol . ';AccountName=' . $this->accountName . ';AccountKey=' . $this->accountKey;
-			if ($this->endpoint) {
-				$connectionString .= ';BlobEndpoint=' . $this->endpoint;
-			}
-			$this->blobClient = BlobRestProxy::createBlobService($connectionString);
+    /**
+     * @return BlobRestProxy
+     */
+    private function getBlobClient() {
+        if (!$this->blobClient) {
+            $protocol = $this->endpoint ? substr($this->endpoint, 0, strpos($this->endpoint, ':')) : 'https';
+            $connectionString = 'DefaultEndpointsProtocol=' . $protocol . ';AccountName=' . $this->accountName . ';AccountKey=' . $this->accountKey;
+            if ($this->endpoint) {
+                $connectionString .= ';BlobEndpoint=' . $this->endpoint;
+            }
+            $this->blobClient = BlobRestProxy::createBlobService($connectionString);
 
-			if ($this->autoCreate) {
-				try {
-					$this->blobClient->createContainer($this->containerName);
-				} catch (ServiceException $e) {
-					if ($e->getCode() === 409) {
-						// already exists
-					} else {
-						throw $e;
-					}
-				}
-			}
-		}
-		return $this->blobClient;
-	}
+            if ($this->autoCreate) {
+                try {
+                    $this->blobClient->createContainer($this->containerName);
+                } catch (ServiceException $e) {
+                    if ($e->getCode() === 409) {
+                        // already exists
+                    } else {
+                        throw $e;
+                    }
+                }
+            }
+        }
+        return $this->blobClient;
+    }
 
-	/**
-	 * @return string the container or bucket name where objects are stored
-	 */
-	public function getStorageId() {
-		return 'azure::blob::' . $this->containerName;
-	}
+    /**
+     * @return string the container or bucket name where objects are stored
+     */
+    public function getStorageId() {
+        return 'azure::blob::' . $this->containerName;
+    }
 
-	/**
-	 * @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
-	 */
-	public function readObject($urn) {
-		$blob = $this->getBlobClient()->getBlob($this->containerName, $urn);
-		return $blob->getContentStream();
-	}
+    /**
+     * @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
+     */
+    public function readObject($urn) {
+        $blob = $this->getBlobClient()->getBlob($this->containerName, $urn);
+        return $blob->getContentStream();
+    }
 
-	public function writeObject($urn, $stream, ?string $mimetype = null) {
-		$options = new CreateBlockBlobOptions();
-		if ($mimetype) {
-			$options->setContentType($mimetype);
-		}
-		$this->getBlobClient()->createBlockBlob($this->containerName, $urn, $stream, $options);
-	}
+    public function writeObject($urn, $stream, ?string $mimetype = null) {
+        $options = new CreateBlockBlobOptions();
+        if ($mimetype) {
+            $options->setContentType($mimetype);
+        }
+        $this->getBlobClient()->createBlockBlob($this->containerName, $urn, $stream, $options);
+    }
 
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @return void
-	 * @throws \Exception when something goes wrong, message will be logged
-	 */
-	public function deleteObject($urn) {
-		$this->getBlobClient()->deleteBlob($this->containerName, $urn);
-	}
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @return void
+     * @throws \Exception when something goes wrong, message will be logged
+     */
+    public function deleteObject($urn) {
+        $this->getBlobClient()->deleteBlob($this->containerName, $urn);
+    }
 
-	public function objectExists($urn) {
-		try {
-			$this->getBlobClient()->getBlobMetadata($this->containerName, $urn);
-			return true;
-		} catch (ServiceException $e) {
-			if ($e->getCode() === 404) {
-				return false;
-			} else {
-				throw $e;
-			}
-		}
-	}
+    public function objectExists($urn) {
+        try {
+            $this->getBlobClient()->getBlobMetadata($this->containerName, $urn);
+            return true;
+        } catch (ServiceException $e) {
+            if ($e->getCode() === 404) {
+                return false;
+            } else {
+                throw $e;
+            }
+        }
+    }
 
-	public function copyObject($from, $to) {
-		$this->getBlobClient()->copyBlob($this->containerName, $to, $this->containerName, $from);
-	}
+    public function copyObject($from, $to) {
+        $this->getBlobClient()->copyBlob($this->containerName, $to, $this->containerName, $from);
+    }
 
-	public function preSignedUrl(string $urn, \DateTimeInterface $expiration): ?string {
-		return null;
-	}
+    public function preSignedUrl(string $urn, \DateTimeInterface $expiration): ?string {
+        return null;
+    }
 }

lib/private/Files/ObjectStore/Swift.php

Indentation +118 added lines, -118 removed lines

@@ -19,122 +19,122 @@
 const SWIFT_SEGMENT_SIZE = 1073741824; // 1GB
 
 class Swift implements IObjectStore {
-	/**
-	 * @var array
-	 */
-	private $params;
-
-	/** @var SwiftFactory */
-	private $swiftFactory;
-
-	public function __construct($params, ?SwiftFactory $connectionFactory = null) {
-		$this->swiftFactory = $connectionFactory ?: new SwiftFactory(
-			\OC::$server->getMemCacheFactory()->createDistributed('swift::'),
-			$params,
-			\OC::$server->get(LoggerInterface::class)
-		);
-		$this->params = $params;
-	}
-
-	/**
-	 * @return \OpenStack\ObjectStore\v1\Models\Container
-	 * @throws StorageAuthException
-	 * @throws \OCP\Files\StorageNotAvailableException
-	 */
-	private function getContainer() {
-		return $this->swiftFactory->getContainer();
-	}
-
-	/**
-	 * @return string the container name where objects are stored
-	 */
-	public function getStorageId() {
-		if (isset($this->params['bucket'])) {
-			return $this->params['bucket'];
-		}
-
-		return $this->params['container'];
-	}
-
-	public function writeObject($urn, $stream, ?string $mimetype = null) {
-		$tmpFile = \OC::$server->getTempManager()->getTemporaryFile('swiftwrite');
-		file_put_contents($tmpFile, $stream);
-		$handle = fopen($tmpFile, 'rb');
-
-		if (filesize($tmpFile) < SWIFT_SEGMENT_SIZE) {
-			$this->getContainer()->createObject([
-				'name' => $urn,
-				'stream' => Utils::streamFor($handle),
-				'contentType' => $mimetype,
-			]);
-		} else {
-			$this->getContainer()->createLargeObject([
-				'name' => $urn,
-				'stream' => Utils::streamFor($handle),
-				'segmentSize' => SWIFT_SEGMENT_SIZE,
-				'contentType' => $mimetype,
-			]);
-		}
-	}
-
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @return resource stream with the read data
-	 * @throws \Exception from openstack or GuzzleHttp libs when something goes wrong
-	 * @throws NotFoundException if file does not exist
-	 */
-	public function readObject($urn) {
-		try {
-			$publicUri = $this->getContainer()->getObject($urn)->getPublicUri();
-			$tokenId = $this->swiftFactory->getCachedTokenId();
-
-			$response = (new Client())->request('GET', $publicUri,
-				[
-					'stream' => true,
-					'headers' => [
-						'X-Auth-Token' => $tokenId,
-						'Cache-Control' => 'no-cache',
-					],
-				]
-			);
-		} catch (BadResponseException $e) {
-			if ($e->getResponse() && $e->getResponse()->getStatusCode() === 404) {
-				throw new NotFoundException("object $urn not found in object store");
-			} else {
-				throw $e;
-			}
-		}
-
-		return RetryWrapper::wrap($response->getBody()->detach());
-	}
-
-	/**
-	 * @param string $urn Unified Resource Name
-	 * @return void
-	 * @throws \Exception from openstack lib when something goes wrong
-	 */
-	public function deleteObject($urn) {
-		$this->getContainer()->getObject($urn)->delete();
-	}
-
-	/**
-	 * @return void
-	 * @throws \Exception from openstack lib when something goes wrong
-	 */
-	public function deleteContainer() {
-		$this->getContainer()->delete();
-	}
-
-	public function objectExists($urn) {
-		return $this->getContainer()->objectExists($urn);
-	}
-
-	public function copyObject($from, $to) {
-		$this->getContainer()->getObject($from)->copy([
-			'destination' => $this->getContainer()->name . '/' . $to
-		]);
-	}
-	public function preSignedUrl(string $urn, \DateTimeInterface $expiration): ?string {
-		return null;
-	}
+    /**
+     * @var array
+     */
+    private $params;
+
+    /** @var SwiftFactory */
+    private $swiftFactory;
+
+    public function __construct($params, ?SwiftFactory $connectionFactory = null) {
+        $this->swiftFactory = $connectionFactory ?: new SwiftFactory(
+            \OC::$server->getMemCacheFactory()->createDistributed('swift::'),
+            $params,
+            \OC::$server->get(LoggerInterface::class)
+        );
+        $this->params = $params;
+    }
+
+    /**
+     * @return \OpenStack\ObjectStore\v1\Models\Container
+     * @throws StorageAuthException
+     * @throws \OCP\Files\StorageNotAvailableException
+     */
+    private function getContainer() {
+        return $this->swiftFactory->getContainer();
+    }
+
+    /**
+     * @return string the container name where objects are stored
+     */
+    public function getStorageId() {
+        if (isset($this->params['bucket'])) {
+            return $this->params['bucket'];
+        }
+
+        return $this->params['container'];
+    }
+
+    public function writeObject($urn, $stream, ?string $mimetype = null) {
+        $tmpFile = \OC::$server->getTempManager()->getTemporaryFile('swiftwrite');
+        file_put_contents($tmpFile, $stream);
+        $handle = fopen($tmpFile, 'rb');
+
+        if (filesize($tmpFile) < SWIFT_SEGMENT_SIZE) {
+            $this->getContainer()->createObject([
+                'name' => $urn,
+                'stream' => Utils::streamFor($handle),
+                'contentType' => $mimetype,
+            ]);
+        } else {
+            $this->getContainer()->createLargeObject([
+                'name' => $urn,
+                'stream' => Utils::streamFor($handle),
+                'segmentSize' => SWIFT_SEGMENT_SIZE,
+                'contentType' => $mimetype,
+            ]);
+        }
+    }
+
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @return resource stream with the read data
+     * @throws \Exception from openstack or GuzzleHttp libs when something goes wrong
+     * @throws NotFoundException if file does not exist
+     */
+    public function readObject($urn) {
+        try {
+            $publicUri = $this->getContainer()->getObject($urn)->getPublicUri();
+            $tokenId = $this->swiftFactory->getCachedTokenId();
+
+            $response = (new Client())->request('GET', $publicUri,
+                [
+                    'stream' => true,
+                    'headers' => [
+                        'X-Auth-Token' => $tokenId,
+                        'Cache-Control' => 'no-cache',
+                    ],
+                ]
+            );
+        } catch (BadResponseException $e) {
+            if ($e->getResponse() && $e->getResponse()->getStatusCode() === 404) {
+                throw new NotFoundException("object $urn not found in object store");
+            } else {
+                throw $e;
+            }
+        }
+
+        return RetryWrapper::wrap($response->getBody()->detach());
+    }
+
+    /**
+     * @param string $urn Unified Resource Name
+     * @return void
+     * @throws \Exception from openstack lib when something goes wrong
+     */
+    public function deleteObject($urn) {
+        $this->getContainer()->getObject($urn)->delete();
+    }
+
+    /**
+     * @return void
+     * @throws \Exception from openstack lib when something goes wrong
+     */
+    public function deleteContainer() {
+        $this->getContainer()->delete();
+    }
+
+    public function objectExists($urn) {
+        return $this->getContainer()->objectExists($urn);
+    }
+
+    public function copyObject($from, $to) {
+        $this->getContainer()->getObject($from)->copy([
+            'destination' => $this->getContainer()->name . '/' . $to
+        ]);
+    }
+    public function preSignedUrl(string $urn, \DateTimeInterface $expiration): ?string {
+        return null;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 
 	public function copyObject($from, $to) {
 		$this->getContainer()->getObject($from)->copy([
-			'destination' => $this->getContainer()->name . '/' . $to
+			'destination' => $this->getContainer()->name.'/'.$to
 		]);
 	}
 	public function preSignedUrl(string $urn, \DateTimeInterface $expiration): ?string {

lib/private/Files/ObjectStore/StorageObjectStore.php

Indentation +55 added lines, -55 removed lines

@@ -14,68 +14,68 @@
  * Object store that wraps a storage backend, mostly for testing purposes
  */
 class StorageObjectStore implements IObjectStore {
-	/** @var IStorage */
-	private $storage;
+    /** @var IStorage */
+    private $storage;
 
-	/**
-	 * @param IStorage $storage
-	 */
-	public function __construct(IStorage $storage) {
-		$this->storage = $storage;
-	}
+    /**
+     * @param IStorage $storage
+     */
+    public function __construct(IStorage $storage) {
+        $this->storage = $storage;
+    }
 
-	/**
-	 * @return string the container or bucket name where objects are stored
-	 * @since 7.0.0
-	 */
-	public function getStorageId(): string {
-		return $this->storage->getId();
-	}
+    /**
+     * @return string the container or bucket name where objects are stored
+     * @since 7.0.0
+     */
+    public function getStorageId(): string {
+        return $this->storage->getId();
+    }
 
-	/**
-	 * @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) {
-		$handle = $this->storage->fopen($urn, 'r');
-		if (is_resource($handle)) {
-			return $handle;
-		}
+    /**
+     * @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) {
+        $handle = $this->storage->fopen($urn, 'r');
+        if (is_resource($handle)) {
+            return $handle;
+        }
 
-		throw new \Exception();
-	}
+        throw new \Exception();
+    }
 
-	public function writeObject($urn, $stream, ?string $mimetype = null) {
-		$handle = $this->storage->fopen($urn, 'w');
-		if ($handle) {
-			stream_copy_to_stream($stream, $handle);
-			fclose($handle);
-		} else {
-			throw new \Exception();
-		}
-	}
+    public function writeObject($urn, $stream, ?string $mimetype = null) {
+        $handle = $this->storage->fopen($urn, 'w');
+        if ($handle) {
+            stream_copy_to_stream($stream, $handle);
+            fclose($handle);
+        } else {
+            throw new \Exception();
+        }
+    }
 
-	/**
-	 * @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->storage->unlink($urn);
-	}
+    /**
+     * @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->storage->unlink($urn);
+    }
 
-	public function objectExists($urn) {
-		return $this->storage->file_exists($urn);
-	}
+    public function objectExists($urn) {
+        return $this->storage->file_exists($urn);
+    }
 
-	public function copyObject($from, $to) {
-		$this->storage->copy($from, $to);
-	}
+    public function copyObject($from, $to) {
+        $this->storage->copy($from, $to);
+    }
 
-	public function preSignedUrl(string $urn, \DateTimeInterface $expiration): ?string {
-		return null;
-	}
+    public function preSignedUrl(string $urn, \DateTimeInterface $expiration): ?string {
+        return null;
+    }
 }

lib/private/Files/ObjectStore/S3ConnectionTrait.php

Indentation +274 added lines, -274 removed lines

@@ -24,278 +24,278 @@
 use Psr\Log\LoggerInterface;
 
 trait S3ConnectionTrait {
-	use S3ConfigTrait;
-
-	protected string $id;
-
-	protected bool $test;
-
-	protected ?S3Client $connection = null;
-	private ?ICache $existingBucketsCache = null;
-	private bool $usePresignedUrl = false;
-
-	protected function parseParams($params) {
-		if (empty($params['bucket'])) {
-			throw new \Exception('Bucket has to be configured.');
-		}
-
-		if (isset($params['multibucket']) && $params['multibucket'] === true && isset($params['perBucket'][$params['bucket']])) {
-			$params = array_merge($params, $params['perBucket'][$params['bucket']]);
-		}
-
-		$this->id = 'amazon::' . $params['bucket'];
-
-		$this->test = isset($params['test']);
-		$this->bucket = $params['bucket'];
-		// Default to 5 like the S3 SDK does
-		$this->concurrency = $params['concurrency'] ?? 5;
-		$this->proxy = $params['proxy'] ?? false;
-		$this->connectTimeout = $params['connect_timeout'] ?? 5;
-		$this->timeout = $params['timeout'] ?? 15;
-		$this->storageClass = !empty($params['storageClass']) ? $params['storageClass'] : 'STANDARD';
-		$this->uploadPartSize = $params['uploadPartSize'] ?? 524288000;
-		$this->putSizeLimit = $params['putSizeLimit'] ?? 104857600;
-		$this->copySizeLimit = $params['copySizeLimit'] ?? 5242880000;
-		$this->useMultipartCopy = (bool)($params['useMultipartCopy'] ?? true);
-		$this->retriesMaxAttempts = $params['retriesMaxAttempts'] ?? 5;
-		$params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region'];
-		$params['hostname'] = empty($params['hostname']) ? 's3.' . $params['region'] . '.amazonaws.com' : $params['hostname'];
-		$params['s3-accelerate'] = $params['hostname'] === 's3-accelerate.amazonaws.com' || $params['hostname'] === 's3-accelerate.dualstack.amazonaws.com';
-		if (!isset($params['port']) || $params['port'] === '') {
-			$params['port'] = (isset($params['use_ssl']) && $params['use_ssl'] === false) ? 80 : 443;
-		}
-		$params['verify_bucket_exists'] = $params['verify_bucket_exists'] ?? true;
-
-		if ($params['s3-accelerate']) {
-			$params['verify_bucket_exists'] = false;
-		}
-
-		$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 ($this->connection !== null) {
-			return $this->connection;
-		}
-
-		if ($this->existingBucketsCache === null) {
-			$this->existingBucketsCache = Server::get(ICacheFactory::class)
-				->createLocal('s3-bucket-exists-cache');
-		}
-
-		$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])
-			)
-		);
-
-		$this->usePresignedUrl = $this->params['use_presigned_url'] ?? false;
-
-		$options = [
-			'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,
-			'proxy' => isset($this->params['proxy']) ? $this->params['proxy'] : false,
-			'signature_provider' => \Aws\or_chain([self::class, 'legacySignatureProvider'], ClientResolver::_default_signature_provider()),
-			'csm' => false,
-			'use_arn_region' => false,
-			'http' => [
-				'verify' => $this->getCertificateBundlePath(),
-				'connect_timeout' => $this->connectTimeout,
-			],
-			'use_aws_shared_config_files' => false,
-			'retries' => [
-				'mode' => 'standard',
-				'max_attempts' => $this->retriesMaxAttempts,
-			],
-		];
-
-		if ($this->params['s3-accelerate']) {
-			$options['use_accelerate_endpoint'] = true;
-		} else {
-			$options['endpoint'] = $base_url;
-		}
-
-		if (isset($this->params['request_checksum_calculation'])) {
-			$options['request_checksum_calculation'] = $this->params['request_checksum_calculation'];
-		} else {
-			$options['request_checksum_calculation'] = 'when_required';
-		}
-
-		if (isset($this->params['response_checksum_validation'])) {
-			$options['response_checksum_validation'] = $this->params['response_checksum_validation'];
-		} else {
-			$options['response_checksum_validation'] = 'when_required';
-		}
-
-		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);
-
-		try {
-			$logger = Server::get(LoggerInterface::class);
-			if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
-				$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']) {
-				$cacheKey = $this->params['hostname'] . $this->bucket;
-				$exist = $this->existingBucketsCache->get($cacheKey) === 1;
-
-				if (!$exist) {
-					if (!$this->connection->doesBucketExist($this->bucket)) {
-						try {
-							$logger->info('Bucket "' . $this->bucket . '" does not exist - creating it.', ['app' => 'objectstore']);
-							if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
-								throw new StorageNotAvailableException('The bucket will not be created because the name is not dns compatible, please correct it: ' . $this->bucket);
-							}
-							$this->connection->createBucket(['Bucket' => $this->bucket]);
-							Server::get(IEventDispatcher::class)
-								->dispatchTyped(new BucketCreatedEvent(
-									$this->bucket,
-									$options['endpoint'],
-									$options['region'],
-									$options['version']
-								));
-							$this->testTimeout();
-						} catch (S3Exception $e) {
-							$logger->debug('Invalid remote storage.', [
-								'exception' => $e,
-								'app' => 'objectstore',
-							]);
-							if ($e->getAwsErrorCode() !== 'BucketAlreadyOwnedByYou') {
-								throw new StorageNotAvailableException('Creation of bucket "' . $this->bucket . '" failed. ' . $e->getMessage());
-							}
-						}
-					}
-					$this->existingBucketsCache->set($cacheKey, 1);
-				}
-			}
-
-			// 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');
-			}
-		} catch (S3Exception $e) {
-			throw new StorageNotAvailableException('S3 service is unable to handle request: ' . $e->getMessage());
-		}
-
-		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'];
-			$sessionToken = empty($this->params['session_token']) ? null : $this->params['session_token'];
-
-			if ($key && $secret) {
-				return Create::promiseFor(
-					// a null sessionToken match the default signature of the constructor
-					new Credentials($key, $secret, $sessionToken)
-				);
-			}
-
-			$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')) {
-			/** @var ICertificateManager $certManager */
-			$certManager = Server::get(ICertificateManager::class);
-			// 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'])) {
-				return $certManager->getAbsoluteBundlePath();
-			} else {
-				return $certManager->getDefaultCertificatesBundlePath();
-			}
-		} else {
-			return null;
-		}
-	}
-
-	protected function getSSECKey(): ?string {
-		if (isset($this->params['sse_c_key']) && !empty($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)
-		];
-	}
-
-	public function isUsePresignedUrl(): bool {
-		return $this->usePresignedUrl;
-	}
+    use S3ConfigTrait;
+
+    protected string $id;
+
+    protected bool $test;
+
+    protected ?S3Client $connection = null;
+    private ?ICache $existingBucketsCache = null;
+    private bool $usePresignedUrl = false;
+
+    protected function parseParams($params) {
+        if (empty($params['bucket'])) {
+            throw new \Exception('Bucket has to be configured.');
+        }
+
+        if (isset($params['multibucket']) && $params['multibucket'] === true && isset($params['perBucket'][$params['bucket']])) {
+            $params = array_merge($params, $params['perBucket'][$params['bucket']]);
+        }
+
+        $this->id = 'amazon::' . $params['bucket'];
+
+        $this->test = isset($params['test']);
+        $this->bucket = $params['bucket'];
+        // Default to 5 like the S3 SDK does
+        $this->concurrency = $params['concurrency'] ?? 5;
+        $this->proxy = $params['proxy'] ?? false;
+        $this->connectTimeout = $params['connect_timeout'] ?? 5;
+        $this->timeout = $params['timeout'] ?? 15;
+        $this->storageClass = !empty($params['storageClass']) ? $params['storageClass'] : 'STANDARD';
+        $this->uploadPartSize = $params['uploadPartSize'] ?? 524288000;
+        $this->putSizeLimit = $params['putSizeLimit'] ?? 104857600;
+        $this->copySizeLimit = $params['copySizeLimit'] ?? 5242880000;
+        $this->useMultipartCopy = (bool)($params['useMultipartCopy'] ?? true);
+        $this->retriesMaxAttempts = $params['retriesMaxAttempts'] ?? 5;
+        $params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region'];
+        $params['hostname'] = empty($params['hostname']) ? 's3.' . $params['region'] . '.amazonaws.com' : $params['hostname'];
+        $params['s3-accelerate'] = $params['hostname'] === 's3-accelerate.amazonaws.com' || $params['hostname'] === 's3-accelerate.dualstack.amazonaws.com';
+        if (!isset($params['port']) || $params['port'] === '') {
+            $params['port'] = (isset($params['use_ssl']) && $params['use_ssl'] === false) ? 80 : 443;
+        }
+        $params['verify_bucket_exists'] = $params['verify_bucket_exists'] ?? true;
+
+        if ($params['s3-accelerate']) {
+            $params['verify_bucket_exists'] = false;
+        }
+
+        $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 ($this->connection !== null) {
+            return $this->connection;
+        }
+
+        if ($this->existingBucketsCache === null) {
+            $this->existingBucketsCache = Server::get(ICacheFactory::class)
+                ->createLocal('s3-bucket-exists-cache');
+        }
+
+        $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])
+            )
+        );
+
+        $this->usePresignedUrl = $this->params['use_presigned_url'] ?? false;
+
+        $options = [
+            '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,
+            'proxy' => isset($this->params['proxy']) ? $this->params['proxy'] : false,
+            'signature_provider' => \Aws\or_chain([self::class, 'legacySignatureProvider'], ClientResolver::_default_signature_provider()),
+            'csm' => false,
+            'use_arn_region' => false,
+            'http' => [
+                'verify' => $this->getCertificateBundlePath(),
+                'connect_timeout' => $this->connectTimeout,
+            ],
+            'use_aws_shared_config_files' => false,
+            'retries' => [
+                'mode' => 'standard',
+                'max_attempts' => $this->retriesMaxAttempts,
+            ],
+        ];
+
+        if ($this->params['s3-accelerate']) {
+            $options['use_accelerate_endpoint'] = true;
+        } else {
+            $options['endpoint'] = $base_url;
+        }
+
+        if (isset($this->params['request_checksum_calculation'])) {
+            $options['request_checksum_calculation'] = $this->params['request_checksum_calculation'];
+        } else {
+            $options['request_checksum_calculation'] = 'when_required';
+        }
+
+        if (isset($this->params['response_checksum_validation'])) {
+            $options['response_checksum_validation'] = $this->params['response_checksum_validation'];
+        } else {
+            $options['response_checksum_validation'] = 'when_required';
+        }
+
+        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);
+
+        try {
+            $logger = Server::get(LoggerInterface::class);
+            if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
+                $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']) {
+                $cacheKey = $this->params['hostname'] . $this->bucket;
+                $exist = $this->existingBucketsCache->get($cacheKey) === 1;
+
+                if (!$exist) {
+                    if (!$this->connection->doesBucketExist($this->bucket)) {
+                        try {
+                            $logger->info('Bucket "' . $this->bucket . '" does not exist - creating it.', ['app' => 'objectstore']);
+                            if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
+                                throw new StorageNotAvailableException('The bucket will not be created because the name is not dns compatible, please correct it: ' . $this->bucket);
+                            }
+                            $this->connection->createBucket(['Bucket' => $this->bucket]);
+                            Server::get(IEventDispatcher::class)
+                                ->dispatchTyped(new BucketCreatedEvent(
+                                    $this->bucket,
+                                    $options['endpoint'],
+                                    $options['region'],
+                                    $options['version']
+                                ));
+                            $this->testTimeout();
+                        } catch (S3Exception $e) {
+                            $logger->debug('Invalid remote storage.', [
+                                'exception' => $e,
+                                'app' => 'objectstore',
+                            ]);
+                            if ($e->getAwsErrorCode() !== 'BucketAlreadyOwnedByYou') {
+                                throw new StorageNotAvailableException('Creation of bucket "' . $this->bucket . '" failed. ' . $e->getMessage());
+                            }
+                        }
+                    }
+                    $this->existingBucketsCache->set($cacheKey, 1);
+                }
+            }
+
+            // 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');
+            }
+        } catch (S3Exception $e) {
+            throw new StorageNotAvailableException('S3 service is unable to handle request: ' . $e->getMessage());
+        }
+
+        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'];
+            $sessionToken = empty($this->params['session_token']) ? null : $this->params['session_token'];
+
+            if ($key && $secret) {
+                return Create::promiseFor(
+                    // a null sessionToken match the default signature of the constructor
+                    new Credentials($key, $secret, $sessionToken)
+                );
+            }
+
+            $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')) {
+            /** @var ICertificateManager $certManager */
+            $certManager = Server::get(ICertificateManager::class);
+            // 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'])) {
+                return $certManager->getAbsoluteBundlePath();
+            } else {
+                return $certManager->getDefaultCertificatesBundlePath();
+            }
+        } else {
+            return null;
+        }
+    }
+
+    protected function getSSECKey(): ?string {
+        if (isset($this->params['sse_c_key']) && !empty($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)
+        ];
+    }
+
+    public function isUsePresignedUrl(): bool {
+        return $this->usePresignedUrl;
+    }
 }