diff options
author | Louis Chemineau <louis@chmn.me> | 2021-12-16 16:46:03 +0100 |
---|---|---|
committer | Louis Chemineau <louis@chmn.me> | 2022-03-24 18:08:43 +0100 |
commit | c5722869be32ced505d71b11f5e1ea8e169aae57 (patch) | |
tree | ce72d16100e8e0263529c6a8a2bdf8b6014ff7fa /lib/private | |
parent | c9ea2363b1e50748b7c85f1e14b036c3d92cc31a (diff) | |
download | nextcloud-server-c5722869be32ced505d71b11f5e1ea8e169aae57.tar.gz nextcloud-server-c5722869be32ced505d71b11f5e1ea8e169aae57.zip |
Add oauth2_clients migration for Owncloud
Signed-off-by: Louis Chemineau <louis@chmn.me>
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/Repair.php | 2 | ||||
-rw-r--r-- | lib/private/Repair/Owncloud/MigrateOauthTables.php | 113 |
2 files changed, 115 insertions, 0 deletions
diff --git a/lib/private/Repair.php b/lib/private/Repair.php index 408d0f1b7aa..677588fa9ee 100644 --- a/lib/private/Repair.php +++ b/lib/private/Repair.php @@ -47,6 +47,7 @@ use OC\Repair\Collation; use OC\Repair\MoveUpdaterStepFile; use OC\Repair\NC22\LookupServerSendCheck; use OC\Repair\Owncloud\CleanPreviews; +use OC\Repair\Owncloud\MigrateOauthTables; use OC\Repair\NC11\FixMountStorages; use OC\Repair\Owncloud\MoveAvatars; use OC\Repair\Owncloud\InstallCoreBundle; @@ -185,6 +186,7 @@ class Repair implements IOutput { \OC::$server->getUserManager(), \OC::$server->getConfig() ), + new MigrateOauthTables(\OC::$server->get(Connection::class)), new FixMountStorages(\OC::$server->getDatabaseConnection()), new UpdateLanguageCodes(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()), new InstallCoreBundle( diff --git a/lib/private/Repair/Owncloud/MigrateOauthTables.php b/lib/private/Repair/Owncloud/MigrateOauthTables.php new file mode 100644 index 00000000000..274c2ee28db --- /dev/null +++ b/lib/private/Repair/Owncloud/MigrateOauthTables.php @@ -0,0 +1,113 @@ +<?php +/** + * @copyright 2021 Louis Chemineau <louis@chmn.me> + * + * @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 <http://www.gnu.org/licenses/>. + * + */ +namespace OC\Repair\Owncloud; + +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; +use OC\DB\Connection; +use OC\DB\SchemaWrapper; +use OCP\DB\QueryBuilder\IQueryBuilder; + +class MigrateOauthTables implements IRepairStep { + + /** @var Connection */ + protected $db; + + /** + * @param Connection $db + */ + public function __construct(Connection $db) { + $this->db = $db; + } + + /** + * @return string + */ + public function getName() { + return 'Migrate oauth2_clients table to nextcloud schema'; + } + + public function run(IOutput $output) { + $schema = new SchemaWrapper($this->db); + if (!$schema->hasTable('oauth2_clients')) { + $output->info("oauth2_clients table does not exist."); + return; + } + + $output->info("Update the oauth2_access_tokens table schema."); + $schema = new SchemaWrapper($this->db); + $table = $schema->getTable('oauth2_access_tokens'); + $table->addColumn('hashed_code', 'string', [ + 'notnull' => true, + 'length' => 128, + ]); + $table->addColumn('encrypted_token', 'string', [ + 'notnull' => true, + 'length' => 786, + ]); + $table->addUniqueIndex(['hashed_code'], 'oauth2_access_hash_idx'); + $table->addIndex(['client_id'], 'oauth2_access_client_id_idx'); + + + $output->info("Update the oauth2_clients table schema."); + $schema = new SchemaWrapper($this->db); + $table = $schema->getTable('oauth2_clients'); + $table->getColumn('name')->setLength(64); + $table->dropColumn('allow_subdomains'); + + if (!$schema->getTable('oauth2_clients')->hasColumn('client_identifier')) { + $table->addColumn('client_identifier', 'string', [ + 'notnull' => true, + 'length' => 64, + 'default' => '' + ]); + $table->addIndex(['client_identifier'], 'oauth2_client_id_idx'); + } + + $this->db->migrateToSchema($schema->getWrappedSchema()); + + + if ($schema->getTable('oauth2_clients')->hasColumn('identifier')) { + $output->info("Move identifier column's data to the new client_identifier column."); + // 1. Fetch all [id, identifier] couple. + $selectQuery = $this->db->getQueryBuilder(); + $selectQuery->select('id', 'identifier')->from('oauth2_clients'); + $result = $selectQuery->executeQuery(); + $identifiers = $result->fetchAll(); + $result->closeCursor(); + + // 2. Insert them into the client_identifier column. + foreach ($identifiers as ["id" => $id, "identifier" => $clientIdentifier]) { + $insertQuery = $this->db->getQueryBuilder(); + $insertQuery->update('oauth2_clients') + ->set('client_identifier', $insertQuery->createNamedParameter($clientIdentifier, IQueryBuilder::PARAM_STR)) + ->where($insertQuery->expr()->eq('id', $insertQuery->createNamedParameter($id, IQueryBuilder::PARAM_INT))) + ->executeStatement(); + } + + $output->info("Drop the identifier column."); + $schema = new SchemaWrapper($this->db); + $table = $schema->getTable('oauth2_clients'); + $table->dropColumn('identifier'); + $this->db->migrateToSchema($schema->getWrappedSchema()); + } + } +} |