Skip to content

Commit 7c81200

Browse files
authored
Merge pull request #14791 from nextcloud/fix/recovery-key-documentation-1340
docs: Clarify recovery key documentation for master key vs. per-user key modes
2 parents a9e427c + 706f924 commit 7c81200

1 file changed

Lines changed: 29 additions & 4 deletions

File tree

admin_manual/configuration_files/encryption_configuration.rst

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,21 +114,24 @@ Before You Enable Encryption
114114
2. Back up your instance configuration and all encryption keys in a safe location before proceeding.
115115
3. Decide which key management mode suits your needs (see below).
116116

117+
.. _encryption_configuration_key_management_modes:
118+
117119
Key Management Modes
118120
--------------------
119121

120122
**Master Key (default):**
121123

122124
- All files are encrypted with a central server-controlled key.
123125
- Admins can decrypt any user’s files.
124-
- Offers better performance and compatibility with more login/authentication modes.
125-
- Best for organizations that need to recover files if users forget their passwords.
126+
- **Recovery keys are not available in master key mode.** Files remain accessible if a user forgets their password, as they are encrypted by the master key, not the user password.
127+
- Recommended for most deployments.
126128

127129
**User Keys:**
128130

129131
- Each user’s files are encrypted with a password-protected key.
130132
- Admins cannot (readily) decrypt files without the user's password, unless a recovery key is defined.
131133
- If a user forgets their password and no recovery key exists, their files are lost.
134+
- This mode does not work with all authentication methods (e.g., app passwords, single sign-on) and is only recommended for compatibility with older setups.
132135

133136
**How to choose:**
134137

@@ -308,12 +311,18 @@ User Keys: Sharing & Recovery
308311

309312
**Enabling file recovery keys:**
310313

314+
Recovery keys are only available in per-user key mode (not the default master key mode).
315+
311316
- If you lose your Nextcloud password, you lose access to your encrypted files.
312-
- If a user loses their password, their files are unrecoverable unless a recovery key is enabled.
313-
- To enable recovery, go to Encryption in Admin page and set a recovery key password.
317+
- If a user loses their password, their files are unrecoverable unless a recovery key is enabled (per-user key mode only).
318+
- To enable recovery (in per-user key mode), go to Encryption in Admin page and set a recovery key password.
314319
- Users must enable password recovery in their Personal settings for the Recovery Key to work.
315320
- For users who have enabled password recovery, admins can reset passwords and recover files using the Recovery Key.
316321

322+
.. warning::
323+
The recovery process can be slow and resource-intensive, especially for instances with large amounts of encrypted data.
324+
Test recovery procedures before relying on them in production.
325+
317326
.. figure:: images/encryption10.png
318327
.. figure:: images/encryption7.png
319328
.. figure:: images/encryption8.png
@@ -328,6 +337,22 @@ LDAP and External User Backends
328337
Troubleshooting
329338
---------------
330339

340+
Why don't I see the recovery key option in the Encryption settings?
341+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
342+
343+
Recovery keys are only available in per-user key mode. Since Nextcloud 13, the default
344+
encryption mode uses master keys (system-wide encryption). Master key mode does not expose
345+
recovery key options in the Admin settings because recovery keys are not needed—admins can
346+
reset user passwords and files remain accessible.
347+
348+
If you are using master key mode (the default and recommended mode), you do not need recovery
349+
keys. Recovery keys are only relevant for per-user key setups, which are maintained for
350+
compatibility with older deployments.
351+
352+
See :ref:`Key Management Modes <encryption_configuration_key_management_modes>` for guidance
353+
on the differences between master key and per-user key modes, and `GitHub Issue #8283
354+
<https://github.com/nextcloud/server/issues/8283>`_ for technical context on this design decision.
355+
331356
Invalid private key for encryption app
332357
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
333358

0 commit comments

Comments
 (0)