wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #21008 from owncloud/UoM-ResPlat-DevOps-swift-acl-shared-containers

Browse source 
Allowing access to Swift containers shared by ACL
This commit is contained in:
Thomas Müller 2016-01-08 20:13:13 +01:00
commit d7d0cfc775
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/files_external/lib/swift.php
View file

@ -32,6 +32,7 @@
namespace OC\Files\Storage; namespace OC\Files\Storage;
use Guzzle\Http\Url;
use Guzzle\Http\Exception\ClientErrorResponseException; use Guzzle\Http\Exception\ClientErrorResponseException;
use Icewind\Streams\IteratorDirectory; use Icewind\Streams\IteratorDirectory;
use OpenCloud; use OpenCloud;
@ -123,7 +124,14 @@ class Swift extends \OC\Files\Storage\Common {
} }
$this->id = 'swift::' . $params['user'] . md5($params['bucket']); $this->id = 'swift::' . $params['user'] . md5($params['bucket']);
$bucketUrl = Url::factory($params['bucket']);
if ($bucketUrl->isAbsolute()) {
$this->bucket = end(($bucketUrl->getPathSegments()));
$params['endpoint_url'] = $bucketUrl->addPath('..')->normalizePath();
} else {
$this->bucket = $params['bucket']; $this->bucket = $params['bucket'];
}
if (empty($params['url'])) { if (empty($params['url'])) {
$params['url'] = 'https://identity.api.rackspacecloud.com/v2.0/'; $params['url'] = 'https://identity.api.rackspacecloud.com/v2.0/';
@ -514,7 +522,16 @@ class Swift extends \OC\Files\Storage\Common {
$this->anchor = new OpenStack($this->params['url'], $settings); $this->anchor = new OpenStack($this->params['url'], $settings);
} }
$this->connection = $this->anchor->objectStoreService($this->params['service_name'], $this->params['region']); $connection = $this->anchor->objectStoreService($this->params['service_name'], $this->params['region']);
if (!empty($this->params['endpoint_url'])) {
$endpoint = $connection->getEndpoint();
$endpoint->setPublicUrl($this->params['endpoint_url']);
$endpoint->setPrivateUrl($this->params['endpoint_url']);
$connection->setEndpoint($endpoint);
}
$this->connection = $connection;
return $this->connection; return $this->connection;
} }