diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-17 14:36:15 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-17 14:36:15 +0000 |
| commit | e5038489908d544c82619901582083dbf1b5fb61 (patch) | |
| tree | 34e3624b590635eb5cc4ee21278c6869d54ccd5c /synapse/config | |
| parent | Merge pull request #380 from matrix-org/daniel/jenkins-sytest (diff) | |
| parent | Always check guest = true in macaroons (diff) | |
| download | synapse-e5038489908d544c82619901582083dbf1b5fb61.tar.xz | |
Merge pull request #349 from stevenhammerton/sh-cas-auth-via-homeserver
SH CAS auth via homeserver
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/cas.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/config/cas.py b/synapse/config/cas.py index a337ae6ca0..326e405841 100644 --- a/synapse/config/cas.py +++ b/synapse/config/cas.py @@ -27,10 +27,12 @@ class CasConfig(Config): if cas_config: self.cas_enabled = cas_config.get("enabled", True) self.cas_server_url = cas_config["server_url"] + self.cas_service_url = cas_config["service_url"] self.cas_required_attributes = cas_config.get("required_attributes", {}) else: self.cas_enabled = False self.cas_server_url = None + self.cas_service_url = None self.cas_required_attributes = {} def default_config(self, config_dir_path, server_name, **kwargs): @@ -39,6 +41,7 @@ class CasConfig(Config): #cas_config: # enabled: true # server_url: "https://cas-server.com" + # service_url: "https://homesever.domain.com:8448" # #required_attributes: # # name: value """ |