summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-12 16:08:34 +0100
committerErik Johnston <erik@matrix.org>2015-10-12 16:08:34 +0100
commit427943907f41a94751f101963ce25bebd93f4271 (patch)
tree41f59b0bec6d27a8b51c0a6f9da3b6717ce29e40 /synapse/config
parentMerge pull request #296 from matrix-org/markjh/eventstream_presence (diff)
parentAdd a comment to clarify why we split on closing curly brace when reading CAS... (diff)
downloadsynapse-427943907f41a94751f101963ce25bebd93f4271.tar.xz
Merge pull request #299 from stevenhammerton/sh-cas-required-attribute
SH CAS Required Attribute
Diffstat (limited to 'synapse/config')
-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
         """