diff options
| author | Travis Ralston <travpc@gmail.com> | 2021-02-02 07:26:36 -0700 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2021-02-02 07:26:36 -0700 |
| commit | 6ec034411cdad6f9f77f7dab7749d426ffd5744b (patch) | |
| tree | d7935121ad99051eddf5769993bef674e618379e /synapse/config/cas.py | |
| parent | Appease the linters (diff) | |
| parent | Update changelog (diff) | |
| download | synapse-github/travis/fosdem/admin-api-groups.tar.xz | |
Merge branch 'develop' into travis/fosdem/admin-api-groups github/travis/fosdem/admin-api-groups travis/fosdem/admin-api-groups
Diffstat (limited to 'synapse/config/cas.py')
| -rw-r--r-- | synapse/config/cas.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/synapse/config/cas.py b/synapse/config/cas.py index c7877b4095..b226890c2a 100644 --- a/synapse/config/cas.py +++ b/synapse/config/cas.py @@ -30,7 +30,13 @@ class CasConfig(Config): if self.cas_enabled: self.cas_server_url = cas_config["server_url"] - self.cas_service_url = cas_config["service_url"] + public_base_url = cas_config.get("service_url") or self.public_baseurl + if public_base_url[-1] != "/": + public_base_url += "/" + # TODO Update this to a _synapse URL. + self.cas_service_url = ( + public_base_url + "_matrix/client/r0/login/cas/ticket" + ) self.cas_displayname_attribute = cas_config.get("displayname_attribute") self.cas_required_attributes = cas_config.get("required_attributes") or {} else: @@ -53,10 +59,6 @@ class CasConfig(Config): # #server_url: "https://cas-server.com" - # The public URL of the homeserver. - # - #service_url: "https://homeserver.domain.com:8448" - # The attribute of the CAS response to use as the display name. # # If unset, no displayname will be set. |