diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2020-06-10 17:44:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 17:44:34 +0100 |
| commit | fcd69614411428fae1072704978a349e8c28be3d (patch) | |
| tree | e414eca9a92a0ee12548a16b4a29ed5393e29a8f /synapse/api | |
| parent | Clean-up the fallback login code. (#7657) (diff) | |
| download | synapse-fcd69614411428fae1072704978a349e8c28be3d.tar.xz | |
Add option to enable encryption by default for new rooms (#7639)
Fixes https://github.com/matrix-org/synapse/issues/2431 Adds config option `encryption_enabled_by_default_for_room_type`, which determines whether encryption should be enabled with the default encryption algorithm in private or public rooms upon creation. Whether the room is private or public is decided based upon the room creation preset that is used. Part of this PR is also pulling out all of the individual instances of `m.megolm.v1.aes-sha2` into a constant variable to eliminate typos ala https://github.com/matrix-org/synapse/pull/7637 Based on #7637
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/constants.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py index 5ec4a77ccd..6a6d32c302 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -150,3 +150,8 @@ class EventContentFields(object): # Timestamp to delete the event after # cf https://github.com/matrix-org/matrix-doc/pull/2228 SELF_DESTRUCT_AFTER = "org.matrix.self_destruct_after" + + +class RoomEncryptionAlgorithms(object): + MEGOLM_V1_AES_SHA2 = "m.megolm.v1.aes-sha2" + DEFAULT = MEGOLM_V1_AES_SHA2 |