summary refs log tree commit diff
path: root/synapse/config/cas.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-13 13:19:23 +0100
committerErik Johnston <erik@matrix.org>2015-10-13 13:29:02 +0100
commitf9340ea0d5346bb07489b1bd03bb90ea8f437e42 (patch)
tree3cb14e0a740aa768df674d08bb51c53970a215cb /synapse/config/cas.py
parentSearch left rooms too (diff)
parentExpose error more nicely (diff)
downloadsynapse-f9340ea0d5346bb07489b1bd03bb90ea8f437e42.tar.xz
Merge branch 'erikj/store_engine' into erikj/search
Diffstat (limited to 'synapse/config/cas.py')
-rw-r--r--synapse/config/cas.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/config/cas.py b/synapse/config/cas.py
index 81d034e8f0..d268680729 100644
--- a/synapse/config/cas.py
+++ b/synapse/config/cas.py
@@ -27,13 +27,17 @@ class CasConfig(Config):
         if cas_config:
             self.cas_enabled = True
             self.cas_server_url = cas_config["server_url"]
+            self.cas_required_attributes = cas_config.get("required_attributes", {})
         else:
             self.cas_enabled = False
             self.cas_server_url = None
+            self.cas_required_attributes = {}
 
     def default_config(self, config_dir_path, server_name, **kwargs):
         return """
         # Enable CAS for registration and login.
         #cas_config:
         #   server_url: "https://cas-server.com"
+        #   #required_attributes:
+        #   #    name: value
         """