fix(encryption): Refactor EncryptionWrapper with HomeMountPoint support#60001
Open
cuppett wants to merge 3 commits intonextcloud:masterfrom
Open
fix(encryption): Refactor EncryptionWrapper with HomeMountPoint support#60001cuppett wants to merge 3 commits intonextcloud:masterfrom
cuppett wants to merge 3 commits intonextcloud:masterfrom
Conversation
cuppett
requested review from
Altahrim,
ArtificialOwl,
leftybournes and
salmart-dev
and removed request for
a team
cuppett
added
3. to review
cuppett
added
feature: encryption (server-side)
and removed
feature: encryption (client-side)
labels
artonge
reviewed
Apr 30, 2026
cuppett
force-pushed
the
refactor/encryption-wrapper-homemount-support
branch
from
8ce989d to
74f93c6
Compare
cuppett
requested review from
a team,
ChristophWurst,
SebastianKrupinski and
tcitworld
as code owners
cuppett
requested review from
nfebe,
sorbaugh and
susnux
and removed request for
a team
cuppett
force-pushed
the
refactor/encryption-wrapper-homemount-support
branch
2 times, most recently
from
d373b56 to
c3abeeb
Compare
Contributor
Author
|
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? |
cuppett
force-pushed
the
refactor/encryption-wrapper-homemount-support
branch
2 times, most recently
from
50d689a to
af27b5d
Compare
cuppett
force-pushed
the
refactor/encryption-wrapper-homemount-support
branch
3 times, most recently
from
35e1d9c to
442ddc3
Compare
Rewrite conditional flow to use early-return guards: skip IDisableEncryptionStorage, skip the root mount, respect encryptHomeStorage for HomeMountPoints. Uses IAppConfig for the encryptHomeStorage setting with a legacy string fallback for 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>
…tion creation
Injecting IAppConfig as a constructor parameter into Encryption\Manager (and
through it into EncryptionWrapper) caused IDBConnection to be eagerly resolved
during OC::init() on PHP <8.4 (no lazy ghost objects). This happened before
maintenance:install's Sqlite::initialize() wrote dbname to config.php, so the
connection latched onto the default database name ('owncloud') instead of the
configured one ('nextcloud'). All migrations then ran against owncloud.db, and
the subsequent enable_all.php process opened an empty nextcloud.db — crashing
with "no such table: oc_appconfig".
Remove IAppConfig from Manager's constructor and Server.php's factory closure.
Resolve it lazily via Server::get(IAppConfig::class) inside
EncryptionWrapper::wrapStorage(), which is only called after the filesystem is
set up, never during bootstrap.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Signed-off-by: Stephen Cuppett <steve@cuppett.com>
miaulalala
force-pushed
the
refactor/encryption-wrapper-homemount-support
branch
from
442ddc3 to
af2453e
Compare
miaulalala
approved these changes
May 6, 2026
come-nc
reviewed
May 7, 2026
Comment on lines
+75
to
+78
| if ($mount instanceof HomeMountPoint | ||
| && !Server::get(IAppConfig::class)->getValueBool('encryption', 'encryptHomeStorage', true)) { | ||
| return $storage; | ||
| } |
Contributor
There was a problem hiding this comment.
This means the encryption wrapper will not be around home storages anymore.
At the very least it will be an issue when the option was set to true and is then set to false, because existing encrypted files will not be decrypted.
Can you detail what this is attempting to fix?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Rewrite conditional flow to use early-return guards: skip IDisableEncryptionStorage, skip the root mount, respect encryptHomeStorage for HomeMountPoints. Uses IAppConfig for the encryptHomeStorage setting with a legacy string fallback for the upgrade window.
Spawned from #57279
Checklist
3. to review, feature component)stable32)AI (if applicable)