nextcloud / server

lib/private/Files/ObjectStore/SwiftFactory.php

Indentation +208 added lines, -208 removed lines

@@ -52,235 +52,235 @@
 use Psr\Http\Message\RequestInterface;
 
 class SwiftFactory {
-	private $cache;
-	private $params;
-	/** @var Container|null */
-	private $container = null;
-	private $logger;
+    private $cache;
+    private $params;
+    /** @var Container|null */
+    private $container = null;
+    private $logger;
 
-	public const DEFAULT_OPTIONS = [
-		'autocreate' => false,
-		'urlType' => 'publicURL',
-		'catalogName' => 'swift',
-		'catalogType' => 'object-store'
-	];
+    public const DEFAULT_OPTIONS = [
+        'autocreate' => false,
+        'urlType' => 'publicURL',
+        'catalogName' => 'swift',
+        'catalogType' => 'object-store'
+    ];
 
-	public function __construct(ICache $cache, array $params, ILogger $logger) {
-		$this->cache = $cache;
-		$this->params = $params;
-		$this->logger = $logger;
-	}
+    public function __construct(ICache $cache, array $params, ILogger $logger) {
+        $this->cache = $cache;
+        $this->params = $params;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Gets currently cached token id
-	 *
-	 * @return string
-	 * @throws StorageAuthException
-	 */
-	public function getCachedTokenId() {
-		if ( !isset($this->params['cachedToken']) ) {
-			throw new StorageAuthException('Unauthenticated ObjectStore connection');
-		}
+    /**
+     * Gets currently cached token id
+     *
+     * @return string
+     * @throws StorageAuthException
+     */
+    public function getCachedTokenId() {
+        if ( !isset($this->params['cachedToken']) ) {
+            throw new StorageAuthException('Unauthenticated ObjectStore connection');
+        }
 
-		// Is it V2 token?
-		if ( isset($this->params['cachedToken']['token']) ) {
-			return $this->params['cachedToken']['token']['id'];
-		}
+        // Is it V2 token?
+        if ( isset($this->params['cachedToken']['token']) ) {
+            return $this->params['cachedToken']['token']['id'];
+        }
 
-		return $this->params['cachedToken']['id'];
-	}
+        return $this->params['cachedToken']['id'];
+    }
 
-	private function getCachedToken(string $cacheKey) {
-		$cachedTokenString = $this->cache->get($cacheKey . '/token');
-		if ($cachedTokenString) {
-			return json_decode($cachedTokenString, true);
-		} else {
-			return null;
-		}
-	}
+    private function getCachedToken(string $cacheKey) {
+        $cachedTokenString = $this->cache->get($cacheKey . '/token');
+        if ($cachedTokenString) {
+            return json_decode($cachedTokenString, true);
+        } else {
+            return null;
+        }
+    }
 
-	private function cacheToken(Token $token, string $serviceUrl, string $cacheKey) {
-		if ($token instanceof \OpenStack\Identity\v3\Models\Token) {
-			// for v3 the catalog is cached as part of the token, so no need to cache $serviceUrl separately
-			$value = $token->export();
-		} else {
-			/** @var \OpenStack\Identity\v2\Models\Token $token */
-			$value = [
-				'serviceUrl' => $serviceUrl,
-				'token' => [
-					'issued_at' => $token->issuedAt->format('c'),
-					'expires' => $token->expires->format('c'),
-					'id' => $token->id,
-					'tenant' => $token->tenant
-				]
-			];
-		}
+    private function cacheToken(Token $token, string $serviceUrl, string $cacheKey) {
+        if ($token instanceof \OpenStack\Identity\v3\Models\Token) {
+            // for v3 the catalog is cached as part of the token, so no need to cache $serviceUrl separately
+            $value = $token->export();
+        } else {
+            /** @var \OpenStack\Identity\v2\Models\Token $token */
+            $value = [
+                'serviceUrl' => $serviceUrl,
+                'token' => [
+                    'issued_at' => $token->issuedAt->format('c'),
+                    'expires' => $token->expires->format('c'),
+                    'id' => $token->id,
+                    'tenant' => $token->tenant
+                ]
+            ];
+        }
 
-		$this->params['cachedToken'] = $value;
-		$this->cache->set($cacheKey . '/token', json_encode($value));
-	}
+        $this->params['cachedToken'] = $value;
+        $this->cache->set($cacheKey . '/token', json_encode($value));
+    }
 
-	/**
-	 * @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'] = 'nextcloud';
-		}
-		if (isset($this->params['user']) && is_array($this->params['user'])) {
-			$userName = $this->params['user']['name'];
-		} 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'];
-		}
-		if (isset($this->params['domain'])) {
-			$this->params['scope']['project']['name'] = $this->params['tenant'];
-			$this->params['scope']['project']['domain']['name'] = $this->params['domain'];
-		}
-		$this->params = array_merge(self::DEFAULT_OPTIONS, $this->params);
+    /**
+     * @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'] = 'nextcloud';
+        }
+        if (isset($this->params['user']) && is_array($this->params['user'])) {
+            $userName = $this->params['user']['name'];
+        } 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'];
+        }
+        if (isset($this->params['domain'])) {
+            $this->params['scope']['project']['name'] = $this->params['tenant'];
+            $this->params['scope']['project']['domain']['name'] = $this->params['domain'];
+        }
+        $this->params = array_merge(self::DEFAULT_OPTIONS, $this->params);
 
-		$cacheKey = $userName . '@' . $this->params['url'] . '/' . $this->params['container'];
-		$token = $this->getCachedToken($cacheKey);
-		$this->params['cachedToken'] = $token;
+        $cacheKey = $userName . '@' . $this->params['url'] . '/' . $this->params['container'];
+        $token = $this->getCachedToken($cacheKey);
+        $this->params['cachedToken'] = $token;
 
-		$httpClient = new Client([
-			'base_uri' => TransportUtils::normalizeUrl($this->params['url']),
-			'handler' => HandlerStack::create()
-		]);
+        $httpClient = new Client([
+            'base_uri' => TransportUtils::normalizeUrl($this->params['url']),
+            'handler' => HandlerStack::create()
+        ]);
 
-		if (isset($this->params['user']) && is_array($this->params['user']) && isset($this->params['user']['name'])) {
-			if (!isset($this->params['scope'])) {
-				throw new StorageAuthException('Scope has to be defined for V3 requests');
-			}
+        if (isset($this->params['user']) && is_array($this->params['user']) && isset($this->params['user']['name'])) {
+            if (!isset($this->params['scope'])) {
+                throw new StorageAuthException('Scope has to be defined for V3 requests');
+            }
 
-			return $this->auth(IdentityV3Service::factory($httpClient), $cacheKey);
-		} else {
-			return $this->auth(SwiftV2CachingAuthService::factory($httpClient), $cacheKey);
-		}
-	}
+            return $this->auth(IdentityV3Service::factory($httpClient), $cacheKey);
+        } else {
+            return $this->auth(SwiftV2CachingAuthService::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'];
+    /**
+     * @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'];
 
-		$cachedToken = $this->params['cachedToken'];
-		$hasValidCachedToken = false;
-		if (\is_array($cachedToken)) {
-			if ($authService instanceof IdentityV3Service) {
-				$token = $authService->generateTokenFromCache($cachedToken);
-				if (\is_null($token->catalog)) {
-					$this->logger->warning('Invalid cached token for swift, no catalog set: ' . json_encode($cachedToken));
-				} elseif ($token->hasExpired()) {
-					$this->logger->debug('Cached token for swift expired');
-				} else {
-					$hasValidCachedToken = true;
-				}
-			} else {
-				try {
-					/** @var \OpenStack\Identity\v2\Models\Token $token */
-					$token = $authService->model(\OpenStack\Identity\v2\Models\Token::class, $cachedToken['token']);
-					$now = new \DateTimeImmutable("now");
-					if ($token->expires > $now) {
-						$hasValidCachedToken = true;
-						$this->params['v2cachedToken'] = $token;
-						$this->params['v2serviceUrl'] = $cachedToken['serviceUrl'];
-					} else {
-						$this->logger->debug('Cached token for swift expired');
-					}
-				} catch (\Exception $e) {
-					$this->logger->logException($e);
-				}
-			}
-		}
+        $cachedToken = $this->params['cachedToken'];
+        $hasValidCachedToken = false;
+        if (\is_array($cachedToken)) {
+            if ($authService instanceof IdentityV3Service) {
+                $token = $authService->generateTokenFromCache($cachedToken);
+                if (\is_null($token->catalog)) {
+                    $this->logger->warning('Invalid cached token for swift, no catalog set: ' . json_encode($cachedToken));
+                } elseif ($token->hasExpired()) {
+                    $this->logger->debug('Cached token for swift expired');
+                } else {
+                    $hasValidCachedToken = true;
+                }
+            } else {
+                try {
+                    /** @var \OpenStack\Identity\v2\Models\Token $token */
+                    $token = $authService->model(\OpenStack\Identity\v2\Models\Token::class, $cachedToken['token']);
+                    $now = new \DateTimeImmutable("now");
+                    if ($token->expires > $now) {
+                        $hasValidCachedToken = true;
+                        $this->params['v2cachedToken'] = $token;
+                        $this->params['v2serviceUrl'] = $cachedToken['serviceUrl'];
+                    } else {
+                        $this->logger->debug('Cached token for swift expired');
+                    }
+                } catch (\Exception $e) {
+                    $this->logger->logException($e);
+                }
+            }
+        }
 
