summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-03-14 15:50:40 +0000
committerErik Johnston <erik@matrix.org>2016-03-14 15:50:40 +0000
commit590fbbef03c21308c8ff038541b7ef6d33f9c5fa (patch)
treefba4b3fd65c8a3a133de3611ba024bc0bea682d1 /synapse/config
parentReturn list, not generator. (diff)
downloadsynapse-590fbbef03c21308c8ff038541b7ef6d33f9c5fa.tar.xz
Add config to create guest account on 3pid invite
Currently, when a 3pid invite request is sent to an identity server, it
includes a provisioned guest access token. This allows the link in the,
say, invite email to include the guest access token ensuring that the
same account is used each time the link is clicked.

This flow has a number of flaws, including when using different servers
or servers that have guest access disabled.

For now, we keep this implementation but hide it behind a config option
until a better flow is implemented.
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/registration.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py
index ab062d528c..87e500c97a 100644
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -37,6 +37,10 @@ class RegistrationConfig(Config):
         self.trusted_third_party_id_servers = config["trusted_third_party_id_servers"]
         self.allow_guest_access = config.get("allow_guest_access", False)
 
+        self.invite_3pid_guest = (
+            self.allow_guest_access and config.get("invite_3pid_guest", False)
+        )
+
     def default_config(self, **kwargs):
         registration_shared_secret = random_string_with_symbols(50)