nextcloud / server

lib/private/Http/Client/ClientService.php

Indentation +19 added lines, -19 removed lines

@@ -36,25 +36,25 @@
  * @package OC\Http
  */
 class ClientService implements IClientService {
-	/** @var IConfig */
-	private $config;
-	/** @var ICertificateManager */
-	private $certificateManager;
+    /** @var IConfig */
+    private $config;
+    /** @var ICertificateManager */
+    private $certificateManager;
 
-	/**
-	 * @param IConfig $config
-	 * @param ICertificateManager $certificateManager
-	 */
-	public function __construct(IConfig $config,
-								ICertificateManager $certificateManager) {
-		$this->config = $config;
-		$this->certificateManager = $certificateManager;
-	}
+    /**
+     * @param IConfig $config
+     * @param ICertificateManager $certificateManager
+     */
+    public function __construct(IConfig $config,
+                                ICertificateManager $certificateManager) {
+        $this->config = $config;
+        $this->certificateManager = $certificateManager;
+    }
 
-	/**
-	 * @return Client
-	 */
-	public function newClient(): IClient {
-		return new Client($this->config, $this->certificateManager, new GuzzleClient(), HandlerStack::create());
-	}
+    /**
+     * @return Client
+     */
+    public function newClient(): IClient {
+        return new Client($this->config, $this->certificateManager, new GuzzleClient(), HandlerStack::create());
+    }
 }

lib/private/Http/Client/Client.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
@@ -75,7 +75,7 @@ 
 		}
 		$this->configured = true;
 
