mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9280 from nextcloud/bugfix/noid/swift-v3-scope 

Swift v3 requires setting a scope
This commit is contained in:
Roeland Jago Douma 2018-04-24 09:49:27 +02:00 committed by GitHub
parent 9339c7d20f ba71918ad2
commit 1ceb081c9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/config.sample.php
View File

@ -1229,10 +1229,18 @@ $CONFIG = array(
'name' => 'default', 'name' => 'default',
], ],
], ],
'scope' => [
'project' => [
'name' => 'service',
'domain' => [
'name' => 'default',
],
],
],
'tenantName' => 'service', 'tenantName' => 'service',
'serviceName' => 'swift', 'serviceName' => 'swift',
'region' => 'regionOne', 'region' => 'regionOne',
'url' => "http://yourswifthost:5000/v3", 'url' => 'http://yourswifthost:5000/v3',
'bucket' => 'nextcloud', 'bucket' => 'nextcloud',
], ],
], ],

4
lib/private/Files/ObjectStore/SwiftFactory.php
View File

@ -108,6 +108,10 @@ class SwiftFactory {
]); ]);
if (isset($this->params['user']) && isset($this->params['user']['name'])) { if (isset($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); return $this->auth(IdentityV3Service::factory($httpClient), $cacheKey);
} else { } else {
return $this->auth(IdentityV2Service::factory($httpClient), $cacheKey); return $this->auth(IdentityV2Service::factory($httpClient), $cacheKey);