Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-04-29 22:04:08 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Move key_backup from its own module into end_to_end_encryption.md

Browse source
This commit is contained in:
Andy Balaam 2026-04-15 11:28:34 +01:00
parent 867c96c22b
commit 51c049a232
3 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
content/client-server-api/_index.md
View file

@ -4386,6 +4386,5 @@ systems.
{{% cs-module name="Event replacements" filename="event_replacements" %}} {{% cs-module name="Event replacements" filename="event_replacements" %}}
{{% cs-module name="Event annotations and reactions" filename="event_annotations" %}} {{% cs-module name="Event annotations and reactions" filename="event_annotations" %}}
{{% cs-module name="Recently used emoji" filename="recent_emoji" %}} {{% cs-module name="Recently used emoji" filename="recent_emoji" %}}
{{% cs-module name="Key backup enabled" filename="key_backup_enabled" %}}
{{% cs-module name="Threading" filename="threading" %}} {{% cs-module name="Threading" filename="threading" %}}
{{% cs-module name="Reference relations" filename="reference_relations" %}} {{% cs-module name="Reference relations" filename="reference_relations" %}}

45
content/client-server-api/modules/end_to_end_encryption.md
View file

@ -1528,6 +1528,51 @@ objects described as follows:
{{% definition path="api/client-server/definitions/megolm_export_session_data" %}} {{% definition path="api/client-server/definitions/megolm_export_session_data" %}}
###### Key backup enabled
{{% added-in v="1.19" %}}
This module enables clients to track a user's preference about enabling or
disabling [server-side backups of room keys](#server-side-key-backups). The data
is stored in the [`m.key_backup`](#mkey_backup) global
[account data](#client-config).
####### Events
{{% event event="m.key_backup" %}}
####### Client behaviour on sign-in
When a user signs in to a client which supports encryption and key backup:
* If this event type exists in account data and contains the specified property
in the correct format, clients which support key backup MUST take account of
its contents in their behaviour. For example, clients may automatically turn
on/off key backup based on the property, or prompt the user, using the
property value as a default. (Because this property is server-controlled,
clients may wish to confirm the user's intention.)
* If this event type does not exist in account data, or if it does not contain
the `enabled` property, or if the value of `enabled` is not a boolean value,
clients MUST ignore the existing value and MAY decide whether or not to
perform key backup, possibly based on user input.
####### Client behaviour on setting change
If the user turns on key backups, clients MUST set this event type in account
data, to `"enabled": true`.
If the user turns off key backups, clients MUST set this event type in account
data, to `"enabled": false`.
####### Not actively monitoring this setting
Clients are not required to monitor the `m.key_backup` account data actively.
Clients MAY monitor the setting but should be aware that changing this setting
without user interaction based on choices made in a different client (or a
compromised homeserver) may cause unforeseen security problems or simply be
unexpected by users.
#### Messaging Algorithms #### Messaging Algorithms
##### Messaging Algorithm Names ##### Messaging Algorithm Names

44
content/client-server-api/modules/key_backup_enabled.md
View file

@ -1,44 +0,0 @@
### Key backup enabled
{{% added-in v="1.19" %}}
This module enables clients to track a user's preference about enabling or
disabling [server-side backups of room keys](#server-side-key-backups). The data
is stored in the [`m.key_backup`](#mkey_backup) global
[account data](#client-config).
#### Events
{{% event event="m.key_backup" %}}
#### Client behaviour on sign-in
When a user signs in to a client which supports encryption and key backup:
* If this event type exists in account data and contains the specified property
in the correct format, clients which support key backup MUST take account of
its contents in their behaviour. For example, clients may automatically turn
on/off key backup based on the property, or prompt the user, using the
property value as a default. (Because this property is server-controlled,
clients may wish to confirm the user's intention.)
* If this event type does not exist in account data, or if it does not contain
the `enabled` property, or if the value of `enabled` is not a boolean value,
clients MUST ignore the existing value and MAY decide whether or not to
perform key backup, possibly based on user input.
#### Client behaviour on setting change
If the user turns on key backups, clients MUST set this event type in account
data, to `"enabled": true`.
If the user turns off key backups, clients MUST set this event type in account
data, to `"enabled": false`.
#### Not actively monitoring this setting
Clients are not required to monitor the `m.key_backup` account data actively.
Clients MAY monitor the setting but should be aware that changing this setting
without user interaction based on choices made in a different client (or a
compromised homeserver) may cause unforeseen security problems or simply be
unexpected by users.