diff options
| author | Neil Johnson <neil@matrix.org> | 2018-11-20 11:29:25 +0000 |
|---|---|---|
| committer | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-11-20 12:29:25 +0100 |
| commit | 78ba0e7ab8f1d57eee6aa56e9d496d838a24c6f3 (patch) | |
| tree | ccd3228cc5ee3ebdf142aedc69ddb18cd13b9432 | |
| parent | Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixes (diff) | |
| download | synapse-78ba0e7ab8f1d57eee6aa56e9d496d838a24c6f3.tar.xz | |
Remove riot.im from the list of trusted Identity Servers in the default configuration (#4207)
Diffstat (limited to '')
| -rw-r--r-- | changelog.d/4207.bugfix | 1 | ||||
| -rw-r--r-- | docker/conf/homeserver.yaml | 4 | ||||
| -rw-r--r-- | synapse/config/registration.py | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/changelog.d/4207.bugfix b/changelog.d/4207.bugfix new file mode 100644 index 0000000000..c1ec9f6329 --- /dev/null +++ b/changelog.d/4207.bugfix @@ -0,0 +1 @@ +Remove riot.im from the list of trusted Identity Servers in the default configuration diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml index 1b0f655d26..d5074be6dd 100644 --- a/docker/conf/homeserver.yaml +++ b/docker/conf/homeserver.yaml @@ -150,10 +150,12 @@ enable_group_creation: true # The list of identity servers trusted to verify third party # identifiers by this server. +# +# Also defines the ID server which will be called when an account is +# deactivated (one will be picked arbitrarily). trusted_third_party_id_servers: - matrix.org - vector.im - - riot.im ## Metrics ### diff --git a/synapse/config/registration.py b/synapse/config/registration.py index 7480ed5145..717bbfec61 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -93,10 +93,12 @@ class RegistrationConfig(Config): # The list of identity servers trusted to verify third party # identifiers by this server. + # + # Also defines the ID server which will be called when an account is + # deactivated (one will be picked arbitrarily). trusted_third_party_id_servers: - matrix.org - vector.im - - riot.im # Users who register on this homeserver will automatically be joined # to these rooms |