From 5b5aebbf66e7559aac73eb82b236b052b6a1ae3e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 10 Nov 2020 09:33:29 +0100 Subject: [PATCH] Replace the credentials table with one that can have empty user Primary key columns on Oracle can not have empty strings Signed-off-by: Joas Schilling --- .../Version13000Date20170718121200.php | 32 +++--- .../Version20000Date20201109081915.php | 2 +- .../Version20000Date20201109081918.php | 107 ++++++++++++++++++ .../Version20000Date20201109081919.php | 52 +++++++++ lib/composer/composer/autoload_classmap.php | 2 + lib/composer/composer/autoload_static.php | 2 + lib/private/Security/CredentialsManager.php | 2 +- version.php | 2 +- 8 files changed, 182 insertions(+), 19 deletions(-) create mode 100644 core/Migrations/Version20000Date20201109081918.php create mode 100644 core/Migrations/Version20000Date20201109081919.php diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php index 2627e50bdb..ba5f72588a 100644 --- a/core/Migrations/Version13000Date20170718121200.php +++ b/core/Migrations/Version13000Date20170718121200.php @@ -811,22 +811,22 @@ class Version13000Date20170718121200 extends SimpleMigrationStep { $table->addUniqueIndex(['user_id', 'object_type', 'object_id'], 'comments_marker_index'); } - if (!$schema->hasTable('credentials')) { - $table = $schema->createTable('credentials'); - $table->addColumn('user', 'string', [ - 'notnull' => false, - 'length' => 64, - ]); - $table->addColumn('identifier', 'string', [ - 'notnull' => true, - 'length' => 64, - ]); - $table->addColumn('credentials', 'text', [ - 'notnull' => false, - ]); - $table->setPrimaryKey(['user', 'identifier']); - $table->addIndex(['user'], 'credentials_user'); - } +// if (!$schema->hasTable('credentials')) { +// $table = $schema->createTable('credentials'); +// $table->addColumn('user', 'string', [ +// 'notnull' => false, +// 'length' => 64, +// ]); +// $table->addColumn('identifier', 'string', [ +// 'notnull' => true, +// 'length' => 64, +// ]); +// $table->addColumn('credentials', 'text', [ +// 'notnull' => false, +// ]); +// $table->setPrimaryKey(['user', 'identifier']); +// $table->addIndex(['user'], 'credentials_user'); +// } if (!$schema->hasTable('admin_sections')) { $table = $schema->createTable('admin_sections'); diff --git a/core/Migrations/Version20000Date20201109081915.php b/core/Migrations/Version20000Date20201109081915.php index 720f54d8e8..d19c9ca0bb 100644 --- a/core/Migrations/Version20000Date20201109081915.php +++ b/core/Migrations/Version20000Date20201109081915.php @@ -43,7 +43,7 @@ class Version20000Date20201109081915 extends SimpleMigrationStep { $result = $this->ensureColumnIsNullable($schema, 'share', 'password_by_talk'); $result = $this->ensureColumnIsNullable($schema, 'share', 'hide_download') || $result; - $result = $this->ensureColumnIsNullable($schema, 'credentials', 'user') || $result; +// $result = $this->ensureColumnIsNullable($schema, 'credentials', 'user') || $result; $result = $this->ensureColumnIsNullable($schema, 'authtoken', 'password_invalid') || $result; $result = $this->ensureColumnIsNullable($schema, 'collres_accesscache', 'access') || $result; diff --git a/core/Migrations/Version20000Date20201109081918.php b/core/Migrations/Version20000Date20201109081918.php new file mode 100644 index 0000000000..8e685b200a --- /dev/null +++ b/core/Migrations/Version20000Date20201109081918.php @@ -0,0 +1,107 @@ + + * + * @author Joas Schilling + * + * @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 OC\Core\Migrations; + +use Closure; +use Doctrine\DBAL\Types\Type; +use OCP\DB\ISchemaWrapper; +use OCP\IDBConnection; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + +class Version20000Date20201109081918 extends SimpleMigrationStep { + + /** @var IDBConnection */ + protected $connection; + + public function __construct(IDBConnection $connection) { + $this->connection = $connection; + } + + /** + * @param IOutput $output + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param array $options + * @return null|ISchemaWrapper + */ + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + + $table = $schema->createTable('storages_credentials'); + $table->addColumn('id', Type::BIGINT, [ + 'autoincrement' => true, + 'notnull' => true, + 'length' => 64, + ]); + $table->addColumn('user', Type::STRING, [ + 'notnull' => false, + 'length' => 64, + ]); + $table->addColumn('identifier', Type::STRING, [ + 'notnull' => true, + 'length' => 64, + ]); + $table->addColumn('credentials', Type::TEXT, [ + 'notnull' => false, + ]); + $table->setPrimaryKey(['id']); + $table->addUniqueIndex(['user', 'identifier'], 'stocred_ui'); + $table->addIndex(['user'], 'stocred_user'); + + return $schema; + } + + /** + * {@inheritDoc} + * + * @since 13.0.0 + */ + public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options): void { + if (!$this->connection->tableExists('credentials')) { + return; + } + + $query = $this->connection->getQueryBuilder(); + $query->select('*') + ->from('credentials'); + + $insert = $this->connection->getQueryBuilder(); + $insert->insert('storages_credentials') + ->setValue('user', $insert->createNamedParameter('user')) + ->setValue('identifier', $insert->createNamedParameter('identifier')) + ->setValue('credentials', $insert->createNamedParameter('credentials')); + + $result = $query->execute(); + while ($row = $result->fetch()) { + $insert->setParameter('user', (string) $row['user']) + ->setParameter('identifier', (string) $row['identifier']) + ->setParameter('credentials', (string) $row['credentials']); + $insert->execute(); + } + $result->closeCursor(); + } +} diff --git a/core/Migrations/Version20000Date20201109081919.php b/core/Migrations/Version20000Date20201109081919.php new file mode 100644 index 0000000000..bfc7080ab4 --- /dev/null +++ b/core/Migrations/Version20000Date20201109081919.php @@ -0,0 +1,52 @@ + + * + * @author Joas Schilling + * + * @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 OC\Core\Migrations; + +use Closure; +use OCP\DB\ISchemaWrapper; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + +class Version20000Date20201109081919 extends SimpleMigrationStep { + + /** + * @param IOutput $output + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param array $options + * @return null|ISchemaWrapper + */ + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + + if ($schema->hasTable('credentials')) { + $schema->dropTable('credentials'); + return $schema; + } + + return null; + } +} diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index bfa087bf5f..16f3b4c9b0 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -923,6 +923,8 @@ return array( 'OC\\Core\\Migrations\\Version18000Date20191204114856' => $baseDir . '/core/Migrations/Version18000Date20191204114856.php', 'OC\\Core\\Migrations\\Version19000Date20200211083441' => $baseDir . '/core/Migrations/Version19000Date20200211083441.php', 'OC\\Core\\Migrations\\Version20000Date20201109081915' => $baseDir . '/core/Migrations/Version20000Date20201109081915.php', + 'OC\\Core\\Migrations\\Version20000Date20201109081918' => $baseDir . '/core/Migrations/Version20000Date20201109081918.php', + 'OC\\Core\\Migrations\\Version20000Date20201109081919' => $baseDir . '/core/Migrations/Version20000Date20201109081919.php', 'OC\\Core\\Notification\\RemoveLinkSharesNotifier' => $baseDir . '/core/Notification/RemoveLinkSharesNotifier.php', 'OC\\Core\\Service\\LoginFlowV2Service' => $baseDir . '/core/Service/LoginFlowV2Service.php', 'OC\\DB\\Adapter' => $baseDir . '/lib/private/DB/Adapter.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 82143b4b04..1b8e31bba3 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -952,6 +952,8 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Core\\Migrations\\Version18000Date20191204114856' => __DIR__ . '/../../..' . '/core/Migrations/Version18000Date20191204114856.php', 'OC\\Core\\Migrations\\Version19000Date20200211083441' => __DIR__ . '/../../..' . '/core/Migrations/Version19000Date20200211083441.php', 'OC\\Core\\Migrations\\Version20000Date20201109081915' => __DIR__ . '/../../..' . '/core/Migrations/Version20000Date20201109081915.php', + 'OC\\Core\\Migrations\\Version20000Date20201109081918' => __DIR__ . '/../../..' . '/core/Migrations/Version20000Date20201109081918.php', + 'OC\\Core\\Migrations\\Version20000Date20201109081919' => __DIR__ . '/../../..' . '/core/Migrations/Version20000Date20201109081919.php', 'OC\\Core\\Notification\\RemoveLinkSharesNotifier' => __DIR__ . '/../../..' . '/core/Notification/RemoveLinkSharesNotifier.php', 'OC\\Core\\Service\\LoginFlowV2Service' => __DIR__ . '/../../..' . '/core/Service/LoginFlowV2Service.php', 'OC\\DB\\Adapter' => __DIR__ . '/../../..' . '/lib/private/DB/Adapter.php', diff --git a/lib/private/Security/CredentialsManager.php b/lib/private/Security/CredentialsManager.php index 20af25ae10..2a480ef710 100644 --- a/lib/private/Security/CredentialsManager.php +++ b/lib/private/Security/CredentialsManager.php @@ -35,7 +35,7 @@ use OCP\Security\ICrypto; * @package OC\Security */ class CredentialsManager implements ICredentialsManager { - public const DB_TABLE = 'credentials'; + public const DB_TABLE = 'storages_credentials'; /** @var ICrypto */ protected $crypto; diff --git a/version.php b/version.php index efe744daba..dc48f4bc52 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = [21, 0, 0, 3]; +$OC_Version = [21, 0, 0, 5]; // The human readable string $OC_VersionString = '21.0.0 alpha';