diff options
Diffstat (limited to 'lib/private/Files')
| -rw-r--r-- | lib/private/Files/Mount/ObjectHomeMountProvider.php | 3 | ||||
| -rw-r--r-- | lib/private/Files/ObjectStore/Swift.php | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/private/Files/Mount/ObjectHomeMountProvider.php b/lib/private/Files/Mount/ObjectHomeMountProvider.php index 440a8bc4608..9c09c0737c8 100644 --- a/lib/private/Files/Mount/ObjectHomeMountProvider.php +++ b/lib/private/Files/Mount/ObjectHomeMountProvider.php @@ -84,10 +84,11 @@ class ObjectHomeMountProvider implements IHomeMountProvider { if (!isset($config['arguments'])) { $config['arguments'] = []; } - $config['arguments']['user'] = $user; // instantiate object store implementation $config['arguments']['objectstore'] = new $config['class']($config['arguments']); + $config['arguments']['user'] = $user; + return $config; } diff --git a/lib/private/Files/ObjectStore/Swift.php b/lib/private/Files/ObjectStore/Swift.php index 70bc4ed8438..f9c53fd333f 100644 --- a/lib/private/Files/ObjectStore/Swift.php +++ b/lib/private/Files/ObjectStore/Swift.php @@ -117,6 +117,10 @@ class Swift implements IObjectStore { /** @var Catalog $catalog */ $catalog = $this->client->getCatalog(); + if (count($catalog->getItems()) === 0) { + throw new StorageAuthException('Keystone did not provide a valid catalog, verify the credentials'); + } + if (isset($this->params['serviceName'])) { $serviceName = $this->params['serviceName']; } else { |