-		if (!$hasValidCachedToken) {
-			unset($this->params['cachedToken']);
-			try {
-				list($token, $serviceUrl) = $authService->authenticate($this->params);
-				$this->cacheToken($token, $serviceUrl, $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);
-				} elseif ($statusCode === 412) {
-					throw new StorageAuthException('Precondition failed, verify the keystone url', $e);
-				} elseif ($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);
-			}
-		}
+        if (!$hasValidCachedToken) {
+            unset($this->params['cachedToken']);
+            try {
+                list($token, $serviceUrl) = $authService->authenticate($this->params);
+                $this->cacheToken($token, $serviceUrl, $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);
+                } elseif ($statusCode === 412) {
+                    throw new StorageAuthException('Precondition failed, verify the keystone url', $e);
+                } elseif ($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);
+            }
+        }
 
 
-		$client = new OpenStack($this->params);
+        $client = new OpenStack($this->params);
 
-		return $client;
-	}
+        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 \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 $this->container;
+    }
 
-	/**
-	 * @return \OpenStack\ObjectStore\v1\Models\Container
-	 * @throws StorageAuthException
-	 * @throws StorageNotAvailableException
-	 */
-	private function createContainer() {
-		$client = $this->getClient();
-		$objectStoreService = $client->objectStoreV1();
+    /**
+     * @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, $ex);
-			}
-		} 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);
-		}
-	}
+        $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, $ex);
+            }
+        } 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);
+        }
+    }
 }

lib/private/Files/ObjectStore/Swift.php

Indentation +105 added lines, -105 removed lines

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