refactor(encryption): Migrate appconfig keys to typed bool IAppConfig with repair step by cuppett · Pull Request #60002 · nextcloud/server

cuppett · 2026-04-29T23:58:51Z

Summary

Switch all encryption config reads/writes from deprecated string-typed IConfig to bool-typed IAppConfig (getValueBool/setValueBool). Adds RetypeEncryptionConfigKeys repair step to retype existing string values to bool on upgrade. Includes lazy IAppConfig resolution in Manager and AppConfigTypeConflictException fallbacks throughout for safety during the upgrade window.

Spawned from fix(encryption): Refactor EncryptionWrapper, fix zero-byte size, add S3 tests #57279
Resolves: [Bug]: de-crypting then re-encrypting (SSE) triggers conflict between new type (mixed) and old type (boolean) #58778

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included
Screenshots before/after for front-end changes
Documentation (manuals or wiki) has been updated or is not required
Backports requested where applicable (ex: critical bugfixes)
Labels added where applicable (ex: bug/enhancement, 3. to review, feature component)
Milestone added for target branch/version (ex: 32.x for stable32)

AI (if applicable)

The content of this PR was partly or fully generated using AI

cuppett

I don't know the convention when trying to refactor the legacy values out. Happy to simplify to only the minimal set or wait until next version for another PR. Just LMK.

cuppett · 2026-05-01T13:49:05Z

The psalm things (DAV) seem to be coming from the master branch (not related to this PR). Do I need to fix that or can it be overridden to merge?

artonge

Looks good, thanks for splitting :)

The psalm error is indeed unrelated.

cuppett · 2026-06-10T15:41:03Z

Rebased, fixed some nit conflicts, caught a couple new occurrences of IConfig and force-pushed.

cuppett · 2026-06-20T15:40:07Z

Resolved conflicts, rebased on master

Unclear why this is still set. Resolved comments. Thanks!

cuppett · 2026-06-22T10:45:40Z

@artonge I can't tell why this one isn't merging, can you assist here?

… with repair step Switch all encryption config reads/writes from deprecated string-typed IConfig to bool-typed IAppConfig (getValueBool/setValueBool). Adds RetypeEncryptionConfigKeys repair step to retype existing string values to bool on upgrade. Includes lazy IAppConfig resolution in Manager and AppConfigTypeConflictException fallbacks throughout for safety during the upgrade window. Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Stephen Cuppett <steve@cuppett.com>

Signed-off-by: Stephen Cuppett <steve@cuppett.com>

@artonge

Apply suggestion from @artonge Co-authored-by: Louis <louis@chmn.me> Signed-off-by: Stephen Cuppett <steve@cuppett.com>

Co-authored-by: Louis <louis@chmn.me> Signed-off-by: Stephen Cuppett <steve@cuppett.com>

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>

… to match strict 'yes'-only validation The verifyConfigKey check on core.encryption_enabled was reverted to master's strict $value !== 'yes' in 626fadd per review feedback, but the test data providers still asserted the broader truthy set (1/true/YES/on). Drop those entries so the tests match the controller. This is validation, not storage — IAppConfig::setValueBool's broader input handling is unrelated. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Signed-off-by: Stephen Cuppett <steve@cuppett.com>

Update to annotation from docblock comment Co-authored-by: Kate <26026535+provokateurin@users.noreply.github.com> Signed-off-by: Stephen Cuppett <steve@cuppett.com>

Co-authored-by: Kate <26026535+provokateurin@users.noreply.github.com> Signed-off-by: Stephen Cuppett <steve@cuppett.com>

…AdminTest The production code already uses getValueBool for this key; the IConfig mock branch was unreachable. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Signed-off-by: Stephen Cuppett <steve@cuppett.com>

…yped APIs Replace IConfig::{get,set}UserValue for the per-user 'recoveryEnabled' key with IUserConfig::{getValueBool,setValueBool}, and IConfig::getAppValue for 'useMasterKey' with IAppConfig::getValueBool. IConfig is removed from Util and Recovery constructors entirely. Clears the DeprecatedMethod psalm-baseline entries for apps/encryption/lib/Util.php and the string-typed recoveryAdminEnabled calls that were still in Recovery.php. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Signed-off-by: Stephen Cuppett <steve@cuppett.com>

… in encryption tests Addresses reviewer feedback requesting consistent mock callback style in RecoveryTest and UtilTest. Drops the now-unused setValueTester, getValueTester, and removeValueTester helper methods. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Signed-off-by: Stephen Cuppett <steve@cuppett.com>

Signed-off-by: Stephen Cuppett <steve@cuppett.com>

Update EncryptionTrait, EncryptionMasterKeyUploadTest, EncryptionUploadTest, and EncryptedSizePropagationTest to use typed IAppConfig::setValueBool/ getValueBool for encryption_enabled and useMasterKey, preventing AppConfigTypeConflictException when the keys are stored as BOOL type. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Stephen Cuppett <steve@cuppett.com>

cuppett · 2026-07-04T12:19:24Z

Rebase only

cuppett requested a review from a team as a code owner April 29, 2026 23:58

cuppett requested review from Altahrim, ArtificialOwl, leftybournes and salmart-dev and removed request for a teamApril 29, 2026 23:58

cuppett added this to the Nextcloud 34 milestone Apr 29, 2026

cuppett added 3. to review Waiting for reviews feature: encryption (server-side) labels Apr 29, 2026

cuppett mentioned this pull request Apr 30, 2026
fix(encryption): Refactor EncryptionWrapper with HomeMountPoint support #60001
Merged
6 tasks

cuppett commented Apr 30, 2026
View reviewed changes

Comment threadcore/Command/Encryption/Disable.php Outdated

