nextcloud / server

lib/private/Security/CertificateManager.php

Indentation +242 added lines, -242 removed lines

@@ -43,246 +43,246 @@
  * Manage trusted certificates for users
  */
 class CertificateManager implements ICertificateManager {
-	/**
-	 * @var \OC\Files\View
-	 */
-	protected $view;
-
-	/**
-	 * @var IConfig
-	 */
-	protected $config;
-
-	/**
-	 * @var ILogger
-	 */
-	protected $logger;
-
-	/** @var ISecureRandom */
-	protected $random;
-
-	/**
-	 * @param \OC\Files\View $view relative to data/
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 * @param ISecureRandom $random
-	 */
-	public function __construct(\OC\Files\View $view,
-								IConfig $config,
-								ILogger $logger,
-								ISecureRandom $random) {
-		$this->view = $view;
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->random = $random;
-	}
-
-	/**
-	 * Returns all certificates trusted by the user
-	 *
-	 * @return \OCP\ICertificate[]
-	 */
-	public function listCertificates(): array {
-		if (!$this->config->getSystemValue('installed', false)) {
-			return [];
-		}
-
-		$path = $this->getPathToCertificates() . 'uploads/';
-		if (!$this->view->is_dir($path)) {
-			return [];
-		}
-		$result = [];
-		$handle = $this->view->opendir($path);
-		if (!is_resource($handle)) {
-			return [];
-		}
-		while (false !== ($file = readdir($handle))) {
-			if ($file != '.' && $file != '..') {
-				try {
-					$result[] = new Certificate($this->view->file_get_contents($path . $file), $file);
-				} catch (\Exception $e) {
-				}
-			}
-		}
-		closedir($handle);
-		return $result;
-	}
-
-	private function hasCertificates(): bool {
-		if (!$this->config->getSystemValue('installed', false)) {
-			return false;
-		}
-
-		$path = $this->getPathToCertificates() . 'uploads/';
-		if (!$this->view->is_dir($path)) {
-			return false;
-		}
-		$result = [];
-		$handle = $this->view->opendir($path);
-		if (!is_resource($handle)) {
-			return false;
-		}
-		while (false !== ($file = readdir($handle))) {
-			if ($file !== '.' && $file !== '..') {
-				return true;
-			}
-		}
-		closedir($handle);
-		return false;
-	}
-
-	/**
-	 * create the certificate bundle of all trusted certificated
-	 */
-	public function createCertificateBundle(): void {
-		$path = $this->getPathToCertificates();
-		$certs = $this->listCertificates();
-
-		if (!$this->view->file_exists($path)) {
-			$this->view->mkdir($path);
-		}
-
-		$defaultCertificates = file_get_contents(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
-		if (strlen($defaultCertificates) < 1024) { // sanity check to verify that we have some content for our bundle
-			// log as exception so we have a stacktrace
-			$this->logger->logException(new \Exception('Shipped ca-bundle is empty, refusing to create certificate bundle'));
-			return;
-		}
-
-		$certPath = $path . 'rootcerts.crt';
-		$tmpPath = $certPath . '.tmp' . $this->random->generate(10, ISecureRandom::CHAR_DIGITS);
-		$fhCerts = $this->view->fopen($tmpPath, 'w');
-
-		// Write user certificates
-		foreach ($certs as $cert) {
-			$file = $path . '/uploads/' . $cert->getName();
-			$data = $this->view->file_get_contents($file);
-			if (strpos($data, 'BEGIN CERTIFICATE')) {
-				fwrite($fhCerts, $data);
-				fwrite($fhCerts, "\r\n");
-			}
-		}
-
-		// Append the default certificates
-		fwrite($fhCerts, $defaultCertificates);
-
-		// Append the system certificate bundle
-		$systemBundle = $this->getCertificateBundle();
-		if ($systemBundle !== $certPath && $this->view->file_exists($systemBundle)) {
-			$systemCertificates = $this->view->file_get_contents($systemBundle);
-			fwrite($fhCerts, $systemCertificates);
-		}
-
-		fclose($fhCerts);
-
-		$this->view->rename($tmpPath, $certPath);
-	}
-
-	/**
-	 * Save the certificate and re-generate the certificate bundle
-	 *
-	 * @param string $certificate the certificate data
-	 * @param string $name the filename for the certificate
-	 * @return \OCP\ICertificate
-	 * @throws \Exception If the certificate could not get added
-	 */
-	public function addCertificate(string $certificate, string $name): ICertificate {
-		if (!Filesystem::isValidPath($name) or Filesystem::isFileBlacklisted($name)) {
-			throw new \Exception('Filename is not valid');
-		}
-
-		$dir = $this->getPathToCertificates() . 'uploads/';
-		if (!$this->view->file_exists($dir)) {
-			$this->view->mkdir($dir);
-		}
-
-		try {
-			$file = $dir . $name;
-			$certificateObject = new Certificate($certificate, $name);
-			$this->view->file_put_contents($file, $certificate);
-			$this->createCertificateBundle();
-			return $certificateObject;
-		} catch (\Exception $e) {
-			throw $e;
-		}
-	}
-
-	/**
-	 * Remove the certificate and re-generate the certificate bundle
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function removeCertificate(string $name): bool {
-		if (!Filesystem::isValidPath($name)) {
-			return false;
-		}
-		$path = $this->getPathToCertificates() . 'uploads/';
-		if ($this->view->file_exists($path . $name)) {
-			$this->view->unlink($path . $name);
-			$this->createCertificateBundle();
-		}
-		return true;
-	}
-
-	/**
-	 * Get the path to the certificate bundle
-	 *
-	 * @return string
-	 */
-	public function getCertificateBundle(): string {
-		return $this->getPathToCertificates() . 'rootcerts.crt';
-	}
-
-	/**
-	 * Get the full local path to the certificate bundle
-	 *
-	 * @return string
-	 */
-	public function getAbsoluteBundlePath(): string {
-		try {
-			if (!$this->hasCertificates()) {
-				return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
-			}
-
-			if ($this->needsRebundling()) {
-				$this->createCertificateBundle();
-			}
-
-			return $this->view->getLocalFile($this->getCertificateBundle());
-		} catch (\Exception $e) {
-			return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
-		}
-	}
-
-	/**
-	 * @return string
-	 */
-	private function getPathToCertificates(): string {
-		return '/files_external/';
-	}
-
-	/**
-	 * Check if we need to re-bundle the certificates because one of the sources has updated
-	 *
-	 * @return bool
-	 */
-	private function needsRebundling(): bool {
-		$targetBundle = $this->getCertificateBundle();
-		if (!$this->view->file_exists($targetBundle)) {
-			return true;
-		}
-
-		$sourceMTime = $this->getFilemtimeOfCaBundle();
-		return $sourceMTime > $this->view->filemtime($targetBundle);
-	}
-
-	/**
-	 * get mtime of ca-bundle shipped by Nextcloud
-	 *
-	 * @return int
-	 */
-	protected function getFilemtimeOfCaBundle(): int {
-		return filemtime(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
-	}
+    /**
+     * @var \OC\Files\View
+     */
+    protected $view;
+
+    /**
+     * @var IConfig
+     */
+    protected $config;
+
+    /**
+     * @var ILogger
+     */
+    protected $logger;
+
+    /** @var ISecureRandom */
+    protected $random;
+
+    /**
+     * @param \OC\Files\View $view relative to data/
+     * @param IConfig $config
+     * @param ILogger $logger
+     * @param ISecureRandom $random
+     */
+    public function __construct(\OC\Files\View $view,
+                                IConfig $config,
+                                ILogger $logger,
+                                ISecureRandom $random) {
+        $this->view = $view;
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->random = $random;
+    }
+
+    /**
+     * Returns all certificates trusted by the user
+     *
+     * @return \OCP\ICertificate[]
+     */
+    public function listCertificates(): array {
+        if (!$this->config->getSystemValue('installed', false)) {
+            return [];
+        }
+
+        $path = $this->getPathToCertificates() . 'uploads/';
+        if (!$this->view->is_dir($path)) {
+            return [];
+        }
+        $result = [];
+        $handle = $this->view->opendir($path);
+        if (!is_resource($handle)) {
+            return [];
+        }
+        while (false !== ($file = readdir($handle))) {
+            if ($file != '.' && $file != '..') {
+                try {
+                    $result[] = new Certificate($this->view->file_get_contents($path . $file), $file);
+                } catch (\Exception $e) {
+                }
+            }
+        }
+        closedir($handle);
+        return $result;
+    }
+
+    private function hasCertificates(): bool {
+        if (!$this->config->getSystemValue('installed', false)) {
+            return false;
+        }
+
+        $path = $this->getPathToCertificates() . 'uploads/';
+        if (!$this->view->is_dir($path)) {
+            return false;
+        }
+        $result = [];
+        $handle = $this->view->opendir($path);
+        if (!is_resource($handle)) {
+            return false;
+        }
+        while (false !== ($file = readdir($handle))) {
+            if ($file !== '.' && $file !== '..') {
+                return true;
+            }
+        }
+        closedir($handle);
+        return false;
+    }
+
+    /**
+     * create the certificate bundle of all trusted certificated
+     */
+    public function createCertificateBundle(): void {
+        $path = $this->getPathToCertificates();
+        $certs = $this->listCertificates();
+
+        if (!$this->view->file_exists($path)) {
+            $this->view->mkdir($path);
+        }
+
+        $defaultCertificates = file_get_contents(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
+        if (strlen($defaultCertificates) < 1024) { // sanity check to verify that we have some content for our bundle
+            // log as exception so we have a stacktrace
+            $this->logger->logException(new \Exception('Shipped ca-bundle is empty, refusing to create certificate bundle'));
+            return;
+        }
+
+        $certPath = $path . 'rootcerts.crt';
+        $tmpPath = $certPath . '.tmp' . $this->random->generate(10, ISecureRandom::CHAR_DIGITS);
+        $fhCerts = $this->view->fopen($tmpPath, 'w');
+
+        // Write user certificates
+        foreach ($certs as $cert) {
+            $file = $path . '/uploads/' . $cert->getName();
+            $data = $this->view->file_get_contents($file);
+            if (strpos($data, 'BEGIN CERTIFICATE')) {
+                fwrite($fhCerts, $data);
+                fwrite($fhCerts, "\r\n");
+            }
+        }
+
+        // Append the default certificates
+        fwrite($fhCerts, $defaultCertificates);
+
+        // Append the system certificate bundle
+        $systemBundle = $this->getCertificateBundle();
+        if ($systemBundle !== $certPath && $this->view->file_exists($systemBundle)) {
+            $systemCertificates = $this->view->file_get_contents($systemBundle);
+            fwrite($fhCerts, $systemCertificates);
+        }
+
+        fclose($fhCerts);
+
+        $this->view->rename($tmpPath, $certPath);
+    }
+
+    /**
+     * Save the certificate and re-generate the certificate bundle
+     *
+     * @param string $certificate the certificate data
+     * @param string $name the filename for the certificate
+     * @return \OCP\ICertificate
+     * @throws \Exception If the certificate could not get added
+     */
+    public function addCertificate(string $certificate, string $name): ICertificate {
+        if (!Filesystem::isValidPath($name) or Filesystem::isFileBlacklisted($name)) {
+            throw new \Exception('Filename is not valid');
+        }
+
+        $dir = $this->getPathToCertificates() . 'uploads/';
+        if (!$this->view->file_exists($dir)) {
+            $this->view->mkdir($dir);
+        }
+
+        try {
+            $file = $dir . $name;
+            $certificateObject = new Certificate($certificate, $name);
+            $this->view->file_put_contents($file, $certificate);
+            $this->createCertificateBundle();
+            return $certificateObject;
+        } catch (\Exception $e) {
+            throw $e;
+        }
+    }
+
+    /**
+     * Remove the certificate and re-generate the certificate bundle
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function removeCertificate(string $name): bool {
+        if (!Filesystem::isValidPath($name)) {
+            return false;
+        }
+        $path = $this->getPathToCertificates() . 'uploads/';
+        if ($this->view->file_exists($path . $name)) {
+            $this->view->unlink($path . $name);
+            $this->createCertificateBundle();
+        }
+        return true;
+    }
+
+    /**
+     * Get the path to the certificate bundle
+     *
+     * @return string
+     */
+    public function getCertificateBundle(): string {
+        return $this->getPathToCertificates() . 'rootcerts.crt';
+    }
+
+    /**
+     * Get the full local path to the certificate bundle
+     *
+     * @return string
+     */
+    public function getAbsoluteBundlePath(): string {
+        try {
+            if (!$this->hasCertificates()) {
+                return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
+            }
+
+            if ($this->needsRebundling()) {
+                $this->createCertificateBundle();
+            }
+
+            return $this->view->getLocalFile($this->getCertificateBundle());
+        } catch (\Exception $e) {
+            return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
+        }
+    }
+
+    /**
+     * @return string
+     */
+    private function getPathToCertificates(): string {
+        return '/files_external/';
+    }
+
+    /**
+     * Check if we need to re-bundle the certificates because one of the sources has updated
+     *
+     * @return bool
+     */
+    private function needsRebundling(): bool {
+        $targetBundle = $this->getCertificateBundle();
+        if (!$this->view->file_exists($targetBundle)) {
+            return true;
+        }
+
+        $sourceMTime = $this->getFilemtimeOfCaBundle();
+        return $sourceMTime > $this->view->filemtime($targetBundle);
+    }
+
+    /**
+     * get mtime of ca-bundle shipped by Nextcloud
+     *
+     * @return int
+     */
+    protected function getFilemtimeOfCaBundle(): int {
+        return filemtime(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -87,7 +87,7 @@ 
 			return [];
 		}
 
-		$path = $this->getPathToCertificates() . 'uploads/';
+		$path = $this->getPathToCertificates().'uploads/';
 		if (!$this->view->is_dir($path)) {
 			return [];
 		}
@@ -99,7 +99,7 @@ 
 		while (false !== ($file = readdir($handle))) {
 			if ($file != '.' && $file != '..') {
 				try {
-					$result[] = new Certificate($this->view->file_get_contents($path . $file), $file);
+					$result[] = new Certificate($this->view->file_get_contents($path.$file), $file);
 				} catch (\Exception $e) {
 				}
 			}
@@ -113,7 +113,7 @@ 
 			return false;
 		}
 
-		$path = $this->getPathToCertificates() . 'uploads/';
+		$path = $this->getPathToCertificates().'uploads/';
 		if (!$this->view->is_dir($path)) {
 			return false;
 		}
@@ -142,20 +142,20 @@ 
 			$this->view->mkdir($path);
 		}
 
-		$defaultCertificates = file_get_contents(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
+		$defaultCertificates = file_get_contents(\OC::$SERVERROOT.'/resources/config/ca-bundle.crt');
 		if (strlen($defaultCertificates) < 1024) { // sanity check to verify that we have some content for our bundle
 			// log as exception so we have a stacktrace
 			$this->logger->logException(new \Exception('Shipped ca-bundle is empty, refusing to create certificate bundle'));
 			return;
 		}
 
-		$certPath = $path . 'rootcerts.crt';
-		$tmpPath = $certPath . '.tmp' . $this->random->generate(10, ISecureRandom::CHAR_DIGITS);
+		$certPath = $path.'rootcerts.crt';
+		$tmpPath = $certPath.'.tmp'.$this->random->generate(10, ISecureRandom::CHAR_DIGITS);
 		$fhCerts = $this->view->fopen($tmpPath, 'w');
 
 		// Write user certificates
 		foreach ($certs as $cert) {
-			$file = $path . '/uploads/' . $cert->getName();
+			$file = $path.'/uploads/'.$cert->getName();
 			$data = $this->view->file_get_contents($file);
 			if (strpos($data, 'BEGIN CERTIFICATE')) {
 				fwrite($fhCerts, $data);
@@ -191,13 +191,13 @@ 
 			throw new \Exception('Filename is not valid');
 		}
 
-		$dir = $this->getPathToCertificates() . 'uploads/';
+		$dir = $this->getPathToCertificates().'uploads/';
 		if (!$this->view->file_exists($dir)) {
 			$this->view->mkdir($dir);
 		}
 
 		try {
-			$file = $dir . $name;
+			$file = $dir.$name;
 			$certificateObject = new Certificate($certificate, $name);
 			$this->view->file_put_contents($file, $certificate);
 			$this->createCertificateBundle();
@@ -217,9 +217,9 @@ 
 		if (!Filesystem::isValidPath($name)) {
 			return false;
 		}
-		$path = $this->getPathToCertificates() . 'uploads/';
-		if ($this->view->file_exists($path . $name)) {
-			$this->view->unlink($path . $name);
+		$path = $this->getPathToCertificates().'uploads/';
+		if ($this->view->file_exists($path.$name)) {
+			$this->view->unlink($path.$name);
 			$this->createCertificateBundle();
 		}
 		return true;
@@ -231,7 +231,7 @@ 
 	 * @return string
 	 */
 	public function getCertificateBundle(): string {
-		return $this->getPathToCertificates() . 'rootcerts.crt';
+		return $this->getPathToCertificates().'rootcerts.crt';
 	}
 
 	/**
@@ -242,7 +242,7 @@ 
 	public function getAbsoluteBundlePath(): string {
 		try {
 			if (!$this->hasCertificates()) {
-				return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
+				return \OC::$SERVERROOT.'/resources/config/ca-bundle.crt';
 			}
 
 			if ($this->needsRebundling()) {
@@ -251,7 +251,7 @@ 
 
 			return $this->view->getLocalFile($this->getCertificateBundle());
 		} catch (\Exception $e) {
-			return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
+			return \OC::$SERVERROOT.'/resources/config/ca-bundle.crt';
 		}
 	}
 
@@ -283,6 +283,6 @@ 
 	 * @return int
 	 */
 	protected function getFilemtimeOfCaBundle(): int {
-		return filemtime(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
+		return filemtime(\OC::$SERVERROOT.'/resources/config/ca-bundle.crt');
 	}
 }

lib/private/Files/ObjectStore/S3.php

Indentation +13 added lines, -13 removed lines

@@ -26,19 +26,19 @@
 use OCP\Files\ObjectStore\IObjectStore;
 
 class S3 implements IObjectStore {
-	use S3ConnectionTrait;
-	use S3ObjectTrait;
+    use S3ConnectionTrait;
+    use S3ObjectTrait;
 
-	public function __construct($parameters) {
-		$parameters['primary_storage'] = true;
-		$this->parseParams($parameters);
-	}
+    public function __construct($parameters) {
+        $parameters['primary_storage'] = true;
+        $this->parseParams($parameters);
+    }
 
-	/**
-	 * @return string the container or bucket name where objects are stored
-	 * @since 7.0.0
-	 */
-	public function getStorageId() {
-		return $this->id;
-	}
+    /**
+     * @return string the container or bucket name where objects are stored
+     * @since 7.0.0
+     */
+    public function getStorageId() {
+        return $this->id;
+    }
 }

lib/private/Files/ObjectStore/S3ConnectionTrait.php

Indentation +177 added lines, -177 removed lines

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

Spacing +9 added lines, -9 removed lines

@@ -73,7 +73,7 @@ 
 			throw new \Exception("Bucket has to be configured.");
 		}
 
-		$this->id = 'amazon::' . $params['bucket'];
+		$this->id = 'amazon::'.$params['bucket'];
 
 		$this->test = isset($params['test']);
 		$this->bucket = $params['bucket'];
@@ -82,7 +82,7 @@ 
 		$this->uploadPartSize = $params['uploadPartSize'] ?? 524288000;
 		$this->putSizeLimit = $params['putSizeLimit'] ?? 104857600;
 		$params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region'];
-		$params['hostname'] = empty($params['hostname']) ? 's3.' . $params['region'] . '.amazonaws.com' : $params['hostname'];
+		$params['hostname'] = empty($params['hostname']) ? 's3.'.$params['region'].'.amazonaws.com' : $params['hostname'];
 		if (!isset($params['port']) || $params['port'] === '') {
 			$params['port'] = (isset($params['use_ssl']) && $params['use_ssl'] === false) ? 80 : 443;
 		}
@@ -110,7 +110,7 @@ 
 		}
 
 		$scheme = (isset($this->params['use_ssl']) && $this->params['use_ssl'] === false) ? 'http' : 'https';
-		$base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/';
+		$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).
@@ -127,7 +127,7 @@ 
 			$certManager = \OC::$server->get(ICertificateManager::class);
 			$certPath = $certManager->getAbsoluteBundlePath();
 		} else {
-			$certPath = \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
+			$certPath = \OC::$SERVERROOT.'/resources/config/ca-bundle.crt';
 		}
 
 		$options = [
@@ -151,16 +151,16 @@ 
 
 		if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
 			$logger = \OC::$server->getLogger();
-			$logger->debug('Bucket "' . $this->bucket . '" This bucket name is not dns compatible, it may contain invalid characters.',
+			$logger->debug('Bucket "'.$this->bucket.'" This bucket name is not dns compatible, it may contain invalid characters.',
 					 ['app' => 'objectstore']);
 		}
 
 		if ($this->params['verify_bucket_exists'] && !$this->connection->doesBucketExist($this->bucket)) {
 			$logger = \OC::$server->getLogger();
 			try {
-				$logger->info('Bucket "' . $this->bucket . '" does not exist - creating it.', ['app' => 'objectstore']);
+				$logger->info('Bucket "'.$this->bucket.'" does not exist - creating it.', ['app' => 'objectstore']);
 				if (!$this->connection::isBucketDnsCompatible($this->bucket)) {
-					throw new \Exception("The bucket will not be created because the name is not dns compatible, please correct it: " . $this->bucket);
+					throw new \Exception("The bucket will not be created because the name is not dns compatible, please correct it: ".$this->bucket);
 				}
 				$this->connection->createBucket(['Bucket' => $this->bucket]);
 				$this->testTimeout();
@@ -170,7 +170,7 @@ 
 					'level' => ILogger::DEBUG,
 					'app' => 'objectstore',
 				]);
-				throw new \Exception('Creation of bucket "' . $this->bucket . '" failed. ' . $e->getMessage());
+				throw new \Exception('Creation of bucket "'.$this->bucket.'" failed. '.$e->getMessage());
 			}
 		}
 
@@ -205,7 +205,7 @@ 
 	 * This function creates a credential provider based on user parameter file
 	 */
 	protected function paramCredentialProvider() : callable {
-		return function () {
+		return function() {
 			$key = empty($this->params['key']) ? null : $this->params['key'];
 			$secret = empty($this->params['secret']) ? null : $this->params['secret'];