From ac1651c86db336a0d709dc44c165ace1ab1c7cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 29 Oct 2021 13:27:15 +0200 Subject: [PATCH 1/2] Use unique combination of hostname/bucket/key for external storages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/files_external/lib/Lib/Storage/AmazonS3.php | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index df13603de2314..5b92b7baff6c5 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -84,6 +84,7 @@ public function needsPartFile() { public function __construct($parameters) { parent::__construct($parameters); $this->parseParams($parameters); + $this->id = 'amazon::external::' . md5($this->params['hostname'] . ':' . $this->params['bucket'] . ':' . $this->params['key']); $this->objectCache = new CappedMemoryCache(); $this->directoryCache = new CappedMemoryCache(); $this->filesCache = new CappedMemoryCache(); From 52037996aa49a3dd047c95d44f3b402c0387de72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Thu, 4 Nov 2021 13:08:51 +0100 Subject: [PATCH 2/2] Add migration to move over existing storage ids MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/files_external/appinfo/info.xml | 2 +- .../Version1015Date20211104103506.php | 111 ++++++++++++++++++ 2 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 apps/files_external/lib/Migration/Version1015Date20211104103506.php diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml index bf0a6122214a3..560e562690a7d 100644 --- a/apps/files_external/appinfo/info.xml +++ b/apps/files_external/appinfo/info.xml @@ -9,7 +9,7 @@ This application enables administrators to configure connections to external sto External storage can be configured using the GUI or at the command line. This second option provides the advanced user with more flexibility for configuring bulk external storage mounts and setting mount priorities. More information is available in the external storage GUI documentation and the external storage Configuration File documentation. - 1.12.0 + 1.12.1 agpl Robin Appelman Michael Gapczynski diff --git a/apps/files_external/lib/Migration/Version1015Date20211104103506.php b/apps/files_external/lib/Migration/Version1015Date20211104103506.php new file mode 100644 index 0000000000000..1b4d9ee97c969 --- /dev/null +++ b/apps/files_external/lib/Migration/Version1015Date20211104103506.php @@ -0,0 +1,111 @@ + + * + * @author Julius Härtl + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ +namespace OCA\Files_External\Migration; + +use Closure; +use OC\Files\Cache\Storage; +use OCP\DB\Exception; +use OCP\DB\IResult; +use OCP\DB\ISchemaWrapper; +use OCP\IDBConnection; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; +use Psr\Log\LoggerInterface; + +class Version1015Date20211104103506 extends SimpleMigrationStep { + + /** @var IDBConnection */ + private $connection; + /** @var LoggerInterface */ + private $logger; + + public function __construct(IDBConnection $connection, LoggerInterface $logger) { + $this->connection = $connection; + $this->logger = $logger; + } + + public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { + $qb = $this->connection->getQueryBuilder(); + $qb->update('storages') + ->set('id', $qb->createParameter('newId')) + ->where($qb->expr()->eq('id', $qb->createParameter('oldId'))); + + $mounts = $this->getS3Mounts(); + if (!$mounts instanceof IResult) { + throw new \Exception('Could not fetch existing mounts for migration'); + } + + while ($mount = $mounts->fetch()) { + $config = $this->getStorageConfig((int)$mount['mount_id']); + $hostname = $config['hostname']; + $bucket = $config['bucket']; + $key = $config['key']; + $oldId = Storage::adjustStorageId('amazon::' . $bucket); + $newId = Storage::adjustStorageId('amazon::external::' . md5($hostname . ':' . $bucket . ':' . $key)); + try { + $qb->setParameter('oldId', $oldId); + $qb->setParameter('newId', $newId); + $qb->execute(); + $this->logger->info('Migrated s3 storage id for mount with id ' . $mount['mount_id'] . ' to ' . $newId); + } catch (Exception $e) { + $this->logger->error('Failed to migrate external s3 storage id for mount with id ' . $mount['mount_id'], [ + 'exception' => $e + ]); + } + } + return null; + } + + /** + * @throws Exception + * @return \OCP\DB\IResult|int + */ + private function getS3Mounts() { + $qb = $this->connection->getQueryBuilder(); + $qb->select('m.mount_id') + ->selectAlias('c.value', 'bucket') + ->from('external_mounts', 'm') + ->innerJoin('m', 'external_config', 'c', 'c.mount_id = m.mount_id') + ->where($qb->expr()->eq('m.storage_backend', $qb->createPositionalParameter('amazons3'))) + ->andWhere($qb->expr()->eq('c.key', $qb->createPositionalParameter('bucket'))); + return $qb->execute(); + } + + /** + * @throws Exception + */ + private function getStorageConfig(int $mountId): array { + $qb = $this->connection->getQueryBuilder(); + $qb->select('key', 'value') + ->from('external_config') + ->where($qb->expr()->eq('mount_id', $qb->createPositionalParameter($mountId))); + $config = []; + foreach ($qb->execute()->fetchAll() as $row) { + $config[$row['key']] = $row['value']; + } + return $config; + } +}