CarlSchwan reviewed Apr 30, 2026
View reviewed changes

Comment threadcore/Command/Encryption/DecryptAll.php Outdated

CarlSchwan reviewed Apr 30, 2026
View reviewed changes

Comment threadcore/Command/Encryption/Disable.php Outdated

cuppett force-pushed the cuppett/migrate-appconfig-keys-to-bool branch from 864ad6a to f3679b4Compare April 30, 2026 11:10

cuppett requested a review from CarlSchwan April 30, 2026 11:11

cuppett force-pushed the cuppett/migrate-appconfig-keys-to-bool branch from f3679b4 to 39b6d31Compare April 30, 2026 15:45

artonge reviewed Apr 30, 2026
View reviewed changes

Comment threadapps/encryption/lib/Util.php Outdated
Comment threadapps/provisioning_api/lib/Controller/AppConfigController.php Outdated
Comment threadlib/private/Repair/RetypeEncryptionConfigKeys.php Outdated

cuppett force-pushed the cuppett/migrate-appconfig-keys-to-bool branch from a6fff8f to e4f6eceCompare April 30, 2026 23:13

cuppett requested a review from provokateurin as a code owner April 30, 2026 23:13

cuppett force-pushed the cuppett/migrate-appconfig-keys-to-bool branch 4 times, most recently from e5291af to 07461eeCompare May 1, 2026 12:24

cuppett requested a review from artonge May 1, 2026 13:50

artonge approved these changes May 1, 2026
View reviewed changes

cuppett force-pushed the cuppett/migrate-appconfig-keys-to-bool branch from 6e52b67 to c4baa76Compare May 1, 2026 17:05

artonge force-pushed the cuppett/migrate-appconfig-keys-to-bool branch from c4baa76 to ef7b789Compare May 5, 2026 14:10

cuppett force-pushed the cuppett/migrate-appconfig-keys-to-bool branch from ef7b789 to 9f0c402Compare May 5, 2026 16:32

cuppett enabled auto-merge May 5, 2026 17:03

nextcloud-bot added this to the Nextcloud 34.0.1 milestone Jun 8, 2026

susnux added the community pull requests from community label Jun 9, 2026

susnux modified the milestones: Nextcloud 34.0.1, Nextcloud 35 Jun 9, 2026

cuppett added the AI assisted label Jun 10, 2026

cuppett force-pushed the cuppett/migrate-appconfig-keys-to-bool branch from b7d805f to 50ec557Compare June 10, 2026 15:39

cuppett force-pushed the cuppett/migrate-appconfig-keys-to-bool branch from 50ec557 to ad56a2eCompare June 20, 2026 15:39

cuppett force-pushed the cuppett/migrate-appconfig-keys-to-bool branch from ad56a2e to c34edcbCompare June 20, 2026 15:46

cuppettand others added 13 commits July 4, 2026 08:19

fix(encryption): Assume boolValue for commands
5ee3cea
Signed-off-by: Stephen Cuppett <steve@cuppett.com>

fix(encryption): Missed explicit typing
1f09a72
Apply suggestion from @artonge Co-authored-by: Louis <louis@chmn.me> Signed-off-by: Stephen Cuppett <steve@cuppett.com>

fix(encryption): Simplify evaluation in AppConfigController
4813478
Co-authored-by: Louis <louis@chmn.me> Signed-off-by: Stephen Cuppett <steve@cuppett.com>

fix(tests): Update tests/lib/Encryption/ManagerTest.php
7637213
Update to annotation from docblock comment Co-authored-by: Kate <26026535+provokateurin@users.noreply.github.com> Signed-off-by: Stephen Cuppett <steve@cuppett.com>

fix(encryption): No need for default values to be explicitly specified.
e818f98
Co-authored-by: Kate <26026535+provokateurin@users.noreply.github.com> Signed-off-by: Stephen Cuppett <steve@cuppett.com>

fix(encryption): Remove extra try/catch
37a0d68
Signed-off-by: Stephen Cuppett <steve@cuppett.com>

cuppett force-pushed the cuppett/migrate-appconfig-keys-to-bool branch from c34edcb to b86fa0dCompare July 4, 2026 12:19

cuppett merged commit 507c0a7 into nextcloud:masterJul 7, 2026
224 of 231 checks passed

cuppett deleted the cuppett/migrate-appconfig-keys-to-bool branch August 6, 2026 01:29

nextcloud-bot mentioned this pull request Aug 11, 2026
35.0.0 beta 1 #63162
Merged

Navigation Menu

Uh oh!

Uh oh!

refactor(encryption): Migrate appconfig keys to typed bool IAppConfig with repair step - #60002

refactor(encryption): Migrate appconfig keys to typed bool IAppConfig with repair step#60002
cuppett merged 13 commits into
nextcloud:masterfrom
cuppett:cuppett/migrate-appconfig-keys-to-bool

cuppett commented Apr 29, 2026•
edited
Loading

Uh oh!

cuppett left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cuppett commented May 1, 2026

Uh oh!

artonge left a comment

Uh oh!

cuppett commented Jun 10, 2026

Uh oh!

cuppett commented Jun 20, 2026

Uh oh!

cuppett commented Jun 22, 2026

Uh oh!

cuppett commented Jul 4, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Uh oh!

Conversation

cuppett commented Apr 29, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Checklist

AI (if applicable)

Uh oh!

cuppett left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cuppett commented May 1, 2026

Uh oh!

artonge left a comment

Choose a reason for hiding this comment

Uh oh!

cuppett commented Jun 10, 2026

Uh oh!

cuppett commented Jun 20, 2026

Uh oh!

cuppett commented Jun 22, 2026

Uh oh!

cuppett commented Jul 4, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

cuppett commented Apr 29, 2026•
edited
Loading