-		$this->stack->push(Middleware::mapRequest(function (RequestInterface $request) {
+		$this->stack->push(Middleware::mapRequest(function(RequestInterface $request) {
 			return $request
 				->withHeader('User-Agent', 'Nextcloud Server Crawler');
 		}));
@@ -101,7 +101,7 @@ 
 			if ($this->config->getSystemValue('installed', false)) {
 				return $this->certificateManager->getAbsoluteBundlePath(null);
 			} else {
-				return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
+				return \OC::$SERVERROOT.'/resources/config/ca-bundle.crt';
 			}
 		}
 	}
@@ -117,7 +117,7 @@ 
 		$proxyUri = '';
 
 		if ($proxyUserPwd !== null) {
-			$proxyUri .= $proxyUserPwd . '@';
+			$proxyUri .= $proxyUserPwd.'@';
 		}
 		if ($proxyHost !== null) {
 			$proxyUri .= $proxyHost;

Indentation +283 added lines, -283 removed lines

@@ -39,302 +39,302 @@
  * @package OC\Http
  */
 class Client implements IClient {
-	/** @var GuzzleClient */
-	private $client;
-	/** @var IConfig */
-	private $config;
-	/** @var ICertificateManager */
-	private $certificateManager;
-	private $configured = false;
-	/** @var HandlerStack */
-	private $stack;
+    /** @var GuzzleClient */
+    private $client;
+    /** @var IConfig */
+    private $config;
+    /** @var ICertificateManager */
+    private $certificateManager;
+    private $configured = false;
+    /** @var HandlerStack */
+    private $stack;
 
-	/**
-	 * @param IConfig $config
-	 * @param ICertificateManager $certificateManager
-	 * @param GuzzleClient $client
-	 */
-	public function __construct(
-		IConfig $config,
-		ICertificateManager $certificateManager,
-		GuzzleClient $client,
-		HandlerStack $stack
-	) {
-		$this->config = $config;
-		$this->client = $client;
-		$this->stack = $stack;
-		$this->certificateManager = $certificateManager;
-	}
+    /**
+     * @param IConfig $config
+     * @param ICertificateManager $certificateManager
+     * @param GuzzleClient $client
+     */
+    public function __construct(
+        IConfig $config,
+        ICertificateManager $certificateManager,
+        GuzzleClient $client,
+        HandlerStack $stack
+    ) {
+        $this->config = $config;
+        $this->client = $client;
+        $this->stack = $stack;
+        $this->certificateManager = $certificateManager;
+    }
 
-	/**
-	 * Sets the default options to the client
-	 */
-	private function setDefaultOptions() {
-		if ($this->configured) {
-			return;
-		}
-		$this->configured = true;
+    /**
+     * Sets the default options to the client
+     */
+    private function setDefaultOptions() {
+        if ($this->configured) {
+            return;
+        }
+        $this->configured = true;
 
-		$this->stack->push(Middleware::mapRequest(function (RequestInterface $request) {
-			return $request
-				->withHeader('User-Agent', 'Nextcloud Server Crawler');
-		}));
-	}
+        $this->stack->push(Middleware::mapRequest(function (RequestInterface $request) {
+            return $request
+                ->withHeader('User-Agent', 'Nextcloud Server Crawler');
+        }));
+    }
 
-	private function getRequestOptions() {
-		$options = [
-			'verify' => $this->getCertBundle(),
-		];
-		$proxyUri = $this->getProxyUri();
-		if ($proxyUri !== '') {
-			$options['proxy'] = $proxyUri;
-		}
-		return $options;
-	}
+    private function getRequestOptions() {
+        $options = [
+            'verify' => $this->getCertBundle(),
+        ];
+        $proxyUri = $this->getProxyUri();
+        if ($proxyUri !== '') {
+            $options['proxy'] = $proxyUri;
+        }
+        return $options;
+    }
 
-	private function getCertBundle() {
-		if ($this->certificateManager->listCertificates() !== []) {
-			return $this->certificateManager->getAbsoluteBundlePath();
-		} else {
-			// If the instance is not yet setup we need to use the static path as
-			// $this->certificateManager->getAbsoluteBundlePath() tries to instantiiate
-			// a view
-			if ($this->config->getSystemValue('installed', false)) {
-				return $this->certificateManager->getAbsoluteBundlePath(null);
-			} else {
-				return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
-			}
-		}
-	}
+    private function getCertBundle() {
+        if ($this->certificateManager->listCertificates() !== []) {
+            return $this->certificateManager->getAbsoluteBundlePath();
+        } else {
+            // If the instance is not yet setup we need to use the static path as
+            // $this->certificateManager->getAbsoluteBundlePath() tries to instantiiate
+            // a view
+            if ($this->config->getSystemValue('installed', false)) {
+                return $this->certificateManager->getAbsoluteBundlePath(null);
+            } else {
+                return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt';
+            }
+        }
+    }
 
-	/**
-	 * Get the proxy URI
-	 *
-	 * @return string
-	 */
-	private function getProxyUri(): string {
-		$proxyHost = $this->config->getSystemValue('proxy', null);
-		$proxyUserPwd = $this->config->getSystemValue('proxyuserpwd', null);
-		$proxyUri = '';
+    /**
+     * Get the proxy URI
+     *
+     * @return string
+     */
+    private function getProxyUri(): string {
+        $proxyHost = $this->config->getSystemValue('proxy', null);
+        $proxyUserPwd = $this->config->getSystemValue('proxyuserpwd', null);
+        $proxyUri = '';
 
-		if ($proxyUserPwd !== null) {
-			$proxyUri .= $proxyUserPwd . '@';
-		}
-		if ($proxyHost !== null) {
-			$proxyUri .= $proxyHost;
-		}
+        if ($proxyUserPwd !== null) {
+            $proxyUri .= $proxyUserPwd . '@';
+        }
+        if ($proxyHost !== null) {
+            $proxyUri .= $proxyHost;
+        }
 
-		return $proxyUri;
-	}
+        return $proxyUri;
+    }
 
-	/**
-	 * Sends a GET request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'query' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return IResponse
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function get(string $uri, array $options = []): IResponse {
-		$this->setDefaultOptions();
-		$response = $this->client->request('get', $uri, array_merge($options, $this->getRequestOptions()));
-		$isStream = isset($options['stream']) && $options['stream'];
-		return new Response($response, $isStream);
-	}
+    /**
+     * Sends a GET request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'query' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return IResponse
+     * @throws \Exception If the request could not get completed
+     */
+    public function get(string $uri, array $options = []): IResponse {
+        $this->setDefaultOptions();
+        $response = $this->client->request('get', $uri, array_merge($options, $this->getRequestOptions()));
+        $isStream = isset($options['stream']) && $options['stream'];
+        return new Response($response, $isStream);
+    }
 
-	/**
-	 * Sends a HEAD request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return IResponse
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function head(string $uri, array $options = []): IResponse {
-		$this->setDefaultOptions();
-		$response = $this->client->request('head', $uri, array_merge($options, $this->getRequestOptions()));
-		return new Response($response);
-	}
+    /**
+     * Sends a HEAD request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return IResponse
+     * @throws \Exception If the request could not get completed
+     */
+    public function head(string $uri, array $options = []): IResponse {
+        $this->setDefaultOptions();
+        $response = $this->client->request('head', $uri, array_merge($options, $this->getRequestOptions()));
+        return new Response($response);
+    }
 
-	/**
-	 * Sends a POST request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'body' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return IResponse
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function post(string $uri, array $options = []): IResponse {
-		$this->setDefaultOptions();
-		if (isset($options['body']) && is_array($options['body'])) {
-			$options['form_params'] = $options['body'];
-			unset($options['body']);
-		}
-		$response = $this->client->request('post', $uri, array_merge($options, $this->getRequestOptions()));
-		return new Response($response);
-	}
+    /**
+     * Sends a POST request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'body' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return IResponse
+     * @throws \Exception If the request could not get completed
+     */
+    public function post(string $uri, array $options = []): IResponse {
+        $this->setDefaultOptions();
+        if (isset($options['body']) && is_array($options['body'])) {
+            $options['form_params'] = $options['body'];
+            unset($options['body']);
+        }
+        $response = $this->client->request('post', $uri, array_merge($options, $this->getRequestOptions()));
+        return new Response($response);
+    }
 
-	/**
-	 * Sends a PUT request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'body' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return IResponse
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function put(string $uri, array $options = []): IResponse {
-		$this->setDefaultOptions();
-		$response = $this->client->request('put', $uri, array_merge($options, $this->getRequestOptions()));
-		return new Response($response);
-	}
+    /**
+     * Sends a PUT request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'body' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return IResponse
+     * @throws \Exception If the request could not get completed
+     */
+    public function put(string $uri, array $options = []): IResponse {
+        $this->setDefaultOptions();
+        $response = $this->client->request('put', $uri, array_merge($options, $this->getRequestOptions()));
+        return new Response($response);
+    }
 
-	/**
-	 * Sends a DELETE request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'body' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return IResponse
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function delete(string $uri, array $options = []): IResponse {
-		$this->setDefaultOptions();
-		$response = $this->client->request('delete', $uri, array_merge($options, $this->getRequestOptions()));
-		return new Response($response);
-	}
+    /**
+     * Sends a DELETE request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'body' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return IResponse
+     * @throws \Exception If the request could not get completed
+     */
+    public function delete(string $uri, array $options = []): IResponse {
+        $this->setDefaultOptions();
+        $response = $this->client->request('delete', $uri, array_merge($options, $this->getRequestOptions()));
+        return new Response($response);
+    }
 
 
-	/**
-	 * Sends a options request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'body' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return IResponse
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function options(string $uri, array $options = []): IResponse {
-		$this->setDefaultOptions();
-		$response = $this->client->request('options', $uri, array_merge($options, $this->getRequestOptions()));
-		return new Response($response);
-	}
+    /**
+     * Sends a options request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'body' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return IResponse
+     * @throws \Exception If the request could not get completed
+     */
+    public function options(string $uri, array $options = []): IResponse {
+        $this->setDefaultOptions();
+        $response = $this->client->request('options', $uri, array_merge($options, $this->getRequestOptions()));
+        return new Response($response);
+    }
 }

lib/private/Http/Client/Response.php

Indentation +41 added lines, -41 removed lines

@@ -33,51 +33,51 @@
  * @package OC\Http
  */
 class Response implements IResponse {
-	/** @var ResponseInterface */
-	private $response;
+    /** @var ResponseInterface */
+    private $response;
 
-	/**
-	 * @var bool
-	 */
-	private $stream;
+    /**
+     * @var bool
+     */
+    private $stream;
 
-	/**
-	 * @param ResponseInterface $response
-	 * @param bool $stream
-	 */
-	public function __construct(ResponseInterface $response, $stream = false) {
-		$this->response = $response;
-		$this->stream = $stream;
-	}
+    /**
+     * @param ResponseInterface $response
+     * @param bool $stream
+     */
+    public function __construct(ResponseInterface $response, $stream = false) {
+        $this->response = $response;
+        $this->stream = $stream;
+    }
 
-	/**
-	 * @return string|resource
-	 */
-	public function getBody() {
-		return $this->stream ?
-			$this->response->getBody()->detach():
-			$this->response->getBody()->getContents();
-	}
+    /**
+     * @return string|resource
+     */
+    public function getBody() {
+        return $this->stream ?
+            $this->response->getBody()->detach():
+            $this->response->getBody()->getContents();
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getStatusCode(): int {
-		return $this->response->getStatusCode();
-	}
+    /**
+     * @return int
+     */
+    public function getStatusCode(): int {
+        return $this->response->getStatusCode();
+    }
 
-	/**
-	 * @param string $key
-	 * @return string
-	 */
-	public function getHeader(string $key): string {
-		return $this->response->getHeader($key)[0];
-	}
+    /**
+     * @param string $key
+     * @return string
+     */
+    public function getHeader(string $key): string {
+        return $this->response->getHeader($key)[0];
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getHeaders(): array {
-		return $this->response->getHeaders();
-	}
+    /**
+     * @return array
+     */
+    public function getHeaders(): array {
+        return $this->response->getHeaders();
+    }
 }

lib/private/Files/Storage/DAV.php

Unused Use Statements -1 removed lines

@@ -34,7 +34,6 @@
 namespace OC\Files\Storage;
 
 use Exception;
-use GuzzleHttp\Exception\RequestException;
 use Psr\Http\Message\ResponseInterface;
 use Icewind\Streams\CallbackWrapper;
 use OC\Files\Filesystem;

Indentation +796 added lines, -796 removed lines

@@ -57,801 +57,801 @@
  * @package OC\Files\Storage
  */
 class DAV extends Common {
-	/** @var string */
-	protected $password;
-	/** @var string */
-	protected $user;
-	/** @var string */
-	protected $authType;
-	/** @var string */
-	protected $host;
-	/** @var bool */
-	protected $secure;
-	/** @var string */
-	protected $root;
-	/** @var string */
-	protected $certPath;
-	/** @var bool */
-	protected $ready;
-	/** @var Client */
-	protected $client;
-	/** @var ArrayCache */
-	protected $statCache;
-	/** @var \OCP\Http\Client\IClientService */
-	protected $httpClientService;
-
-	/**
-	 * @param array $params
-	 * @throws \Exception
-	 */
-	public function __construct($params) {
-		$this->statCache = new ArrayCache();
-		$this->httpClientService = \OC::$server->getHTTPClientService();
-		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
-			$host = $params['host'];
-			//remove leading http[s], will be generated in createBaseUri()
-			if (substr($host, 0, 8) == "https://") $host = substr($host, 8);
-			else if (substr($host, 0, 7) == "http://") $host = substr($host, 7);
-			$this->host = $host;
-			$this->user = $params['user'];
-			$this->password = $params['password'];
-			if (isset($params['authType'])) {
-				$this->authType = $params['authType'];
-			}
-			if (isset($params['secure'])) {
-				if (is_string($params['secure'])) {
-					$this->secure = ($params['secure'] === 'true');
-				} else {
-					$this->secure = (bool)$params['secure'];
-				}
-			} else {
-				$this->secure = false;
-			}
-			if ($this->secure === true) {
-				// inject mock for testing
-				$certManager = \OC::$server->getCertificateManager();
-				if (is_null($certManager)) { //no user
-					$certManager = \OC::$server->getCertificateManager(null);
-				}
-				$certPath = $certManager->getAbsoluteBundlePath();
-				if (file_exists($certPath)) {
-					$this->certPath = $certPath;
-				}
-			}
-			$this->root = $params['root'] ?? '/';
-			$this->root = '/' . ltrim($this->root, '/');
-			$this->root = rtrim($this->root, '/') . '/';
-		} else {
-			throw new \Exception('Invalid webdav storage configuration');
-		}
-	}
-
-	protected function init() {
-		if ($this->ready) {
-			return;
-		}
-		$this->ready = true;
-
-		$settings = [
-			'baseUri' => $this->createBaseUri(),
-			'userName' => $this->user,
-			'password' => $this->password,
-		];
-		if (isset($this->authType)) {
-			$settings['authType'] = $this->authType;
-		}
-
-		$proxy = \OC::$server->getConfig()->getSystemValue('proxy', '');
-		if ($proxy !== '') {
-			$settings['proxy'] = $proxy;
-		}
-
-		$this->client = new Client($settings);
-		$this->client->setThrowExceptions(true);
-		if ($this->secure === true && $this->certPath) {
-			$this->client->addCurlSetting(CURLOPT_CAINFO, $this->certPath);
-		}
-	}
-
-	/**
-	 * Clear the stat cache
-	 */
-	public function clearStatCache() {
-		$this->statCache->clear();
-	}
-
-	/** {@inheritdoc} */
-	public function getId() {
-		return 'webdav::' . $this->user . '@' . $this->host . '/' . $this->root;
-	}
-
-	/** {@inheritdoc} */
-	public function createBaseUri() {
-		$baseUri = 'http';
-		if ($this->secure) {
-			$baseUri .= 's';
-		}
-		$baseUri .= '://' . $this->host . $this->root;
-		return $baseUri;
-	}
-
-	/** {@inheritdoc} */
-	public function mkdir($path) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		$result = $this->simpleResponse('MKCOL', $path, null, 201);
-		if ($result) {
-			$this->statCache->set($path, true);
-		}
-		return $result;
-	}
-
-	/** {@inheritdoc} */
-	public function rmdir($path) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		// FIXME: some WebDAV impl return 403 when trying to DELETE
-		// a non-empty folder
-		$result = $this->simpleResponse('DELETE', $path . '/', null, 204);
-		$this->statCache->clear($path . '/');
-		$this->statCache->remove($path);
-		return $result;
-	}
-
-	/** {@inheritdoc} */
-	public function opendir($path) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		try {
-			$response = $this->client->propFind(
-				$this->encodePath($path),
-				['{DAV:}href'],
-				1
-			);
-			if ($response === false) {
-				return false;
-			}
-			$content = [];
-			$files = array_keys($response);
-			array_shift($files); //the first entry is the current directory
-
-			if (!$this->statCache->hasKey($path)) {
-				$this->statCache->set($path, true);
-			}
-			foreach ($files as $file) {
-				$file = urldecode($file);
-				// do not store the real entry, we might not have all properties
-				if (!$this->statCache->hasKey($path)) {
-					$this->statCache->set($file, true);
-				}
-				$file = basename($file);
-				$content[] = $file;
-			}
-			return IteratorDirectory::wrap($content);
-		} catch (\Exception $e) {
-			$this->convertException($e, $path);
-		}
-		return false;
-	}
-
-	/**
-	 * Propfind call with cache handling.
-	 *
-	 * First checks if information is cached.
-	 * If not, request it from the server then store to cache.
-	 *
-	 * @param string $path path to propfind
-	 *
-	 * @return array|boolean propfind response or false if the entry was not found
-	 *
-	 * @throws ClientHttpException
-	 */
-	protected function propfind($path) {
-		$path = $this->cleanPath($path);
-		$cachedResponse = $this->statCache->get($path);
-		// we either don't know it, or we know it exists but need more details
-		if (is_null($cachedResponse) || $cachedResponse === true) {
-			$this->init();
-			try {
-				$response = $this->client->propFind(
-					$this->encodePath($path),
-					array(
-						'{DAV:}getlastmodified',
-						'{DAV:}getcontentlength',
-						'{DAV:}getcontenttype',
-						'{http://owncloud.org/ns}permissions',
-						'{http://open-collaboration-services.org/ns}share-permissions',
-						'{DAV:}resourcetype',
-						'{DAV:}getetag',
-					)
-				);
-				$this->statCache->set($path, $response);
-			} catch (ClientHttpException $e) {
-				if ($e->getHttpStatus() === 404) {
-					$this->statCache->clear($path . '/');
-					$this->statCache->set($path, false);
-					return false;
-				}
-				$this->convertException($e, $path);
-			} catch (\Exception $e) {
-				$this->convertException($e, $path);
-			}
-		} else {
-			$response = $cachedResponse;
-		}
-		return $response;
-	}
-
-	/** {@inheritdoc} */
-	public function filetype($path) {
-		try {
-			$response = $this->propfind($path);
-			if ($response === false) {
-				return false;
-			}
-			$responseType = [];
-			if (isset($response["{DAV:}resourcetype"])) {
-				/** @var ResourceType[] $response */
-				$responseType = $response["{DAV:}resourcetype"]->getValue();
-			}
-			return (count($responseType) > 0 and $responseType[0] == "{DAV:}collection") ? 'dir' : 'file';
-		} catch (\Exception $e) {
-			$this->convertException($e, $path);
-		}
-		return false;
-	}
-
-	/** {@inheritdoc} */
-	public function file_exists($path) {
-		try {
-			$path = $this->cleanPath($path);
-			$cachedState = $this->statCache->get($path);
-			if ($cachedState === false) {
-				// we know the file doesn't exist
-				return false;
-			} else if (!is_null($cachedState)) {
-				return true;
-			}
-			// need to get from server
-			return ($this->propfind($path) !== false);
-		} catch (\Exception $e) {
-			$this->convertException($e, $path);
-		}
-		return false;
-	}
-
-	/** {@inheritdoc} */
-	public function unlink($path) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		$result = $this->simpleResponse('DELETE', $path, null, 204);
-		$this->statCache->clear($path . '/');
-		$this->statCache->remove($path);
-		return $result;
-	}
-
-	/** {@inheritdoc} */
-	public function fopen($path, $mode) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		switch ($mode) {
-			case 'r':
-			case 'rb':
-				try {
-					$response = $this->httpClientService
-						->newClient()
-						->get($this->createBaseUri() . $this->encodePath($path), [
-							'auth' => [$this->user, $this->password],
-							'stream' => true
-						]);
-				} catch (\GuzzleHttp\Exception\ClientException $e) {
-					if ($e->getResponse() instanceof ResponseInterface
-						&& $e->getResponse()->getStatusCode() === 404) {
-						return false;
-					} else {
-						throw $e;
-					}
-				}
-
-				if ($response->getStatusCode() !== Http::STATUS_OK) {
-					if ($response->getStatusCode() === Http::STATUS_LOCKED) {
-						throw new \OCP\Lock\LockedException($path);
-					} else {
-						Util::writeLog("webdav client", 'Guzzle get returned status code ' . $response->getStatusCode(), Util::ERROR);
-					}
-				}
-
-				return $response->getBody();
-			case 'w':
-			case 'wb':
-			case 'a':
-			case 'ab':
-			case 'r+':
-			case 'w+':
-			case 'wb+':
-			case 'a+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				//emulate these
-				$tempManager = \OC::$server->getTempManager();
-				if (strrpos($path, '.') !== false) {
-					$ext = substr($path, strrpos($path, '.'));
-				} else {
-					$ext = '';
-				}
-				if ($this->file_exists($path)) {
-					if (!$this->isUpdatable($path)) {
-						return false;
-					}
-					if ($mode === 'w' or $mode === 'w+') {
-						$tmpFile = $tempManager->getTemporaryFile($ext);
-					} else {
-						$tmpFile = $this->getCachedFile($path);
-					}
-				} else {
-					if (!$this->isCreatable(dirname($path))) {
-						return false;
-					}
-					$tmpFile = $tempManager->getTemporaryFile($ext);
-				}
-				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
-					$this->writeBack($tmpFile, $path);
-				});
-		}
-	}
-
-	/**
-	 * @param string $tmpFile
-	 */
-	public function writeBack($tmpFile, $path) {
-		$this->uploadFile($tmpFile, $path);
-		unlink($tmpFile);
-	}
-
-	/** {@inheritdoc} */
-	public function free_space($path) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		try {
-			// TODO: cacheable ?
-			$response = $this->client->propfind($this->encodePath($path), ['{DAV:}quota-available-bytes']);
-			if ($response === false) {
-				return FileInfo::SPACE_UNKNOWN;
-			}
-			if (isset($response['{DAV:}quota-available-bytes'])) {
-				return (int)$response['{DAV:}quota-available-bytes'];
-			} else {
-				return FileInfo::SPACE_UNKNOWN;
-			}
-		} catch (\Exception $e) {
-			return FileInfo::SPACE_UNKNOWN;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function touch($path, $mtime = null) {
-		$this->init();
-		if (is_null($mtime)) {
-			$mtime = time();
-		}
-		$path = $this->cleanPath($path);
-
-		// if file exists, update the mtime, else create a new empty file
-		if ($this->file_exists($path)) {
-			try {
-				$this->statCache->remove($path);
-				$this->client->proppatch($this->encodePath($path), ['{DAV:}lastmodified' => $mtime]);
-				// non-owncloud clients might not have accepted the property, need to recheck it
-				$response = $this->client->propfind($this->encodePath($path), ['{DAV:}getlastmodified'], 0);
-				if ($response === false) {
-					return false;
-				}
-				if (isset($response['{DAV:}getlastmodified'])) {
-					$remoteMtime = strtotime($response['{DAV:}getlastmodified']);
-					if ($remoteMtime !== $mtime) {
-						// server has not accepted the mtime
-						return false;
-					}
-				}
-			} catch (ClientHttpException $e) {
-				if ($e->getHttpStatus() === 501) {
-					return false;
-				}
-				$this->convertException($e, $path);
-				return false;
-			} catch (\Exception $e) {
-				$this->convertException($e, $path);
-				return false;
-			}
-		} else {
-			$this->file_put_contents($path, '');
-		}
-		return true;
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $data
-	 * @return int
-	 */
-	public function file_put_contents($path, $data) {
-		$path = $this->cleanPath($path);
-		$result = parent::file_put_contents($path, $data);
-		$this->statCache->remove($path);
-		return $result;
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $target
-	 */
-	protected function uploadFile($path, $target) {
-		$this->init();
-
-		// invalidate
-		$target = $this->cleanPath($target);
-		$this->statCache->remove($target);
-		$source = fopen($path, 'r');
-
-		$this->httpClientService
-			->newClient()
-			->put($this->createBaseUri() . $this->encodePath($target), [
-				'body' => $source,
-				'auth' => [$this->user, $this->password]
-			]);
-
-		$this->removeCachedFile($target);
-	}
-
-	/** {@inheritdoc} */
-	public function rename($path1, $path2) {
-		$this->init();
-		$path1 = $this->cleanPath($path1);
-		$path2 = $this->cleanPath($path2);
-		try {
-			// overwrite directory ?
-			if ($this->is_dir($path2)) {
-				// needs trailing slash in destination
-				$path2 = rtrim($path2, '/') . '/';
-			}
-			$this->client->request(
-				'MOVE',
-				$this->encodePath($path1),
-				null,
-				[
-					'Destination' => $this->createBaseUri() . $this->encodePath($path2),
-				]
-			);
-			$this->statCache->clear($path1 . '/');
-			$this->statCache->clear($path2 . '/');
-			$this->statCache->set($path1, false);
-			$this->statCache->set($path2, true);
-			$this->removeCachedFile($path1);
-			$this->removeCachedFile($path2);
-			return true;
-		} catch (\Exception $e) {
-			$this->convertException($e);
-		}
-		return false;
-	}
-
-	/** {@inheritdoc} */
-	public function copy($path1, $path2) {
-		$this->init();
-		$path1 = $this->cleanPath($path1);
-		$path2 = $this->cleanPath($path2);
-		try {
-			// overwrite directory ?
-			if ($this->is_dir($path2)) {
-				// needs trailing slash in destination
-				$path2 = rtrim($path2, '/') . '/';
-			}
-			$this->client->request(
-				'COPY',
-				$this->encodePath($path1),
-				null,
-				[
-					'Destination' => $this->createBaseUri() . $this->encodePath($path2),
-				]
-			);
-			$this->statCache->clear($path2 . '/');
-			$this->statCache->set($path2, true);
-			$this->removeCachedFile($path2);
-			return true;
-		} catch (\Exception $e) {
-			$this->convertException($e);
-		}
-		return false;
-	}
-
-	/** {@inheritdoc} */
-	public function stat($path) {
-		try {
-			$response = $this->propfind($path);
-			if (!$response) {
-				return false;
-			}
-			return [
-				'mtime' => strtotime($response['{DAV:}getlastmodified']),
-				'size' => (int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
-			];
-		} catch (\Exception $e) {
-			$this->convertException($e, $path);
-		}
-		return array();
-	}
-
-	/** {@inheritdoc} */
-	public function getMimeType($path) {
-		$remoteMimetype = $this->getMimeTypeFromRemote($path);
-		if ($remoteMimetype === 'application/octet-stream') {
-			return \OC::$server->getMimeTypeDetector()->detectPath($path);
-		} else {
-			return $remoteMimetype;
-		}
-	}
-
-	public function getMimeTypeFromRemote($path) {
-		try {
-			$response = $this->propfind($path);
-			if ($response === false) {
-				return false;
-			}
-			$responseType = [];
-			if (isset($response["{DAV:}resourcetype"])) {
-				/** @var ResourceType[] $response */
-				$responseType = $response["{DAV:}resourcetype"]->getValue();
-			}
-			$type = (count($responseType) > 0 and $responseType[0] == "{DAV:}collection") ? 'dir' : 'file';
-			if ($type == 'dir') {
-				return 'httpd/unix-directory';
-			} elseif (isset($response['{DAV:}getcontenttype'])) {
-				return $response['{DAV:}getcontenttype'];
-			} else {
-				return 'application/octet-stream';
-			}
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	public function cleanPath($path) {
-		if ($path === '') {
-			return $path;
-		}
-		$path = Filesystem::normalizePath($path);
-		// remove leading slash
-		return substr($path, 1);
-	}
-
-	/**
-	 * URL encodes the given path but keeps the slashes
-	 *
-	 * @param string $path to encode
-	 * @return string encoded path
-	 */
-	protected function encodePath($path) {
-		// slashes need to stay
-		return str_replace('%2F', '/', rawurlencode($path));
-	}
-
-	/**
-	 * @param string $method
-	 * @param string $path
-	 * @param string|resource|null $body
-	 * @param int $expected
-	 * @return bool
-	 * @throws StorageInvalidException
-	 * @throws StorageNotAvailableException
-	 */
-	protected function simpleResponse($method, $path, $body, $expected) {
-		$path = $this->cleanPath($path);
-		try {
-			$response = $this->client->request($method, $this->encodePath($path), $body);
-			return $response['statusCode'] == $expected;
-		} catch (ClientHttpException $e) {
-			if ($e->getHttpStatus() === 404 && $method === 'DELETE') {
-				$this->statCache->clear($path . '/');
-				$this->statCache->set($path, false);
-				return false;
-			}
-
-			$this->convertException($e, $path);
-		} catch (\Exception $e) {
-			$this->convertException($e, $path);
-		}
-		return false;
-	}
-
-	/**
-	 * check if curl is installed
-	 */
-	public static function checkDependencies() {
-		return true;
-	}
-
-	/** {@inheritdoc} */
-	public function isUpdatable($path) {
-		return (bool)($this->getPermissions($path) & Constants::PERMISSION_UPDATE);
-	}
-
-	/** {@inheritdoc} */
-	public function isCreatable($path) {
-		return (bool)($this->getPermissions($path) & Constants::PERMISSION_CREATE);
-	}
-
-	/** {@inheritdoc} */
-	public function isSharable($path) {
-		return (bool)($this->getPermissions($path) & Constants::PERMISSION_SHARE);
-	}
-
-	/** {@inheritdoc} */
-	public function isDeletable($path) {
-		return (bool)($this->getPermissions($path) & Constants::PERMISSION_DELETE);
-	}
-
-	/** {@inheritdoc} */
-	public function getPermissions($path) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		$response = $this->propfind($path);
-		if ($response === false) {
-			return 0;
-		}
-		if (isset($response['{http://owncloud.org/ns}permissions'])) {
-			return $this->parsePermissions($response['{http://owncloud.org/ns}permissions']);
-		} else if ($this->is_dir($path)) {
-			return Constants::PERMISSION_ALL;
-		} else if ($this->file_exists($path)) {
-			return Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE;
-		} else {
-			return 0;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function getETag($path) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		$response = $this->propfind($path);
-		if ($response === false) {
-			return null;
-		}
-		if (isset($response['{DAV:}getetag'])) {
-			return trim($response['{DAV:}getetag'], '"');
-		}
-		return parent::getEtag($path);
-	}
-
-	/**
-	 * @param string $permissionsString
-	 * @return int
-	 */
-	protected function parsePermissions($permissionsString) {
-		$permissions = Constants::PERMISSION_READ;
-		if (strpos($permissionsString, 'R') !== false) {
-			$permissions |= Constants::PERMISSION_SHARE;
-		}
-		if (strpos($permissionsString, 'D') !== false) {
-			$permissions |= Constants::PERMISSION_DELETE;
-		}
-		if (strpos($permissionsString, 'W') !== false) {
-			$permissions |= Constants::PERMISSION_UPDATE;
-		}
-		if (strpos($permissionsString, 'CK') !== false) {
-			$permissions |= Constants::PERMISSION_CREATE;
-			$permissions |= Constants::PERMISSION_UPDATE;
-		}
-		return $permissions;
-	}
-
-	/**
-	 * check if a file or folder has been updated since $time
-	 *
-	 * @param string $path
-	 * @param int $time
-	 * @throws \OCP\Files\StorageNotAvailableException
-	 * @return bool
-	 */
-	public function hasUpdated($path, $time) {
-		$this->init();
-		$path = $this->cleanPath($path);
-		try {
-			// force refresh for $path
-			$this->statCache->remove($path);
-			$response = $this->propfind($path);
-			if ($response === false) {
-				if ($path === '') {
-					// if root is gone it means the storage is not available
-					throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
-				}
-				return false;
-			}
-			if (isset($response['{DAV:}getetag'])) {
-				$cachedData = $this->getCache()->get($path);
-				$etag = null;
-				if (isset($response['{DAV:}getetag'])) {
-					$etag = trim($response['{DAV:}getetag'], '"');
-				}
-				if (!empty($etag) && $cachedData['etag'] !== $etag) {
-					return true;
-				} else if (isset($response['{http://open-collaboration-services.org/ns}share-permissions'])) {
-					$sharePermissions = (int)$response['{http://open-collaboration-services.org/ns}share-permissions'];
-					return $sharePermissions !== $cachedData['permissions'];
-				} else if (isset($response['{http://owncloud.org/ns}permissions'])) {
-					$permissions = $this->parsePermissions($response['{http://owncloud.org/ns}permissions']);
-					return $permissions !== $cachedData['permissions'];
-				} else {
-					return false;
-				}
-			} else {
-				$remoteMtime = strtotime($response['{DAV:}getlastmodified']);
-				return $remoteMtime > $time;
-			}
-		} catch (ClientHttpException $e) {
-			if ($e->getHttpStatus() === 405) {
-				if ($path === '') {
-					// if root is gone it means the storage is not available
-					throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
-				}
-				return false;
-			}
-			$this->convertException($e, $path);
-			return false;
-		} catch (\Exception $e) {
-			$this->convertException($e, $path);
-			return false;
-		}
-	}
-
-	/**
-	 * Interpret the given exception and decide whether it is due to an
-	 * unavailable storage, invalid storage or other.
-	 * This will either throw StorageInvalidException, StorageNotAvailableException
-	 * or do nothing.
-	 *
-	 * @param Exception $e sabre exception
-	 * @param string $path optional path from the operation
-	 *
-	 * @throws StorageInvalidException if the storage is invalid, for example
-	 * when the authentication expired or is invalid
-	 * @throws StorageNotAvailableException if the storage is not available,
-	 * which might be temporary
-	 */
-	protected function convertException(Exception $e, $path = '') {
-		\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
-		if ($e instanceof ClientHttpException) {
-			if ($e->getHttpStatus() === Http::STATUS_LOCKED) {
-				throw new \OCP\Lock\LockedException($path);
-			}
-			if ($e->getHttpStatus() === Http::STATUS_UNAUTHORIZED) {
-				// either password was changed or was invalid all along
-				throw new StorageInvalidException(get_class($e) . ': ' . $e->getMessage());
-			} else if ($e->getHttpStatus() === Http::STATUS_METHOD_NOT_ALLOWED) {
-				// ignore exception for MethodNotAllowed, false will be returned
-				return;
-			}
-			throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
-		} else if ($e instanceof ClientException) {
-			// connection timeout or refused, server could be temporarily down
-			throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
-		} else if ($e instanceof \InvalidArgumentException) {
-			// parse error because the server returned HTML instead of XML,
-			// possibly temporarily down
-			throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
-		} else if (($e instanceof StorageNotAvailableException) || ($e instanceof StorageInvalidException)) {
-			// rethrow
-			throw $e;
-		}
-
-		// TODO: only log for now, but in the future need to wrap/rethrow exception
-	}
+    /** @var string */
+    protected $password;
+    /** @var string */
+    protected $user;
+    /** @var string */
+    protected $authType;
+    /** @var string */
+    protected $host;
+    /** @var bool */
+    protected $secure;
+    /** @var string */
+    protected $root;
+    /** @var string */
+    protected $certPath;
+    /** @var bool */
+    protected $ready;
+    /** @var Client */
+    protected $client;
+    /** @var ArrayCache */
+    protected $statCache;
+    /** @var \OCP\Http\Client\IClientService */
+    protected $httpClientService;
+
+    /**
+     * @param array $params
+     * @throws \Exception
+     */
+    public function __construct($params) {
+        $this->statCache = new ArrayCache();
+        $this->httpClientService = \OC::$server->getHTTPClientService();
+        if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
+            $host = $params['host'];
+            //remove leading http[s], will be generated in createBaseUri()
+            if (substr($host, 0, 8) == "https://") $host = substr($host, 8);
+            else if (substr($host, 0, 7) == "http://") $host = substr($host, 7);
+            $this->host = $host;
+            $this->user = $params['user'];
+            $this->password = $params['password'];
+            if (isset($params['authType'])) {
+                $this->authType = $params['authType'];
+            }
+            if (isset($params['secure'])) {
+                if (is_string($params['secure'])) {
+                    $this->secure = ($params['secure'] === 'true');
+                } else {
+                    $this->secure = (bool)$params['secure'];
+                }
+            } else {
+                $this->secure = false;
+            }
+            if ($this->secure === true) {
+                // inject mock for testing
+                $certManager = \OC::$server->getCertificateManager();
+                if (is_null($certManager)) { //no user
+                    $certManager = \OC::$server->getCertificateManager(null);
+                }
+                $certPath = $certManager->getAbsoluteBundlePath();
+                if (file_exists($certPath)) {
+                    $this->certPath = $certPath;
+                }
+            }
+            $this->root = $params['root'] ?? '/';
+            $this->root = '/' . ltrim($this->root, '/');
+            $this->root = rtrim($this->root, '/') . '/';
+        } else {
+            throw new \Exception('Invalid webdav storage configuration');
+        }
+    }
+
+    protected function init() {
+        if ($this->ready) {
+            return;
+        }
+        $this->ready = true;
+
+        $settings = [
+            'baseUri' => $this->createBaseUri(),
+            'userName' => $this->user,
+            'password' => $this->password,
+        ];
+        if (isset($this->authType)) {
+            $settings['authType'] = $this->authType;
+        }
+
+        $proxy = \OC::$server->getConfig()->getSystemValue('proxy', '');
+        if ($proxy !== '') {
+            $settings['proxy'] = $proxy;
+        }
+
+        $this->client = new Client($settings);
+        $this->client->setThrowExceptions(true);
+        if ($this->secure === true && $this->certPath) {
+            $this->client->addCurlSetting(CURLOPT_CAINFO, $this->certPath);
+        }
+    }
+
+    /**
+     * Clear the stat cache
+     */
+    public function clearStatCache() {
+        $this->statCache->clear();
+    }
+
+    /** {@inheritdoc} */
+    public function getId() {
+        return 'webdav::' . $this->user . '@' . $this->host . '/' . $this->root;
+    }
+
+    /** {@inheritdoc} */
+    public function createBaseUri() {
+        $baseUri = 'http';
+        if ($this->secure) {
+            $baseUri .= 's';
+        }
+        $baseUri .= '://' . $this->host . $this->root;
+        return $baseUri;
+    }
+
+    /** {@inheritdoc} */
+    public function mkdir($path) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        $result = $this->simpleResponse('MKCOL', $path, null, 201);
+        if ($result) {
+            $this->statCache->set($path, true);
+        }
+        return $result;
+    }
+
+    /** {@inheritdoc} */
+    public function rmdir($path) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        // FIXME: some WebDAV impl return 403 when trying to DELETE
+        // a non-empty folder
+        $result = $this->simpleResponse('DELETE', $path . '/', null, 204);
+        $this->statCache->clear($path . '/');
+        $this->statCache->remove($path);
+        return $result;
+    }
+
+    /** {@inheritdoc} */
+    public function opendir($path) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        try {
+            $response = $this->client->propFind(
+                $this->encodePath($path),
+                ['{DAV:}href'],
+                1
+            );
+            if ($response === false) {
+                return false;
+            }
+            $content = [];
+            $files = array_keys($response);
+            array_shift($files); //the first entry is the current directory
+
+            if (!$this->statCache->hasKey($path)) {
+                $this->statCache->set($path, true);
+            }
+            foreach ($files as $file) {
+                $file = urldecode($file);
+                // do not store the real entry, we might not have all properties
+                if (!$this->statCache->hasKey($path)) {
+                    $this->statCache->set($file, true);
+                }
+                $file = basename($file);
+                $content[] = $file;
+            }
+            return IteratorDirectory::wrap($content);
+        } catch (\Exception $e) {
+            $this->convertException($e, $path);
+        }
+        return false;
+    }
+
+    /**
+     * Propfind call with cache handling.
+     *
+     * First checks if information is cached.
+     * If not, request it from the server then store to cache.
+     *
+     * @param string $path path to propfind
+     *
+     * @return array|boolean propfind response or false if the entry was not found
+     *
+     * @throws ClientHttpException
+     */
+    protected function propfind($path) {
+        $path = $this->cleanPath($path);
+        $cachedResponse = $this->statCache->get($path);
+        // we either don't know it, or we know it exists but need more details
+        if (is_null($cachedResponse) || $cachedResponse === true) {
+            $this->init();
+            try {
+                $response = $this->client->propFind(
+                    $this->encodePath($path),
+                    array(
+                        '{DAV:}getlastmodified',
+                        '{DAV:}getcontentlength',
+                        '{DAV:}getcontenttype',
+                        '{http://owncloud.org/ns}permissions',
+                        '{http://open-collaboration-services.org/ns}share-permissions',
+                        '{DAV:}resourcetype',
+                        '{DAV:}getetag',
+                    )
+                );
+                $this->statCache->set($path, $response);
+            } catch (ClientHttpException $e) {
+                if ($e->getHttpStatus() === 404) {
+                    $this->statCache->clear($path . '/');
+                    $this->statCache->set($path, false);
+                    return false;
+                }
+                $this->convertException($e, $path);
+            } catch (\Exception $e) {
+                $this->convertException($e, $path);
+            }
+        } else {
+            $response = $cachedResponse;
+        }
+        return $response;
+    }
+
+    /** {@inheritdoc} */
+    public function filetype($path) {
+        try {
+            $response = $this->propfind($path);
+            if ($response === false) {
+                return false;
+            }
+            $responseType = [];
+            if (isset($response["{DAV:}resourcetype"])) {
+                /** @var ResourceType[] $response */
+                $responseType = $response["{DAV:}resourcetype"]->getValue();
+            }
+            return (count($responseType) > 0 and $responseType[0] == "{DAV:}collection") ? 'dir' : 'file';
+        } catch (\Exception $e) {
+            $this->convertException($e, $path);
+        }
+        return false;
+    }
+
+    /** {@inheritdoc} */
+    public function file_exists($path) {
+        try {
+            $path = $this->cleanPath($path);
+            $cachedState = $this->statCache->get($path);
+            if ($cachedState === false) {
+                // we know the file doesn't exist
+                return false;
+            } else if (!is_null($cachedState)) {
+                return true;
+            }
+            // need to get from server
+            return ($this->propfind($path) !== false);
+        } catch (\Exception $e) {
+            $this->convertException($e, $path);
+        }
+        return false;
+    }
+
+    /** {@inheritdoc} */
+    public function unlink($path) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        $result = $this->simpleResponse('DELETE', $path, null, 204);
+        $this->statCache->clear($path . '/');
+        $this->statCache->remove($path);
+        return $result;
+    }
+
+    /** {@inheritdoc} */
+    public function fopen($path, $mode) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        switch ($mode) {
+            case 'r':
+            case 'rb':
+                try {
+                    $response = $this->httpClientService
+                        ->newClient()
+                        ->get($this->createBaseUri() . $this->encodePath($path), [
+                            'auth' => [$this->user, $this->password],
+                            'stream' => true
+                        ]);
+                } catch (\GuzzleHttp\Exception\ClientException $e) {
+                    if ($e->getResponse() instanceof ResponseInterface
+                        && $e->getResponse()->getStatusCode() === 404) {
+                        return false;
+                    } else {
+                        throw $e;
+                    }
+                }
+
+                if ($response->getStatusCode() !== Http::STATUS_OK) {
+                    if ($response->getStatusCode() === Http::STATUS_LOCKED) {
+                        throw new \OCP\Lock\LockedException($path);
+                    } else {
+                        Util::writeLog("webdav client", 'Guzzle get returned status code ' . $response->getStatusCode(), Util::ERROR);
+                    }
+                }
+
+                return $response->getBody();
+            case 'w':
+            case 'wb':
+            case 'a':
+            case 'ab':
+            case 'r+':
+            case 'w+':
+            case 'wb+':
+            case 'a+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                //emulate these
+                $tempManager = \OC::$server->getTempManager();
+                if (strrpos($path, '.') !== false) {
+                    $ext = substr($path, strrpos($path, '.'));
+                } else {
+                    $ext = '';
+                }
+                if ($this->file_exists($path)) {
+                    if (!$this->isUpdatable($path)) {
+                        return false;
+                    }
+                    if ($mode === 'w' or $mode === 'w+') {
+                        $tmpFile = $tempManager->getTemporaryFile($ext);
+                    } else {
+                        $tmpFile = $this->getCachedFile($path);
+                    }
+                } else {
+                    if (!$this->isCreatable(dirname($path))) {
+                        return false;
+                    }
+                    $tmpFile = $tempManager->getTemporaryFile($ext);
+                }
+                $handle = fopen($tmpFile, $mode);
+                return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+                    $this->writeBack($tmpFile, $path);
+                });
+        }
+    }
+
+    /**
+     * @param string $tmpFile
+     */
+    public function writeBack($tmpFile, $path) {
+        $this->uploadFile($tmpFile, $path);
+        unlink($tmpFile);
+    }
+
+    /** {@inheritdoc} */
+    public function free_space($path) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        try {
+            // TODO: cacheable ?
+            $response = $this->client->propfind($this->encodePath($path), ['{DAV:}quota-available-bytes']);
+            if ($response === false) {
+                return FileInfo::SPACE_UNKNOWN;
+            }
+            if (isset($response['{DAV:}quota-available-bytes'])) {
+                return (int)$response['{DAV:}quota-available-bytes'];
+            } else {
+                return FileInfo::SPACE_UNKNOWN;
+            }
+        } catch (\Exception $e) {
+            return FileInfo::SPACE_UNKNOWN;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function touch($path, $mtime = null) {
+        $this->init();
+        if (is_null($mtime)) {
+            $mtime = time();
+        }
+        $path = $this->cleanPath($path);
+
+        // if file exists, update the mtime, else create a new empty file
+        if ($this->file_exists($path)) {
+            try {
+                $this->statCache->remove($path);
+                $this->client->proppatch($this->encodePath($path), ['{DAV:}lastmodified' => $mtime]);
+                // non-owncloud clients might not have accepted the property, need to recheck it
+                $response = $this->client->propfind($this->encodePath($path), ['{DAV:}getlastmodified'], 0);
+                if ($response === false) {
+                    return false;
+                }
+                if (isset($response['{DAV:}getlastmodified'])) {
+                    $remoteMtime = strtotime($response['{DAV:}getlastmodified']);
+                    if ($remoteMtime !== $mtime) {
+                        // server has not accepted the mtime
+                        return false;
+                    }
+                }
+            } catch (ClientHttpException $e) {
+                if ($e->getHttpStatus() === 501) {
+                    return false;
+                }
+                $this->convertException($e, $path);
+                return false;
+            } catch (\Exception $e) {
+                $this->convertException($e, $path);
+                return false;
+            }
+        } else {
+            $this->file_put_contents($path, '');
+        }
+        return true;
+    }
+
+    /**
+     * @param string $path
+     * @param string $data
+     * @return int
+     */
+    public function file_put_contents($path, $data) {
+        $path = $this->cleanPath($path);
+        $result = parent::file_put_contents($path, $data);
+        $this->statCache->remove($path);
+        return $result;
+    }
+
+    /**
+     * @param string $path
+     * @param string $target
+     */
+    protected function uploadFile($path, $target) {
+        $this->init();
+
+        // invalidate
+        $target = $this->cleanPath($target);
+        $this->statCache->remove($target);
+        $source = fopen($path, 'r');
+
+        $this->httpClientService
+            ->newClient()
+            ->put($this->createBaseUri() . $this->encodePath($target), [
+                'body' => $source,
+                'auth' => [$this->user, $this->password]
+            ]);
+
+        $this->removeCachedFile($target);
+    }
+
+    /** {@inheritdoc} */
+    public function rename($path1, $path2) {
+        $this->init();
+        $path1 = $this->cleanPath($path1);
+        $path2 = $this->cleanPath($path2);
+        try {
+            // overwrite directory ?
+            if ($this->is_dir($path2)) {
+                // needs trailing slash in destination
+                $path2 = rtrim($path2, '/') . '/';
+            }
+            $this->client->request(
+                'MOVE',
+                $this->encodePath($path1),
+                null,
+                [
+                    'Destination' => $this->createBaseUri() . $this->encodePath($path2),
+                ]
+            );
+            $this->statCache->clear($path1 . '/');
+            $this->statCache->clear($path2 . '/');
+            $this->statCache->set($path1, false);
+            $this->statCache->set($path2, true);
+            $this->removeCachedFile($path1);
+            $this->removeCachedFile($path2);
+            return true;
+        } catch (\Exception $e) {
+            $this->convertException($e);
+        }
+        return false;
+    }
+
+    /** {@inheritdoc} */
+    public function copy($path1, $path2) {
+        $this->init();
+        $path1 = $this->cleanPath($path1);
+        $path2 = $this->cleanPath($path2);
+        try {
+            // overwrite directory ?
+            if ($this->is_dir($path2)) {
+                // needs trailing slash in destination
+                $path2 = rtrim($path2, '/') . '/';
+            }
+            $this->client->request(
+                'COPY',
+                $this->encodePath($path1),
+                null,
+                [
+                    'Destination' => $this->createBaseUri() . $this->encodePath($path2),
+                ]
+            );
+            $this->statCache->clear($path2 . '/');
+            $this->statCache->set($path2, true);
+            $this->removeCachedFile($path2);
+            return true;
+        } catch (\Exception $e) {
+            $this->convertException($e);
+        }
+        return false;
+    }
+
+    /** {@inheritdoc} */
+    public function stat($path) {
+        try {
+            $response = $this->propfind($path);
+            if (!$response) {
+                return false;
+            }
+            return [
+                'mtime' => strtotime($response['{DAV:}getlastmodified']),
+                'size' => (int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
+            ];
+        } catch (\Exception $e) {
+            $this->convertException($e, $path);
+        }
+        return array();
+    }
+
+    /** {@inheritdoc} */
+    public function getMimeType($path) {
+        $remoteMimetype = $this->getMimeTypeFromRemote($path);
+        if ($remoteMimetype === 'application/octet-stream') {
+            return \OC::$server->getMimeTypeDetector()->detectPath($path);
+        } else {
+            return $remoteMimetype;
+        }
+    }
+
+    public function getMimeTypeFromRemote($path) {
+        try {
+            $response = $this->propfind($path);
+            if ($response === false) {
+                return false;
+            }
+            $responseType = [];
+            if (isset($response["{DAV:}resourcetype"])) {
+                /** @var ResourceType[] $response */
+                $responseType = $response["{DAV:}resourcetype"]->getValue();
+            }
+            $type = (count($responseType) > 0 and $responseType[0] == "{DAV:}collection") ? 'dir' : 'file';
+            if ($type == 'dir') {
+                return 'httpd/unix-directory';
+            } elseif (isset($response['{DAV:}getcontenttype'])) {
+                return $response['{DAV:}getcontenttype'];
+            } else {
+                return 'application/octet-stream';
+            }
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    public function cleanPath($path) {
+        if ($path === '') {
+            return $path;
+        }
+        $path = Filesystem::normalizePath($path);
+        // remove leading slash
+        return substr($path, 1);
+    }
+
+    /**
+     * URL encodes the given path but keeps the slashes
+     *
+     * @param string $path to encode
+     * @return string encoded path
+     */
+    protected function encodePath($path) {
+        // slashes need to stay
+        return str_replace('%2F', '/', rawurlencode($path));
+    }
+
+    /**
+     * @param string $method
+     * @param string $path
+     * @param string|resource|null $body
+     * @param int $expected
+     * @return bool
+     * @throws StorageInvalidException
+     * @throws StorageNotAvailableException
+     */
+    protected function simpleResponse($method, $path, $body, $expected) {
+        $path = $this->cleanPath($path);
+        try {
+            $response = $this->client->request($method, $this->encodePath($path), $body);
+            return $response['statusCode'] == $expected;
+        } catch (ClientHttpException $e) {
+            if ($e->getHttpStatus() === 404 && $method === 'DELETE') {
+                $this->statCache->clear($path . '/');
+                $this->statCache->set($path, false);
+                return false;
+            }
+
+            $this->convertException($e, $path);
+        } catch (\Exception $e) {
+            $this->convertException($e, $path);
+        }
+        return false;
+    }
+
+    /**
+     * check if curl is installed
+     */
+    public static function checkDependencies() {
+        return true;
+    }
+
+    /** {@inheritdoc} */
+    public function isUpdatable($path) {
+        return (bool)($this->getPermissions($path) & Constants::PERMISSION_UPDATE);
+    }
+
+    /** {@inheritdoc} */
+    public function isCreatable($path) {
+        return (bool)($this->getPermissions($path) & Constants::PERMISSION_CREATE);
+    }
+
+    /** {@inheritdoc} */
+    public function isSharable($path) {
+        return (bool)($this->getPermissions($path) & Constants::PERMISSION_SHARE);
+    }
+
+    /** {@inheritdoc} */
+    public function isDeletable($path) {
+        return (bool)($this->getPermissions($path) & Constants::PERMISSION_DELETE);
+    }
+
+    /** {@inheritdoc} */
+    public function getPermissions($path) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        $response = $this->propfind($path);
+        if ($response === false) {
+            return 0;
+        }
+        if (isset($response['{http://owncloud.org/ns}permissions'])) {
+            return $this->parsePermissions($response['{http://owncloud.org/ns}permissions']);
+        } else if ($this->is_dir($path)) {
+            return Constants::PERMISSION_ALL;
+        } else if ($this->file_exists($path)) {
+            return Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE;
+        } else {
+            return 0;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function getETag($path) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        $response = $this->propfind($path);
+        if ($response === false) {
+            return null;
+        }
+        if (isset($response['{DAV:}getetag'])) {
+            return trim($response['{DAV:}getetag'], '"');
+        }
+        return parent::getEtag($path);
+    }
+
+    /**
+     * @param string $permissionsString
+     * @return int
+     */
+    protected function parsePermissions($permissionsString) {
+        $permissions = Constants::PERMISSION_READ;
+        if (strpos($permissionsString, 'R') !== false) {
+            $permissions |= Constants::PERMISSION_SHARE;
+        }
+        if (strpos($permissionsString, 'D') !== false) {
+            $permissions |= Constants::PERMISSION_DELETE;
+        }
+        if (strpos($permissionsString, 'W') !== false) {
+            $permissions |= Constants::PERMISSION_UPDATE;
+        }
+        if (strpos($permissionsString, 'CK') !== false) {
+            $permissions |= Constants::PERMISSION_CREATE;
+            $permissions |= Constants::PERMISSION_UPDATE;
+        }
+        return $permissions;
+    }
+
+    /**
+     * check if a file or folder has been updated since $time
+     *
+     * @param string $path
+     * @param int $time
+     * @throws \OCP\Files\StorageNotAvailableException
+     * @return bool
+     */
+    public function hasUpdated($path, $time) {
+        $this->init();
+        $path = $this->cleanPath($path);
+        try {
+            // force refresh for $path
+            $this->statCache->remove($path);
+            $response = $this->propfind($path);
+            if ($response === false) {
+                if ($path === '') {
+                    // if root is gone it means the storage is not available
+                    throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
+                }
+                return false;
+            }
+            if (isset($response['{DAV:}getetag'])) {
+                $cachedData = $this->getCache()->get($path);
+                $etag = null;
+                if (isset($response['{DAV:}getetag'])) {
+                    $etag = trim($response['{DAV:}getetag'], '"');
+                }
+                if (!empty($etag) && $cachedData['etag'] !== $etag) {
+                    return true;
+                } else if (isset($response['{http://open-collaboration-services.org/ns}share-permissions'])) {
+                    $sharePermissions = (int)$response['{http://open-collaboration-services.org/ns}share-permissions'];
+                    return $sharePermissions !== $cachedData['permissions'];
+                } else if (isset($response['{http://owncloud.org/ns}permissions'])) {
+                    $permissions = $this->parsePermissions($response['{http://owncloud.org/ns}permissions']);
+                    return $permissions !== $cachedData['permissions'];
+                } else {
+                    return false;
+                }
+            } else {
+                $remoteMtime = strtotime($response['{DAV:}getlastmodified']);
+                return $remoteMtime > $time;
+            }
+        } catch (ClientHttpException $e) {
+            if ($e->getHttpStatus() === 405) {
+                if ($path === '') {
+                    // if root is gone it means the storage is not available
+                    throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
+                }
+                return false;
+            }
+            $this->convertException($e, $path);
+            return false;
+        } catch (\Exception $e) {
+            $this->convertException($e, $path);
+            return false;
+        }
+    }
+
+    /**
+     * Interpret the given exception and decide whether it is due to an
+     * unavailable storage, invalid storage or other.
+     * This will either throw StorageInvalidException, StorageNotAvailableException
+     * or do nothing.
+     *
+     * @param Exception $e sabre exception
+     * @param string $path optional path from the operation
+     *
+     * @throws StorageInvalidException if the storage is invalid, for example
+     * when the authentication expired or is invalid
+     * @throws StorageNotAvailableException if the storage is not available,
+     * which might be temporary
+     */
+    protected function convertException(Exception $e, $path = '') {
+        \OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
+        if ($e instanceof ClientHttpException) {
+            if ($e->getHttpStatus() === Http::STATUS_LOCKED) {
+                throw new \OCP\Lock\LockedException($path);
+            }
+            if ($e->getHttpStatus() === Http::STATUS_UNAUTHORIZED) {
+                // either password was changed or was invalid all along
+                throw new StorageInvalidException(get_class($e) . ': ' . $e->getMessage());
+            } else if ($e->getHttpStatus() === Http::STATUS_METHOD_NOT_ALLOWED) {
+                // ignore exception for MethodNotAllowed, false will be returned
+                return;
+            }
+            throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
+        } else if ($e instanceof ClientException) {
+            // connection timeout or refused, server could be temporarily down
+            throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
+        } else if ($e instanceof \InvalidArgumentException) {
+            // parse error because the server returned HTML instead of XML,
+            // possibly temporarily down
+            throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
+        } else if (($e instanceof StorageNotAvailableException) || ($e instanceof StorageInvalidException)) {
+            // rethrow
+            throw $e;
+        }
+
+        // TODO: only log for now, but in the future need to wrap/rethrow exception
+    }
 }
 

apps/files_external/lib/Lib/Storage/Swift.php

Doc Comments +4 added lines, -1 removed lines

@@ -83,7 +83,7 @@ 
 
 	/**
 	 * @param string $path
-	 * @return mixed|string
+	 * @return string
 	 */
 	private function normalizePath(string $path) {
 		$path = trim($path, '/');
@@ -570,6 +570,9 @@ 
 		return $this->container;
 	}
 
+	/**
+	 * @param string $path
+	 */
 	public function writeBack($tmpFile, $path) {
 		$fileData = fopen($tmpFile, 'r');
 		$this->objectStore->writeObject($path, $fileData);

Indentation +562 added lines, -562 removed lines

@@ -49,570 +49,570 @@
 use OpenStack\ObjectStore\v1\Models\StorageObject;
 
 class Swift extends \OC\Files\Storage\Common {
-	/** @var SwiftFactory */
-	private $connectionFactory;
-	/**
-	 * @var \OpenStack\ObjectStore\v1\Models\Container
-	 */
-	private $container;
-	/**
-	 * @var string
-	 */
-	private $bucket;
-	/**
-	 * Connection parameters
-	 *
-	 * @var array
-	 */
-	private $params;
-
-	/** @var string */
-	private $id;
-
-	/** @var \OC\Files\ObjectStore\Swift */
-	private $objectStore;
-
-	/**
-	 * Key value cache mapping path to data object. Maps path to
-	 * \OpenCloud\OpenStack\ObjectStorage\Resource\DataObject for existing
-	 * paths and path to false for not existing paths.
-	 *
-	 * @var \OCP\ICache
-	 */
-	private $objectCache;
-
-	/**
-	 * @param string $path
-	 * @return mixed|string
-	 */
-	private function normalizePath(string $path) {
-		$path = trim($path, '/');
-
-		if (!$path) {
-			$path = '.';
-		}
-
-		$path = str_replace('#', '%23', $path);
-
-		return $path;
-	}
-
-	const SUBCONTAINER_FILE = '.subcontainers';
-
-	/**
-	 * translate directory path to container name
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-
-	/**
-	 * Fetches an object from the API.
-	 * If the object is cached already or a
-	 * failed "doesn't exist" response was cached,
-	 * that one will be returned.
-	 *
-	 * @param string $path
-	 * @return StorageObject|bool object
-	 * or false if the object did not exist
-	 * @throws \OCP\Files\StorageAuthException
-	 * @throws \OCP\Files\StorageNotAvailableException
-	 */
-	private function fetchObject(string $path) {
-		if ($this->objectCache->hasKey($path)) {
-			// might be "false" if object did not exist from last check
-			return $this->objectCache->get($path);
-		}
-		try {
-			$object = $this->getContainer()->getObject($path);
-			$object->retrieve();
-			$this->objectCache->set($path, $object);
-			return $object;
-		} catch (BadResponseError $e) {
-			// Expected response is "404 Not Found", so only log if it isn't
-			if ($e->getResponse()->getStatusCode() !== 404) {
-				\OC::$server->getLogger()->logException($e, [
-					'level' => \OCP\Util::ERROR,
-					'app' => 'files_external',
-				]);
-			}
-			$this->objectCache->set($path, false);
-			return false;
-		}
-	}
-
-	/**
-	 * Returns whether the given path exists.
-	 *
-	 * @param string $path
-	 *
-	 * @return bool true if the object exist, false otherwise
-	 * @throws \OCP\Files\StorageAuthException
-	 * @throws \OCP\Files\StorageNotAvailableException
-	 */
-	private function doesObjectExist($path) {
-		return $this->fetchObject($path) !== false;
-	}
-
-	public function __construct($params) {
-		if ((empty($params['key']) and empty($params['password']))
-			or (empty($params['user']) && empty($params['userid'])) or empty($params['bucket'])
-			or empty($params['region'])
-		) {
-			throw new StorageBadConfigException("API Key or password, Username, Bucket and Region have to be configured.");
-		}
-
-		$user = isset($params['user']) ? $params['user'] : $params['userid'];
-		$this->id = 'swift::' . $user . md5($params['bucket']);
-
-		$bucketUrl = new Uri($params['bucket']);
-		if ($bucketUrl->getHost()) {
-			$params['bucket'] = basename($bucketUrl->getPath());
-			$params['endpoint_url'] = (string)$bucketUrl->withPath(dirname($bucketUrl->getPath()));
-		}
-
-		if (empty($params['url'])) {
-			$params['url'] = 'https://identity.api.rackspacecloud.com/v2.0/';
-		}
-
-		if (empty($params['service_name'])) {
-			$params['service_name'] = 'cloudFiles';
-		}
-
-		$params['autocreate'] = true;
-
-		if (isset($params['userid'])) {
-			$params['user'] = [
-				'id' => $params['userid'],
-				'password' => $params['password']
-			];
-		}
-
-		$this->params = $params;
-		// FIXME: private class...
-		$this->objectCache = new \OC\Cache\CappedMemoryCache();
-		$this->connectionFactory = new SwiftFactory(\OC::$server->getMemCacheFactory()->createDistributed('swift/'), $this->params);
-		$this->objectStore = new \OC\Files\ObjectStore\Swift($this->params, $this->connectionFactory);
-		$this->bucket = $params['bucket'];
-	}
-
-	public function mkdir($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->is_dir($path)) {
-			return false;
-		}
-
-		if ($path !== '.') {
-			$path .= '/';
-		}
-
-		try {
-			$this->getContainer()->createObject([
-				'name' => $path,
-				'content' => '',
-				'headers' => ['content-type' => 'httpd/unix-directory']
-			]);
-			// invalidate so that the next access gets the real object
-			// with all properties
-			$this->objectCache->remove($path);
-		} catch (BadResponseError $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'level' => \OCP\Util::ERROR,
-				'app' => 'files_external',
-			]);
-			return false;
-		}
-
-		return true;
-	}
-
-	public function file_exists($path) {
-		$path = $this->normalizePath($path);
-
-		if ($path !== '.' && $this->is_dir($path)) {
-			$path .= '/';
-		}
-
-		return $this->doesObjectExist($path);
-	}
-
-	public function rmdir($path) {
-		$path = $this->normalizePath($path);
-
-		if (!$this->is_dir($path) || !$this->isDeletable($path)) {
-			return false;
-		}
-
-		$dh = $this->opendir($path);
-		while ($file = readdir($dh)) {
-			if (\OC\Files\Filesystem::isIgnoredDir($file)) {
-				continue;
-			}
-
-			if ($this->is_dir($path . '/' . $file)) {
-				$this->rmdir($path . '/' . $file);
-			} else {
-				$this->unlink($path . '/' . $file);
-			}
-		}
-
-		try {
-			$this->objectStore->deleteObject($path . '/');
-			$this->objectCache->remove($path . '/');
-		} catch (BadResponseError $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'level' => \OCP\Util::ERROR,
-				'app' => 'files_external',
-			]);
-			return false;
-		}
-
-		return true;
-	}
-
-	public function opendir($path) {
-		$path = $this->normalizePath($path);
-
-		if ($path === '.') {
-			$path = '';
-		} else {
-			$path .= '/';
-		}
+    /** @var SwiftFactory */
+    private $connectionFactory;
+    /**
+     * @var \OpenStack\ObjectStore\v1\Models\Container
+     */
+    private $container;
+    /**
+     * @var string
+     */
+    private $bucket;
+    /**
+     * Connection parameters
+     *
+     * @var array
+     */
+    private $params;
+
+    /** @var string */
+    private $id;
+
+    /** @var \OC\Files\ObjectStore\Swift */
+    private $objectStore;
+
+    /**
+     * Key value cache mapping path to data object. Maps path to
+     * \OpenCloud\OpenStack\ObjectStorage\Resource\DataObject for existing
+     * paths and path to false for not existing paths.
+     *
+     * @var \OCP\ICache
+     */
+    private $objectCache;
+
+    /**
+     * @param string $path
+     * @return mixed|string
+     */
+    private function normalizePath(string $path) {
+        $path = trim($path, '/');
+
+        if (!$path) {
+            $path = '.';
+        }
+
+        $path = str_replace('#', '%23', $path);
+
+        return $path;
+    }
+
+    const SUBCONTAINER_FILE = '.subcontainers';
+
+    /**
+     * translate directory path to container name
+     *
+     * @param string $path
+     * @return string
+     */
+
+    /**
+     * Fetches an object from the API.
+     * If the object is cached already or a
+     * failed "doesn't exist" response was cached,
+     * that one will be returned.
+     *
+     * @param string $path
+     * @return StorageObject|bool object
+     * or false if the object did not exist
+     * @throws \OCP\Files\StorageAuthException
+     * @throws \OCP\Files\StorageNotAvailableException
+     */
+    private function fetchObject(string $path) {
+        if ($this->objectCache->hasKey($path)) {
+            // might be "false" if object did not exist from last check
+            return $this->objectCache->get($path);
+        }
+        try {
+            $object = $this->getContainer()->getObject($path);
+            $object->retrieve();
+            $this->objectCache->set($path, $object);
+            return $object;
+        } catch (BadResponseError $e) {
+            // Expected response is "404 Not Found", so only log if it isn't
+            if ($e->getResponse()->getStatusCode() !== 404) {
+                \OC::$server->getLogger()->logException($e, [
+                    'level' => \OCP\Util::ERROR,
+                    'app' => 'files_external',
+                ]);
+            }
+            $this->objectCache->set($path, false);
+            return false;
+        }
+    }
+
+    /**
+     * Returns whether the given path exists.
+     *
+     * @param string $path
+     *
+     * @return bool true if the object exist, false otherwise
+     * @throws \OCP\Files\StorageAuthException
+     * @throws \OCP\Files\StorageNotAvailableException
+     */
+    private function doesObjectExist($path) {
+        return $this->fetchObject($path) !== false;
+    }
+
+    public function __construct($params) {
+        if ((empty($params['key']) and empty($params['password']))
+            or (empty($params['user']) && empty($params['userid'])) or empty($params['bucket'])
+            or empty($params['region'])
+        ) {
+            throw new StorageBadConfigException("API Key or password, Username, Bucket and Region have to be configured.");
+        }
+
+        $user = isset($params['user']) ? $params['user'] : $params['userid'];
+        $this->id = 'swift::' . $user . md5($params['bucket']);
+
+        $bucketUrl = new Uri($params['bucket']);
+        if ($bucketUrl->getHost()) {
+            $params['bucket'] = basename($bucketUrl->getPath());
+            $params['endpoint_url'] = (string)$bucketUrl->withPath(dirname($bucketUrl->getPath()));
+        }
+
+        if (empty($params['url'])) {
+            $params['url'] = 'https://identity.api.rackspacecloud.com/v2.0/';
+        }
+
+        if (empty($params['service_name'])) {
+            $params['service_name'] = 'cloudFiles';
+        }
+
+        $params['autocreate'] = true;
+
+        if (isset($params['userid'])) {
+            $params['user'] = [
+                'id' => $params['userid'],
+                'password' => $params['password']
+            ];
+        }
+
+        $this->params = $params;
+        // FIXME: private class...
+        $this->objectCache = new \OC\Cache\CappedMemoryCache();
+        $this->connectionFactory = new SwiftFactory(\OC::$server->getMemCacheFactory()->createDistributed('swift/'), $this->params);
+        $this->objectStore = new \OC\Files\ObjectStore\Swift($this->params, $this->connectionFactory);
+        $this->bucket = $params['bucket'];
+    }
+
+    public function mkdir($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->is_dir($path)) {
+            return false;
+        }
+
+        if ($path !== '.') {
+            $path .= '/';
+        }
+
+        try {
+            $this->getContainer()->createObject([
+                'name' => $path,
+                'content' => '',
+                'headers' => ['content-type' => 'httpd/unix-directory']
+            ]);
+            // invalidate so that the next access gets the real object
+            // with all properties
+            $this->objectCache->remove($path);
+        } catch (BadResponseError $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'level' => \OCP\Util::ERROR,
+                'app' => 'files_external',
+            ]);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function file_exists($path) {
+        $path = $this->normalizePath($path);
+
+        if ($path !== '.' && $this->is_dir($path)) {
+            $path .= '/';
+        }
+
+        return $this->doesObjectExist($path);
+    }
+
+    public function rmdir($path) {
+        $path = $this->normalizePath($path);
+
+        if (!$this->is_dir($path) || !$this->isDeletable($path)) {
+            return false;
+        }
+
+        $dh = $this->opendir($path);
+        while ($file = readdir($dh)) {
+            if (\OC\Files\Filesystem::isIgnoredDir($file)) {
+                continue;
+            }
+
+            if ($this->is_dir($path . '/' . $file)) {
+                $this->rmdir($path . '/' . $file);
+            } else {
+                $this->unlink($path . '/' . $file);
+            }
+        }
+
+        try {
+            $this->objectStore->deleteObject($path . '/');
+            $this->objectCache->remove($path . '/');
+        } catch (BadResponseError $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'level' => \OCP\Util::ERROR,
+                'app' => 'files_external',
+            ]);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function opendir($path) {
+        $path = $this->normalizePath($path);
+
+        if ($path === '.') {
+            $path = '';
+        } else {
+            $path .= '/';
+        }
 
 //		$path = str_replace('%23', '#', $path); // the prefix is sent as a query param, so revert the encoding of #
 
-		try {
-			$files = [];
-			$objects = $this->getContainer()->listObjects([
-				'prefix' => $path,
-				'delimiter' => '/'
-			]);
-
-			/** @var StorageObject $object */
-			foreach ($objects as $object) {
-				$file = basename($object->name);
-				if ($file !== basename($path) && $file !== '.') {
-					$files[] = $file;
-				}
-			}
-
-			return IteratorDirectory::wrap($files);
-		} catch (\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'level' => \OCP\Util::ERROR,
-				'app' => 'files_external',
-			]);
-			return false;
-		}
-
-	}
-
-	public function stat($path) {
-		$path = $this->normalizePath($path);
-
-		if ($path === '.') {
-			$path = '';
-		} else if ($this->is_dir($path)) {
-			$path .= '/';
-		}
-
-		try {
-			$object = $this->fetchObject($path);
-			if (!$object) {
-				return false;
-			}
-		} catch (BadResponseError $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'level' => \OCP\Util::ERROR,
-				'app' => 'files_external',
-			]);
-			return false;
-		}
-
-		$dateTime = $object->lastModified ? \DateTime::createFromFormat(\DateTime::RFC1123, $object->lastModified) : false;
-		$mtime = $dateTime ? $dateTime->getTimestamp() : null;
-		$objectMetadata = $object->getMetadata();
-		if (isset($objectMetadata['timestamp'])) {
-			$mtime = $objectMetadata['timestamp'];
-		}
-
-		if (!empty($mtime)) {
-			$mtime = floor($mtime);
-		}
-
-		$stat = array();
-		$stat['size'] = (int)$object->contentLength;
-		$stat['mtime'] = $mtime;
-		$stat['atime'] = time();
-		return $stat;
-	}
-
-	public function filetype($path) {
-		$path = $this->normalizePath($path);
-
-		if ($path !== '.' && $this->doesObjectExist($path)) {
-			return 'file';
-		}
-
-		if ($path !== '.') {
-			$path .= '/';
-		}
-
-		if ($this->doesObjectExist($path)) {
-			return 'dir';
-		}
-	}
-
-	public function unlink($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->is_dir($path)) {
-			return $this->rmdir($path);
-		}
-
-		try {
-			$this->objectStore->deleteObject($path);
-			$this->objectCache->remove($path);
-			$this->objectCache->remove($path . '/');
-		} catch (BadResponseError $e) {
-			if ($e->getResponse()->getStatusCode() !== 404) {
-				\OC::$server->getLogger()->logException($e, [
-					'level' => \OCP\Util::ERROR,
-					'app' => 'files_external',
-				]);
-				throw $e;
-			}
-		}
-
-		return true;
-	}
-
-	public function fopen($path, $mode) {
-		$path = $this->normalizePath($path);
-
-		switch ($mode) {
-			case 'a':
-			case 'ab':
-			case 'a+':
-				return false;
-			case 'r':
-			case 'rb':
-				try {
-					return $this->objectStore->readObject($path);
-				} catch (BadResponseError $e) {
-					\OC::$server->getLogger()->logException($e, [
-						'level' => \OCP\Util::ERROR,
-						'app' => 'files_external',
-					]);
-					return false;
-				}
-			case 'w':
-			case 'wb':
-			case 'r+':
-			case 'w+':
-			case 'wb+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				if (strrpos($path, '.') !== false) {
-					$ext = substr($path, strrpos($path, '.'));
-				} else {
-					$ext = '';
-				}
-				$tmpFile = \OCP\Files::tmpFile($ext);
-				// Fetch existing file if required
-				if ($mode[0] !== 'w' && $this->file_exists($path)) {
-					if ($mode[0] === 'x') {
-						// File cannot already exist
-						return false;
-					}
-					$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);
-				});
-		}
-	}
-
-	public function touch($path, $mtime = null) {
-		$path = $this->normalizePath($path);
-		if (is_null($mtime)) {
-			$mtime = time();
-		}
-		$metadata = ['timestamp' => $mtime];
-		if ($this->file_exists($path)) {
-			if ($this->is_dir($path) && $path !== '.') {
-				$path .= '/';
-			}
-
-			$object = $this->fetchObject($path);
-			if ($object->mergeMetadata($metadata)) {
-				// invalidate target object to force repopulation on fetch
-				$this->objectCache->remove($path);
-			}
-			return true;
-		} else {
-			$mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
-			$this->getContainer()->createObject([
-				'name' => $path,
-				'content' => '',
-				'headers' => ['content-type' => 'httpd/unix-directory']
-			]);
-			// invalidate target object to force repopulation on fetch
-			$this->objectCache->remove($path);
-			return true;
-		}
-	}
-
-	public function copy($path1, $path2) {
-		$path1 = $this->normalizePath($path1);
-		$path2 = $this->normalizePath($path2);
-
-		$fileType = $this->filetype($path1);
-		if ($fileType) {
-			// make way
-			$this->unlink($path2);
-		}
-
-		if ($fileType === 'file') {
-			try {
-				$source = $this->fetchObject($path1);
-				$source->copy([
-					'destination' => $this->bucket . '/' . $path2
-				]);
-				// invalidate target object to force repopulation on fetch
-				$this->objectCache->remove($path2);
-				$this->objectCache->remove($path2 . '/');
-			} catch (BadResponseError $e) {
-				\OC::$server->getLogger()->logException($e, [
-					'level' => \OCP\Util::ERROR,
-					'app' => 'files_external',
-				]);
-				return false;
-			}
-
-		} else if ($fileType === 'dir') {
-			try {
-				$source = $this->fetchObject($path1 . '/');
-				$source->copy([
-					'destination' => $this->bucket . '/' . $path2 . '/'
-				]);
-				// invalidate target object to force repopulation on fetch
-				$this->objectCache->remove($path2);
-				$this->objectCache->remove($path2 . '/');
-			} catch (BadResponseError $e) {
-				\OC::$server->getLogger()->logException($e, [
-					'level' => \OCP\Util::ERROR,
-					'app' => 'files_external',
-				]);
-				return false;
-			}
-
-			$dh = $this->opendir($path1);
-			while ($file = readdir($dh)) {
-				if (\OC\Files\Filesystem::isIgnoredDir($file)) {
-					continue;
-				}
-
-				$source = $path1 . '/' . $file;
-				$target = $path2 . '/' . $file;
-				$this->copy($source, $target);
-			}
-
-		} else {
-			//file does not exist
-			return false;
-		}
-
-		return true;
-	}
-
-	public function rename($path1, $path2) {
-		$path1 = $this->normalizePath($path1);
-		$path2 = $this->normalizePath($path2);
-
-		$fileType = $this->filetype($path1);
-
-		if ($fileType === 'dir' || $fileType === 'file') {
-			// copy
-			if ($this->copy($path1, $path2) === false) {
-				return false;
-			}
-
-			// cleanup
-			if ($this->unlink($path1) === false) {
-				throw new \Exception('failed to remove original');
-				$this->unlink($path2);
-				return false;
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	public function getId() {
-		return $this->id;
-	}
-
-	/**
-	 * Returns the initialized object store container.
-	 *
-	 * @return \OpenStack\ObjectStore\v1\Models\Container
-	 * @throws \OCP\Files\StorageAuthException
-	 * @throws \OCP\Files\StorageNotAvailableException
-	 */
-	public function getContainer() {
-		if (is_null($this->container)) {
-			$this->container = $this->connectionFactory->getContainer();
-
-			if (!$this->file_exists('.')) {
-				$this->mkdir('.');
-			}
-		}
-		return $this->container;
-	}
-
-	public function writeBack($tmpFile, $path) {
-		$fileData = fopen($tmpFile, 'r');
-		$this->objectStore->writeObject($path, $fileData);
-		// invalidate target object to force repopulation on fetch
-		$this->objectCache->remove($path);
-		unlink($tmpFile);
-	}
-
-	public function hasUpdated($path, $time) {
-		if ($this->is_file($path)) {
-			return parent::hasUpdated($path, $time);
-		}
-		$path = $this->normalizePath($path);
-		$dh = $this->opendir($path);
-		$content = array();
-		while (($file = readdir($dh)) !== false) {
-			$content[] = $file;
-		}
-		if ($path === '.') {
-			$path = '';
-		}
-		$cachedContent = $this->getCache()->getFolderContents($path);
-		$cachedNames = array_map(function ($content) {
-			return $content['name'];
-		}, $cachedContent);
-		sort($cachedNames);
-		sort($content);
-		return $cachedNames !== $content;
-	}
-
-	/**
-	 * check if curl is installed
-	 */
-	public static function checkDependencies() {
-		return true;
-	}
+        try {
+            $files = [];
+            $objects = $this->getContainer()->listObjects([
+                'prefix' => $path,
+                'delimiter' => '/'
+            ]);
+
+            /** @var StorageObject $object */
+            foreach ($objects as $object) {
+                $file = basename($object->name);
+                if ($file !== basename($path) && $file !== '.') {
+                    $files[] = $file;
+                }
+            }
+
+            return IteratorDirectory::wrap($files);
+        } catch (\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'level' => \OCP\Util::ERROR,
+                'app' => 'files_external',
+            ]);
+            return false;
+        }
+
+    }
+
+    public function stat($path) {
+        $path = $this->normalizePath($path);
+
+        if ($path === '.') {
+            $path = '';
+        } else if ($this->is_dir($path)) {
+            $path .= '/';
+        }
+
+        try {
+            $object = $this->fetchObject($path);
+            if (!$object) {
+                return false;
+            }
+        } catch (BadResponseError $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'level' => \OCP\Util::ERROR,
+                'app' => 'files_external',
+            ]);
+            return false;
+        }
+
+        $dateTime = $object->lastModified ? \DateTime::createFromFormat(\DateTime::RFC1123, $object->lastModified) : false;
+        $mtime = $dateTime ? $dateTime->getTimestamp() : null;
+        $objectMetadata = $object->getMetadata();
+        if (isset($objectMetadata['timestamp'])) {
+            $mtime = $objectMetadata['timestamp'];
+        }
+
+        if (!empty($mtime)) {
+            $mtime = floor($mtime);
+        }
+
+        $stat = array();
+        $stat['size'] = (int)$object->contentLength;
+        $stat['mtime'] = $mtime;
+        $stat['atime'] = time();
+        return $stat;
+    }
+
+    public function filetype($path) {
+        $path = $this->normalizePath($path);
+
+        if ($path !== '.' && $this->doesObjectExist($path)) {
+            return 'file';
+        }
+
+        if ($path !== '.') {
+            $path .= '/';
+        }
+
+        if ($this->doesObjectExist($path)) {
+            return 'dir';
+        }
+    }
+
+    public function unlink($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->is_dir($path)) {
+            return $this->rmdir($path);
+        }
+
+        try {
+            $this->objectStore->deleteObject($path);
+            $this->objectCache->remove($path);
+            $this->objectCache->remove($path . '/');
+        } catch (BadResponseError $e) {
+            if ($e->getResponse()->getStatusCode() !== 404) {
+                \OC::$server->getLogger()->logException($e, [
+                    'level' => \OCP\Util::ERROR,
+                    'app' => 'files_external',
+                ]);
+                throw $e;
+            }
+        }
+
+        return true;
+    }
+
+    public function fopen($path, $mode) {
+        $path = $this->normalizePath($path);
+
+        switch ($mode) {
+            case 'a':
+            case 'ab':
+            case 'a+':
+                return false;
+            case 'r':
+            case 'rb':
+                try {
+                    return $this->objectStore->readObject($path);
+                } catch (BadResponseError $e) {
+                    \OC::$server->getLogger()->logException($e, [
+                        'level' => \OCP\Util::ERROR,
+                        'app' => 'files_external',
+                    ]);
+                    return false;
+                }
+            case 'w':
+            case 'wb':
+            case 'r+':
+            case 'w+':
+            case 'wb+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                if (strrpos($path, '.') !== false) {
+                    $ext = substr($path, strrpos($path, '.'));
+                } else {
+                    $ext = '';
+                }
+                $tmpFile = \OCP\Files::tmpFile($ext);
+                // Fetch existing file if required
+                if ($mode[0] !== 'w' && $this->file_exists($path)) {
+                    if ($mode[0] === 'x') {
+                        // File cannot already exist
+                        return false;
+                    }
+                    $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);
+                });
+        }
+    }
+
+    public function touch($path, $mtime = null) {
+        $path = $this->normalizePath($path);
+        if (is_null($mtime)) {
+            $mtime = time();
+        }
+        $metadata = ['timestamp' => $mtime];
+        if ($this->file_exists($path)) {
+            if ($this->is_dir($path) && $path !== '.') {
+                $path .= '/';
+            }
+
+            $object = $this->fetchObject($path);
+            if ($object->mergeMetadata($metadata)) {
+                // invalidate target object to force repopulation on fetch
+                $this->objectCache->remove($path);
+            }
+            return true;
+        } else {
+            $mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
+            $this->getContainer()->createObject([
+                'name' => $path,
+                'content' => '',
+                'headers' => ['content-type' => 'httpd/unix-directory']
+            ]);
+            // invalidate target object to force repopulation on fetch
+            $this->objectCache->remove($path);
+            return true;
+        }
+    }
+
+    public function copy($path1, $path2) {
+        $path1 = $this->normalizePath($path1);
+        $path2 = $this->normalizePath($path2);
+
+        $fileType = $this->filetype($path1);
+        if ($fileType) {
+            // make way
+            $this->unlink($path2);
+        }
+
+        if ($fileType === 'file') {
+            try {
+                $source = $this->fetchObject($path1);
+                $source->copy([
+                    'destination' => $this->bucket . '/' . $path2
+                ]);
+                // invalidate target object to force repopulation on fetch
+                $this->objectCache->remove($path2);
+                $this->objectCache->remove($path2 . '/');
+            } catch (BadResponseError $e) {
+                \OC::$server->getLogger()->logException($e, [
+                    'level' => \OCP\Util::ERROR,
+                    'app' => 'files_external',
+                ]);
+                return false;
+            }
+
+        } else if ($fileType === 'dir') {
+            try {
+                $source = $this->fetchObject($path1 . '/');
+                $source->copy([
+                    'destination' => $this->bucket . '/' . $path2 . '/'
+                ]);
+                // invalidate target object to force repopulation on fetch
+                $this->objectCache->remove($path2);
+                $this->objectCache->remove($path2 . '/');
+            } catch (BadResponseError $e) {
+                \OC::$server->getLogger()->logException($e, [
+                    'level' => \OCP\Util::ERROR,
+                    'app' => 'files_external',
+                ]);
+                return false;
+            }
+
+            $dh = $this->opendir($path1);
+            while ($file = readdir($dh)) {
+                if (\OC\Files\Filesystem::isIgnoredDir($file)) {
+                    continue;
+                }
+
+                $source = $path1 . '/' . $file;
+                $target = $path2 . '/' . $file;
+                $this->copy($source, $target);
+            }
+
+        } else {
+            //file does not exist
+            return false;
+        }
+
+        return true;
+    }
+
+    public function rename($path1, $path2) {
+        $path1 = $this->normalizePath($path1);
+        $path2 = $this->normalizePath($path2);
+
+        $fileType = $this->filetype($path1);
+
+        if ($fileType === 'dir' || $fileType === 'file') {
+            // copy
+            if ($this->copy($path1, $path2) === false) {
+                return false;
+            }
+
+            // cleanup
+            if ($this->unlink($path1) === false) {
+                throw new \Exception('failed to remove original');
+                $this->unlink($path2);
+                return false;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public function getId() {
+        return $this->id;
+    }
+
+    /**
+     * Returns the initialized object store container.
+     *
+     * @return \OpenStack\ObjectStore\v1\Models\Container
+     * @throws \OCP\Files\StorageAuthException
+     * @throws \OCP\Files\StorageNotAvailableException
+     */
+    public function getContainer() {
+        if (is_null($this->container)) {
+            $this->container = $this->connectionFactory->getContainer();
+
+            if (!$this->file_exists('.')) {
+                $this->mkdir('.');
+            }
+        }
+        return $this->container;
+    }
+
+    public function writeBack($tmpFile, $path) {
+        $fileData = fopen($tmpFile, 'r');
+        $this->objectStore->writeObject($path, $fileData);
+        // invalidate target object to force repopulation on fetch
+        $this->objectCache->remove($path);
+        unlink($tmpFile);
+    }
+
+    public function hasUpdated($path, $time) {
+        if ($this->is_file($path)) {
+            return parent::hasUpdated($path, $time);
+        }
+        $path = $this->normalizePath($path);
+        $dh = $this->opendir($path);
+        $content = array();
+        while (($file = readdir($dh)) !== false) {
+            $content[] = $file;
+        }
+        if ($path === '.') {
+            $path = '';
+        }
+        $cachedContent = $this->getCache()->getFolderContents($path);
+        $cachedNames = array_map(function ($content) {
+            return $content['name'];
+        }, $cachedContent);
+        sort($cachedNames);
+        sort($content);
+        return $cachedNames !== $content;
+    }
+
+    /**
+     * check if curl is installed
+     */
+    public static function checkDependencies() {
+        return true;
+    }
 
 }

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
@@ -163,12 +163,12 @@ 
 		}
 
 		$user = isset($params['user']) ? $params['user'] : $params['userid'];
-		$this->id = 'swift::' . $user . md5($params['bucket']);
+		$this->id = 'swift::'.$user.md5($params['bucket']);
 
 		$bucketUrl = new Uri($params['bucket']);
 		if ($bucketUrl->getHost()) {
 			$params['bucket'] = basename($bucketUrl->getPath());
-			$params['endpoint_url'] = (string)$bucketUrl->withPath(dirname($bucketUrl->getPath()));
+			$params['endpoint_url'] = (string) $bucketUrl->withPath(dirname($bucketUrl->getPath()));
 		}
 
 		if (empty($params['url'])) {
@@ -250,16 +250,16 @@ 
 				continue;
 			}
 
-			if ($this->is_dir($path . '/' . $file)) {
-				$this->rmdir($path . '/' . $file);
+			if ($this->is_dir($path.'/'.$file)) {
+				$this->rmdir($path.'/'.$file);
 			} else {
-				$this->unlink($path . '/' . $file);
+				$this->unlink($path.'/'.$file);
 			}
 		}
 
 		try {
-			$this->objectStore->deleteObject($path . '/');
-			$this->objectCache->remove($path . '/');
+			$this->objectStore->deleteObject($path.'/');
+			$this->objectCache->remove($path.'/');
 		} catch (BadResponseError $e) {
 			\OC::$server->getLogger()->logException($e, [
 				'level' => \OCP\Util::ERROR,
@@ -342,7 +342,7 @@ 
 		}
 
 		$stat = array();
-		$stat['size'] = (int)$object->contentLength;
+		$stat['size'] = (int) $object->contentLength;
 		$stat['mtime'] = $mtime;
 		$stat['atime'] = time();
 		return $stat;
@@ -374,7 +374,7 @@ 
 		try {
 			$this->objectStore->deleteObject($path);
 			$this->objectCache->remove($path);
-			$this->objectCache->remove($path . '/');
+			$this->objectCache->remove($path.'/');
 		} catch (BadResponseError $e) {
 			if ($e->getResponse()->getStatusCode() !== 404) {
 				\OC::$server->getLogger()->logException($e, [
@@ -432,7 +432,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);
 				});
 		}
@@ -482,11 +482,11 @@ 
 			try {
 				$source = $this->fetchObject($path1);
 				$source->copy([
-					'destination' => $this->bucket . '/' . $path2
+					'destination' => $this->bucket.'/'.$path2
 				]);
 				// invalidate target object to force repopulation on fetch
 				$this->objectCache->remove($path2);
-				$this->objectCache->remove($path2 . '/');
+				$this->objectCache->remove($path2.'/');
 			} catch (BadResponseError $e) {
 				\OC::$server->getLogger()->logException($e, [
 					'level' => \OCP\Util::ERROR,
@@ -497,13 +497,13 @@ 
 
 		} else if ($fileType === 'dir') {
 			try {
-				$source = $this->fetchObject($path1 . '/');
+				$source = $this->fetchObject($path1.'/');
 				$source->copy([
-					'destination' => $this->bucket . '/' . $path2 . '/'
+					'destination' => $this->bucket.'/'.$path2.'/'
 				]);
 				// invalidate target object to force repopulation on fetch
 				$this->objectCache->remove($path2);
-				$this->objectCache->remove($path2 . '/');
+				$this->objectCache->remove($path2.'/');
 			} catch (BadResponseError $e) {
 				\OC::$server->getLogger()->logException($e, [
 					'level' => \OCP\Util::ERROR,
@@ -518,8 +518,8 @@ 
 					continue;
 				}
 
-				$source = $path1 . '/' . $file;
-				$target = $path2 . '/' . $file;
+				$source = $path1.'/'.$file;
+				$target = $path2.'/'.$file;
 				$this->copy($source, $target);
 			}
 
@@ -600,7 +600,7 @@ 
 			$path = '';
 		}
 		$cachedContent = $this->getCache()->getFolderContents($path);
-		$cachedNames = array_map(function ($content) {
+		$cachedNames = array_map(function($content) {
 			return $content['name'];
 		}, $cachedContent);
 		sort($cachedNames);

lib/private/Files/ObjectStore/Swift.php

Indentation +82 added lines, -82 removed lines

@@ -31,87 +31,87 @@
 use OCP\Files\StorageAuthException;
 
 class Swift implements IObjectStore {
-	/**
-	 * @var array
-	 */
-	private $params;
-
-	/**
-	 * @var \OpenStack\ObjectStore\v1\Models\Container|null
-	 */
-	private $container = null;
-
-	/** @var SwiftFactory */
-	private $swiftFactory;
-
-	public function __construct($params, SwiftFactory $connectionFactory = null) {
-		$this->swiftFactory = $connectionFactory ?: new SwiftFactory(\OC::$server->getMemCacheFactory()->createDistributed('swift::'), $params);
-		$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() {
-		return $this->params['container'];
-	}
-
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @param resource $stream stream with the data to write
-	 * @throws \Exception from openstack lib when something goes wrong
-	 */
-	public function writeObject($urn, $stream) {
-		$this->getContainer()->createObject([
-			'name' => $urn,
-			'stream' => stream_for($stream)
-		]);
-	}
-
-	/**
-	 * @param string $urn the unified resource name used to identify the object
-	 * @return resource stream with the read data
-	 * @throws \Exception from openstack lib when something goes wrong
-	 */
-	public function readObject($urn) {
-		$object = $this->getContainer()->getObject($urn);
-
-		// we need to keep a reference to objectContent or
-		// the stream will be closed before we can do anything with it
-		$objectContent = $object->download();
-		$objectContent->rewind();
-
-		$stream = $objectContent->detach();
-		// save the object content in the context of the stream to prevent it being gc'd until the stream is closed
-		stream_context_set_option($stream, 'swift', 'content', $objectContent);
-
-		return RetryWrapper::wrap($stream);
-	}
-
-	/**
-	 * @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();
-	}
+    /**
+     * @var array
+     */
+    private $params;
+
+    /**
+     * @var \OpenStack\ObjectStore\v1\Models\Container|null
+     */
+    private $container = null;
+
+    /** @var SwiftFactory */
+    private $swiftFactory;
+
+    public function __construct($params, SwiftFactory $connectionFactory = null) {
+        $this->swiftFactory = $connectionFactory ?: new SwiftFactory(\OC::$server->getMemCacheFactory()->createDistributed('swift::'), $params);
+        $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() {
+        return $this->params['container'];
+    }
+
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @param resource $stream stream with the data to write
+     * @throws \Exception from openstack lib when something goes wrong
+     */
+    public function writeObject($urn, $stream) {
+        $this->getContainer()->createObject([
+            'name' => $urn,
+            'stream' => stream_for($stream)
+        ]);
+    }
+
+    /**
+     * @param string $urn the unified resource name used to identify the object
+     * @return resource stream with the read data
+     * @throws \Exception from openstack lib when something goes wrong
+     */
+    public function readObject($urn) {
+        $object = $this->getContainer()->getObject($urn);
+
+        // we need to keep a reference to objectContent or
+        // the stream will be closed before we can do anything with it
+        $objectContent = $object->download();
+        $objectContent->rewind();
+
+        $stream = $objectContent->detach();
+        // save the object content in the context of the stream to prevent it being gc'd until the stream is closed
+        stream_context_set_option($stream, 'swift', 'content', $objectContent);
+
+        return RetryWrapper::wrap($stream);
+    }
+
+    /**
+     * @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();
+    }
 
 }

lib/private/Files/ObjectStore/SwiftFactory.php

Indentation +151 added lines, -151 removed lines

@@ -40,155 +40,155 @@
 use OpenStack\ObjectStore\v1\Models\Container;
 
 class SwiftFactory {
-	private $cache;
-	private $params;
-	/** @var Container|null */
-	private $container = null;
-
-	public function __construct(ICache $cache, array $params) {
-		$this->cache = $cache;
-		$this->params = $params;
-	}
-
-	private function getCachedToken(string $cacheKey) {
-		$cachedTokenString = $this->cache->get($cacheKey . '/token');
-		if ($cachedTokenString) {
-			return json_decode($cachedTokenString);
-		} else {
-			return null;
-		}
-	}
-
-	private function cacheToken(Token $token, string $cacheKey) {
-		$this->cache->set($cacheKey . '/token', json_encode($token));
-	}
-
-	/**
-	 * @return OpenStack
-	 * @throws StorageAuthException
-	 */
-	private function getClient() {
-		if (isset($this->params['bucket'])) {
-			$this->params['container'] = $this->params['bucket'];
-		}
-		if (!isset($this->params['container'])) {
-			$this->params['container'] = 'owncloud';
-		}
-		if (!isset($this->params['autocreate'])) {
-			// should only be true for tests
-			$this->params['autocreate'] = false;
-		}
-		if (isset($this->params['user']) && is_array($this->params['user'])) {
-			$userName = $this->params['user']['id'];
-		} else {
-			if (!isset($this->params['username']) && isset($this->params['user'])) {
-				$this->params['username'] = $this->params['user'];
-			}
-			$userName = $this->params['username'];
-		}
-		if (!isset($this->params['tenantName']) && isset($this->params['tenant'])) {
-			$this->params['tenantName'] = $this->params['tenant'];
-		}
-
-		$cacheKey = $userName . '@' . $this->params['url'] . '/' . $this->params['bucket'];
-		$token = $this->getCachedToken($cacheKey);
-		$hasToken = is_array($token) && (new \DateTimeImmutable($token['expires_at'])) > (new \DateTimeImmutable('now'));
-		if ($hasToken) {
-			$this->params['cachedToken'] = $token;
-		}
-
-		$httpClient = new Client([
-			'base_uri' => TransportUtils::normalizeUrl($this->params['url']),
-			'handler' => HandlerStack::create()
-		]);
-
-		if (isset($this->params['user']) && isset($this->params['user']['id'])) {
-			return $this->auth(IdentityV3Service::factory($httpClient), $cacheKey);
-		} else {
-			return $this->auth(IdentityV2Service::factory($httpClient), $cacheKey);
-		}
-	}
-
-	/**
-	 * @param IdentityV2Service|IdentityV3Service $authService
-	 * @param string $cacheKey
-	 * @return OpenStack
-	 * @throws StorageAuthException
-	 */
-	private function auth($authService, string $cacheKey) {
-		$this->params['identityService'] = $authService;
-		$this->params['authUrl'] = $this->params['url'];
-		$client = new OpenStack($this->params);
-
-		if (!isset($this->params['cachedToken'])) {
-			try {
-				$token = $authService->generateToken($this->params);
-				$this->cacheToken($token, $cacheKey);
-			} catch (ConnectException $e) {
-				throw new StorageAuthException('Failed to connect to keystone, verify the keystone url', $e);
-			} catch (ClientException $e) {
-				$statusCode = $e->getResponse()->getStatusCode();
-				if ($statusCode === 404) {
-					throw new StorageAuthException('Keystone not found, verify the keystone url', $e);
-				} else if ($statusCode === 412) {
-					throw new StorageAuthException('Precondition failed, verify the keystone url', $e);
-				} else if ($statusCode === 401) {
-					throw new StorageAuthException('Authentication failed, verify the username, password and possibly tenant', $e);
-				} else {
-					throw new StorageAuthException('Unknown error', $e);
-				}
-			} catch (RequestException $e) {
-				throw new StorageAuthException('Connection reset while connecting to keystone, verify the keystone url', $e);
-			}
-		}
-
-		return $client;
-	}
-
-	/**
-	 * @return \OpenStack\ObjectStore\v1\Models\Container
-	 * @throws StorageAuthException
-	 * @throws StorageNotAvailableException
-	 */
-	public function getContainer() {
-		if (is_null($this->container)) {
-			$this->container = $this->createContainer();
-		}
-
-		return $this->container;
-	}
-
-	/**
-	 * @return \OpenStack\ObjectStore\v1\Models\Container
-	 * @throws StorageAuthException
-	 * @throws StorageNotAvailableException
-	 */
-	private function createContainer() {
-		$client = $this->getClient();
-		$objectStoreService = $client->objectStoreV1();
-
-		$autoCreate = isset($this->params['autocreate']) && $this->params['autocreate'] === true;
-		try {
-			$container = $objectStoreService->getContainer($this->params['container']);
-			if ($autoCreate) {
-				$container->getMetadata();
-			}
-			return $container;
-		} catch (BadResponseError $ex) {
-			// if the container does not exist and autocreate is true try to create the container on the fly
-			if ($ex->getResponse()->getStatusCode() === 404 && $autoCreate) {
-				return $objectStoreService->createContainer([
-					'name' => $this->params['container']
-				]);
-			} else {
-				throw new StorageNotAvailableException('Invalid response while trying to get container info', StorageNotAvailableException::STATUS_ERROR, $e);
-			}
-		} catch (ConnectException $e) {
-			/** @var RequestInterface $request */
-			$request = $e->getRequest();
-			$host = $request->getUri()->getHost() . ':' . $request->getUri()->getPort();
-			\OC::$server->getLogger()->error("Can't connect to object storage server at $host");
-			throw new StorageNotAvailableException("Can't connect to object storage server at $host", StorageNotAvailableException::STATUS_ERROR, $e);
-		}
-	}
+    private $cache;
+    private $params;
+    /** @var Container|null */
+    private $container = null;
+
+    public function __construct(ICache $cache, array $params) {
+        $this->cache = $cache;
+        $this->params = $params;
+    }
+
+    private function getCachedToken(string $cacheKey) {
+        $cachedTokenString = $this->cache->get($cacheKey . '/token');
+        if ($cachedTokenString) {
+            return json_decode($cachedTokenString);
+        } else {
+            return null;
+        }
+    }
+
+    private function cacheToken(Token $token, string $cacheKey) {
+        $this->cache->set($cacheKey . '/token', json_encode($token));
+    }
+
+    /**
+     * @return OpenStack
+     * @throws StorageAuthException
+     */
+    private function getClient() {
+        if (isset($this->params['bucket'])) {
+            $this->params['container'] = $this->params['bucket'];
+        }
+        if (!isset($this->params['container'])) {
+            $this->params['container'] = 'owncloud';
+        }
+        if (!isset($this->params['autocreate'])) {
+            // should only be true for tests
+            $this->params['autocreate'] = false;
+        }
+        if (isset($this->params['user']) && is_array($this->params['user'])) {
+            $userName = $this->params['user']['id'];
+        } else {
+            if (!isset($this->params['username']) && isset($this->params['user'])) {
+                $this->params['username'] = $this->params['user'];
+            }
+            $userName = $this->params['username'];
+        }
+        if (!isset($this->params['tenantName']) && isset($this->params['tenant'])) {
+            $this->params['tenantName'] = $this->params['tenant'];
+        }
+
+        $cacheKey = $userName . '@' . $this->params['url'] . '/' . $this->params['bucket'];
+        $token = $this->getCachedToken($cacheKey);
+        $hasToken = is_array($token) && (new \DateTimeImmutable($token['expires_at'])) > (new \DateTimeImmutable('now'));
+        if ($hasToken) {
+            $this->params['cachedToken'] = $token;
+        }
+
+        $httpClient = new Client([
+            'base_uri' => TransportUtils::normalizeUrl($this->params['url']),
+            'handler' => HandlerStack::create()
+        ]);
+
+        if (isset($this->params['user']) && isset($this->params['user']['id'])) {
+            return $this->auth(IdentityV3Service::factory($httpClient), $cacheKey);
+        } else {
+            return $this->auth(IdentityV2Service::factory($httpClient), $cacheKey);
+        }
+    }
+
+    /**
+     * @param IdentityV2Service|IdentityV3Service $authService
+     * @param string $cacheKey
+     * @return OpenStack
+     * @throws StorageAuthException
+     */
+    private function auth($authService, string $cacheKey) {
+        $this->params['identityService'] = $authService;
+        $this->params['authUrl'] = $this->params['url'];
+        $client = new OpenStack($this->params);
+
+        if (!isset($this->params['cachedToken'])) {
+            try {
+                $token = $authService->generateToken($this->params);
+                $this->cacheToken($token, $cacheKey);
+            } catch (ConnectException $e) {
+                throw new StorageAuthException('Failed to connect to keystone, verify the keystone url', $e);
+            } catch (ClientException $e) {
+                $statusCode = $e->getResponse()->getStatusCode();
+                if ($statusCode === 404) {
+                    throw new StorageAuthException('Keystone not found, verify the keystone url', $e);
+                } else if ($statusCode === 412) {
+                    throw new StorageAuthException('Precondition failed, verify the keystone url', $e);
+                } else if ($statusCode === 401) {
+                    throw new StorageAuthException('Authentication failed, verify the username, password and possibly tenant', $e);
+                } else {
+                    throw new StorageAuthException('Unknown error', $e);
+                }
+            } catch (RequestException $e) {
+                throw new StorageAuthException('Connection reset while connecting to keystone, verify the keystone url', $e);
+            }
+        }
+
+        return $client;
+    }
+
+    /**
+     * @return \OpenStack\ObjectStore\v1\Models\Container
+     * @throws StorageAuthException
+     * @throws StorageNotAvailableException
+     */
+    public function getContainer() {
+        if (is_null($this->container)) {
+            $this->container = $this->createContainer();
+        }
+
+        return $this->container;
+    }
+
+    /**
+     * @return \OpenStack\ObjectStore\v1\Models\Container
+     * @throws StorageAuthException
+     * @throws StorageNotAvailableException
+     */
+    private function createContainer() {
+        $client = $this->getClient();
+        $objectStoreService = $client->objectStoreV1();
+
+        $autoCreate = isset($this->params['autocreate']) && $this->params['autocreate'] === true;
+        try {
+            $container = $objectStoreService->getContainer($this->params['container']);
+            if ($autoCreate) {
+                $container->getMetadata();
+            }
+            return $container;
+        } catch (BadResponseError $ex) {
+            // if the container does not exist and autocreate is true try to create the container on the fly
+            if ($ex->getResponse()->getStatusCode() === 404 && $autoCreate) {
+                return $objectStoreService->createContainer([
+                    'name' => $this->params['container']
+                ]);
+            } else {
+                throw new StorageNotAvailableException('Invalid response while trying to get container info', StorageNotAvailableException::STATUS_ERROR, $e);
+            }
+        } catch (ConnectException $e) {
+            /** @var RequestInterface $request */
+            $request = $e->getRequest();
+            $host = $request->getUri()->getHost() . ':' . $request->getUri()->getPort();
+            \OC::$server->getLogger()->error("Can't connect to object storage server at $host");
+            throw new StorageNotAvailableException("Can't connect to object storage server at $host", StorageNotAvailableException::STATUS_ERROR, $e);
+        }
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2018 Robin Appelman <robin@icewind.nl>
  *
@@ -51,7 +51,7 @@ 
 	}
 
 	private function getCachedToken(string $cacheKey) {
-		$cachedTokenString = $this->cache->get($cacheKey . '/token');
+		$cachedTokenString = $this->cache->get($cacheKey.'/token');
 		if ($cachedTokenString) {
 			return json_decode($cachedTokenString);
 		} else {
@@ -60,7 +60,7 @@ 
 	}
 
 	private function cacheToken(Token $token, string $cacheKey) {
-		$this->cache->set($cacheKey . '/token', json_encode($token));
+		$this->cache->set($cacheKey.'/token', json_encode($token));
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 			$this->params['tenantName'] = $this->params['tenant'];
 		}
 
-		$cacheKey = $userName . '@' . $this->params['url'] . '/' . $this->params['bucket'];
+		$cacheKey = $userName.'@'.$this->params['url'].'/'.$this->params['bucket'];
 		$token = $this->getCachedToken($cacheKey);
 		$hasToken = is_array($token) && (new \DateTimeImmutable($token['expires_at'])) > (new \DateTimeImmutable('now'));
 		if ($hasToken) {
@@ -186,7 +186,7 @@ 
 		} catch (ConnectException $e) {
 			/** @var RequestInterface $request */
 			$request = $e->getRequest();
-			$host = $request->getUri()->getHost() . ':' . $request->getUri()->getPort();
+			$host = $request->getUri()->getHost().':'.$request->getUri()->getPort();
 			\OC::$server->getLogger()->error("Can't connect to object storage server at $host");
 			throw new StorageNotAvailableException("Can't connect to object storage server at $host", StorageNotAvailableException::STATUS_ERROR, $e);
 		}

apps/files_external/lib/AppInfo/Application.php

Indentation +83 added lines, -83 removed lines

@@ -66,88 +66,88 @@
  */
 class Application extends App implements IBackendProvider, IAuthMechanismProvider {
 
-	public function __construct(array $urlParams = array()) {
-		parent::__construct('files_external', $urlParams);
-
-		$container = $this->getContainer();
-
-		$container->registerService(IUserMountCache::class, function (IAppContainer $c) {
-			return $c->getServer()->query('UserMountCache');
-		});
-
-		$backendService = $container->query(BackendService::class);
-		$backendService->registerBackendProvider($this);
-		$backendService->registerAuthMechanismProvider($this);
-
-		// force-load auth mechanisms since some will register hooks
-		// TODO: obsolete these and use the TokenProvider to get the user's password from the session
-		$this->getAuthMechanisms();
-
-		// app developers: do NOT depend on this! it will disappear with oC 9.0!
-		\OC::$server->getEventDispatcher()->dispatch(
-			'OCA\\Files_External::loadAdditionalBackends'
-		);
-	}
-
-	/**
-	 * @{inheritdoc}
-	 */
-	public function getBackends() {
-		$container = $this->getContainer();
-
-		$backends = [
-			$container->query(Local::class),
-			$container->query(FTP::class),
-			$container->query(DAV::class),
-			$container->query(OwnCloud::class),
-			$container->query(SFTP::class),
-			$container->query(AmazonS3::class),
-			$container->query(Swift::class),
-			$container->query(SFTP_Key::class),
-			$container->query(SMB::class),
-			$container->query(SMB_OC::class),
-		];
-
-		return $backends;
-	}
-
-	/**
-	 * @{inheritdoc}
-	 */
-	public function getAuthMechanisms() {
-		$container = $this->getContainer();
-
-		return [
-			// AuthMechanism::SCHEME_NULL mechanism
-			$container->query(NullMechanism::class),
-
-			// AuthMechanism::SCHEME_BUILTIN mechanism
-			$container->query(Builtin::class),
-
-			// AuthMechanism::SCHEME_PASSWORD mechanisms
-			$container->query(Password::class),
-			$container->query(SessionCredentials::class),
-			$container->query(LoginCredentials::class),
-			$container->query(UserProvided::class),
-			$container->query(GlobalAuth::class),
-
-			// AuthMechanism::SCHEME_OAUTH1 mechanisms
-			$container->query(OAuth1::class),
-
-			// AuthMechanism::SCHEME_OAUTH2 mechanisms
-			$container->query(OAuth2::class),
-
-			// AuthMechanism::SCHEME_PUBLICKEY mechanisms
-			$container->query(RSA::class),
-
-			// AuthMechanism::SCHEME_OPENSTACK mechanisms
-			$container->query(OpenStackV2::class),
-			$container->query(OpenStackV3::class),
-			$container->query(Rackspace::class),
-
-			// Specialized mechanisms
-			$container->query(AccessKey::class),
-		];
-	}
+    public function __construct(array $urlParams = array()) {
+        parent::__construct('files_external', $urlParams);
+
+        $container = $this->getContainer();
+
+        $container->registerService(IUserMountCache::class, function (IAppContainer $c) {
+            return $c->getServer()->query('UserMountCache');
+        });
+
+        $backendService = $container->query(BackendService::class);
+        $backendService->registerBackendProvider($this);
+        $backendService->registerAuthMechanismProvider($this);
+
+        // force-load auth mechanisms since some will register hooks
+        // TODO: obsolete these and use the TokenProvider to get the user's password from the session
+        $this->getAuthMechanisms();
+
+        // app developers: do NOT depend on this! it will disappear with oC 9.0!
+        \OC::$server->getEventDispatcher()->dispatch(
+            'OCA\\Files_External::loadAdditionalBackends'
+        );
+    }
+
+    /**
+     * @{inheritdoc}
+     */
+    public function getBackends() {
+        $container = $this->getContainer();
+
+        $backends = [
+            $container->query(Local::class),
+            $container->query(FTP::class),
+            $container->query(DAV::class),
+            $container->query(OwnCloud::class),
+            $container->query(SFTP::class),
+            $container->query(AmazonS3::class),
+            $container->query(Swift::class),
+            $container->query(SFTP_Key::class),
+            $container->query(SMB::class),
+            $container->query(SMB_OC::class),
+        ];
+
+        return $backends;
+    }
+
+    /**
+     * @{inheritdoc}
+     */
+    public function getAuthMechanisms() {
+        $container = $this->getContainer();
+
+        return [
+            // AuthMechanism::SCHEME_NULL mechanism
+            $container->query(NullMechanism::class),
+
+            // AuthMechanism::SCHEME_BUILTIN mechanism
+            $container->query(Builtin::class),
+
+            // AuthMechanism::SCHEME_PASSWORD mechanisms
+            $container->query(Password::class),
+            $container->query(SessionCredentials::class),
+            $container->query(LoginCredentials::class),
+            $container->query(UserProvided::class),
+            $container->query(GlobalAuth::class),
+
+            // AuthMechanism::SCHEME_OAUTH1 mechanisms
+            $container->query(OAuth1::class),
+
+            // AuthMechanism::SCHEME_OAUTH2 mechanisms
+            $container->query(OAuth2::class),
+
+            // AuthMechanism::SCHEME_PUBLICKEY mechanisms
+            $container->query(RSA::class),
+
+            // AuthMechanism::SCHEME_OPENSTACK mechanisms
+            $container->query(OpenStackV2::class),
+            $container->query(OpenStackV3::class),
+            $container->query(Rackspace::class),
+
+            // Specialized mechanisms
+            $container->query(AccessKey::class),
+        ];
+    }
 
 }

apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV2.php

Indentation +14 added lines, -14 removed lines

@@ -31,19 +31,19 @@
  */
 class OpenStackV2 extends AuthMechanism {
 
-	public function __construct(IL10N $l) {
-		$this
-			->setIdentifier('openstack::openstack')
-			->setScheme(self::SCHEME_OPENSTACK)
-			->setText($l->t('OpenStack v2'))
-			->addParameters([
-				new DefinitionParameter('user', $l->t('Username')),
-				(new DefinitionParameter('password', $l->t('Password')))
-					->setType(DefinitionParameter::VALUE_PASSWORD),
-				new DefinitionParameter('tenant', $l->t('Tenant name')),
-				new DefinitionParameter('url', $l->t('Identity endpoint URL')),
-			])
-		;
-	}
+    public function __construct(IL10N $l) {
+        $this
+            ->setIdentifier('openstack::openstack')
+            ->setScheme(self::SCHEME_OPENSTACK)
+            ->setText($l->t('OpenStack v2'))
+            ->addParameters([
+                new DefinitionParameter('user', $l->t('Username')),
+                (new DefinitionParameter('password', $l->t('Password')))
+                    ->setType(DefinitionParameter::VALUE_PASSWORD),
+                new DefinitionParameter('tenant', $l->t('Tenant name')),
+                new DefinitionParameter('url', $l->t('Identity endpoint URL')),
+            ])
+        ;
+    }
 
 }