Skip to content

Commit 07461ee

Browse files
cuppettclaude
andcommitted
refactor(encryption): Drop RetypeEncryptionConfigKeys repair step
The IAppConfig API converts stored values to bool on read (getValueBool) and re-stamps the type on write (setValueBool), so legacy string-typed encryption config keys migrate lazily without an explicit repair step. Per PR review feedback, drop the repair step, its test, and the related AppConfigTypeConflictException fallback in Encryption\Manager::isEnabled that only existed to bridge the now-unneeded migration window. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Signed-off-by: Stephen Cuppett <steve@cuppett.com>
1 parent 2625662 commit 07461ee

6 files changed

Lines changed: 0 additions & 166 deletions

File tree

lib/composer/composer/autoload_classmap.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2094,7 +2094,6 @@
20942094
'OC\\Repair\\RepairInvalidShares' => $baseDir . '/lib/private/Repair/RepairInvalidShares.php',
20952095
'OC\\Repair\\RepairLogoDimension' => $baseDir . '/lib/private/Repair/RepairLogoDimension.php',
20962096
'OC\\Repair\\RepairMimeTypes' => $baseDir . '/lib/private/Repair/RepairMimeTypes.php',
2097-
'OC\\Repair\\RetypeEncryptionConfigKeys' => $baseDir . '/lib/private/Repair/RetypeEncryptionConfigKeys.php',
20982097
'OC\\RichObjectStrings\\RichTextFormatter' => $baseDir . '/lib/private/RichObjectStrings/RichTextFormatter.php',
20992098
'OC\\RichObjectStrings\\Validator' => $baseDir . '/lib/private/RichObjectStrings/Validator.php',
21002099
'OC\\Route\\CachingRouter' => $baseDir . '/lib/private/Route/CachingRouter.php',

lib/composer/composer/autoload_static.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2135,7 +2135,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
21352135
'OC\\Repair\\RepairInvalidShares' => __DIR__ . '/../../..' . '/lib/private/Repair/RepairInvalidShares.php',
21362136
'OC\\Repair\\RepairLogoDimension' => __DIR__ . '/../../..' . '/lib/private/Repair/RepairLogoDimension.php',
21372137
'OC\\Repair\\RepairMimeTypes' => __DIR__ . '/../../..' . '/lib/private/Repair/RepairMimeTypes.php',
2138-
'OC\\Repair\\RetypeEncryptionConfigKeys' => __DIR__ . '/../../..' . '/lib/private/Repair/RetypeEncryptionConfigKeys.php',
21392138
'OC\\RichObjectStrings\\RichTextFormatter' => __DIR__ . '/../../..' . '/lib/private/RichObjectStrings/RichTextFormatter.php',
21402139
'OC\\RichObjectStrings\\Validator' => __DIR__ . '/../../..' . '/lib/private/RichObjectStrings/Validator.php',
21412140
'OC\\Route\\CachingRouter' => __DIR__ . '/../../..' . '/lib/private/Route/CachingRouter.php',

lib/private/Encryption/Manager.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use OC\ServiceUnavailableException;
1717
use OCP\Encryption\IEncryptionModule;
1818
use OCP\Encryption\IManager;
19-
use OCP\Exceptions\AppConfigTypeConflictException;
2019
use OCP\Files\Mount\IMountPoint;
2120
use OCP\Files\Storage\IStorage;
2221
use OCP\IConfig;
@@ -52,11 +51,6 @@ public function isEnabled() {
5251

5352
try {
5453
return Server::get(\OCP\IAppConfig::class)->getValueBool('core', 'encryption_enabled', false);
55-
} catch (AppConfigTypeConflictException) {
56-
// Stored as VALUE_STRING from a pre-upgrade installation.
57-
// RetypeEncryptionConfigKeys repair step will fix the type on occ upgrade.
58-
$raw = Server::get(\OCP\IAppConfig::class)->getValueString('core', 'encryption_enabled', 'no');
59-
return in_array(strtolower(trim($raw)), ['1', 'true', 'yes', 'on'], true);
6054
} catch (\Throwable) {
6155
// DB not ready (e.g. oc_appconfig does not yet exist during install).
6256
return false;

lib/private/Repair.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
use OC\Repair\RepairInvalidShares;
5757
use OC\Repair\RepairLogoDimension;
5858
use OC\Repair\RepairMimeTypes;
59-
use OC\Repair\RetypeEncryptionConfigKeys;
6059
use OCP\EventDispatcher\IEventDispatcher;
6160
use OCP\IConfig;
6261
use OCP\IDBConnection;
@@ -158,7 +157,6 @@ public function addStep(IRepairStep|string $repairStep, bool $includeExpensive =
158157
*/
159158
public static function getRepairSteps(bool $includeExpensive = false): array {
160159
$repairSteps = [
161-
Server::get(RetypeEncryptionConfigKeys::class),
162160
new Collation(Server::get(IConfig::class), Server::get(LoggerInterface::class), Server::get(IDBConnection::class), false),
163161
Server::get(CleanTags::class),
164162
Server::get(RepairInvalidShares::class),

lib/private/Repair/RetypeEncryptionConfigKeys.php

Lines changed: 0 additions & 55 deletions
This file was deleted.

tests/lib/Repair/RetypeEncryptionConfigKeysTest.php

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)