mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-10-01 08:25:44 -04:00
2c9b4a5f16
============================== Features -------- - Further improvements to the user experience of registration via single sign-on. ([\#9297](https://github.com/matrix-org/synapse/issues/9297)) Bugfixes -------- - Fix ratelimiting introduced in v1.27.0rc1 for invites to respect the `ratelimit` flag on application services. ([\#9302](https://github.com/matrix-org/synapse/issues/9302)) - Do not automatically calculate `public_baseurl` since it can be wrong in some situations. Reverts behaviour introduced in v1.26.0. ([\#9313](https://github.com/matrix-org/synapse/issues/9313)) Improved Documentation ---------------------- - Clarify the sample configuration for changes made to the template loading code. ([\#9310](https://github.com/matrix-org/synapse/issues/9310)) -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEF3tZXk38tRDFVnUIM/xY9qcRMEgFAmAlX4AACgkQM/xY9qcR MEjxhg/+JzOGDmgxy4Vm9oU84htkkJsflU755ykxhwbIjVy2j+07pMgtWMmebXIS /tWjinwRB9OgKIK+j5RWdYzz/GRTkLCbafTLhhNOWsnaCO7nnAfZFozLOMd9g2qN 309cS8efZkxGCISGSRm1QQKjQDx6HHx7nZVAwpqb778Q9TMrBYRAQeCk9yws7FfL GsP5YrBI42n84YhvflWA8J8QRYkeJJaggVWzE0XvwdI6raY1BmxMKcDvyl9iKpGb /QXsdketD3eJxdOlU92O5ZxRXmL00bdyAFdw2+J3Y+wjoGBnC5njKSFG3j8Z2UcP xIdB6w/zyGoPLKd4s7tkDI3axE7qrwFetA4NytannWGEHZ9q5tgOd5PA1kTeKYvn ao2os4pKMjWQOHiWLskqZVXgmoW5Kb2zgyZU/vhFAz8ImuidFULOjpEytAWqtt1B iuL/fRlM3z0BpwQNd3NBsblYTpZri8gdTp7ULJYtaKpT2MeG0sg3swJAptUjw9L4 awbQuBFZ8o/E/0xwiGieSxbR6b6Nz5WiCyLaeMz6b3Y4YdomttOAZ6pL6E9y8ygU 2wKYleSmg+tbaBKKZR5CSCwXOduSYPhWw7oqsfEfvT0NCQLuItfGNFZqxRzsf73H lCV0wwxNZBv8kRyMs6KivMvSI6SKinAjXS8AjzHE402ozdwOCv0= =NSyp -----END PGP SIGNATURE----- Merge tag 'v1.27.0rc2' into develop Synapse 1.27.0rc2 (2021-02-11) ============================== Features -------- - Further improvements to the user experience of registration via single sign-on. ([\#9297](https://github.com/matrix-org/synapse/issues/9297)) Bugfixes -------- - Fix ratelimiting introduced in v1.27.0rc1 for invites to respect the `ratelimit` flag on application services. ([\#9302](https://github.com/matrix-org/synapse/issues/9302)) - Do not automatically calculate `public_baseurl` since it can be wrong in some situations. Reverts behaviour introduced in v1.26.0. ([\#9313](https://github.com/matrix-org/synapse/issues/9313)) Improved Documentation ---------------------- - Clarify the sample configuration for changes made to the template loading code. ([\#9310](https://github.com/matrix-org/synapse/issues/9310))
108 lines
3.7 KiB
Python
108 lines
3.7 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Copyright 2015, 2016 OpenMarket Ltd
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
from typing import Any, List
|
|
|
|
from synapse.config.sso import SsoAttributeRequirement
|
|
|
|
from ._base import Config, ConfigError
|
|
from ._util import validate_config
|
|
|
|
|
|
class CasConfig(Config):
|
|
"""Cas Configuration
|
|
|
|
cas_server_url: URL of CAS server
|
|
"""
|
|
|
|
section = "cas"
|
|
|
|
def read_config(self, config, **kwargs):
|
|
cas_config = config.get("cas_config", None)
|
|
self.cas_enabled = cas_config and cas_config.get("enabled", True)
|
|
|
|
if self.cas_enabled:
|
|
self.cas_server_url = cas_config["server_url"]
|
|
|
|
# The public baseurl is required because it is used by the redirect
|
|
# template.
|
|
public_baseurl = self.public_baseurl
|
|
if not public_baseurl:
|
|
raise ConfigError("cas_config requires a public_baseurl to be set")
|
|
|
|
# TODO Update this to a _synapse URL.
|
|
self.cas_service_url = public_baseurl + "_matrix/client/r0/login/cas/ticket"
|
|
self.cas_displayname_attribute = cas_config.get("displayname_attribute")
|
|
required_attributes = cas_config.get("required_attributes") or {}
|
|
self.cas_required_attributes = _parsed_required_attributes_def(
|
|
required_attributes
|
|
)
|
|
|
|
else:
|
|
self.cas_server_url = None
|
|
self.cas_service_url = None
|
|
self.cas_displayname_attribute = None
|
|
self.cas_required_attributes = []
|
|
|
|
def generate_config_section(self, config_dir_path, server_name, **kwargs):
|
|
return """\
|
|
# Enable Central Authentication Service (CAS) for registration and login.
|
|
#
|
|
cas_config:
|
|
# Uncomment the following to enable authorization against a CAS server.
|
|
# Defaults to false.
|
|
#
|
|
#enabled: true
|
|
|
|
# The URL of the CAS authorization endpoint.
|
|
#
|
|
#server_url: "https://cas-server.com"
|
|
|
|
# The attribute of the CAS response to use as the display name.
|
|
#
|
|
# If unset, no displayname will be set.
|
|
#
|
|
#displayname_attribute: name
|
|
|
|
# It is possible to configure Synapse to only allow logins if CAS attributes
|
|
# match particular values. All of the keys in the mapping below must exist
|
|
# and the values must match the given value. Alternately if the given value
|
|
# is None then any value is allowed (the attribute just must exist).
|
|
# All of the listed attributes must match for the login to be permitted.
|
|
#
|
|
#required_attributes:
|
|
# userGroup: "staff"
|
|
# department: None
|
|
"""
|
|
|
|
|
|
# CAS uses a legacy required attributes mapping, not the one provided by
|
|
# SsoAttributeRequirement.
|
|
REQUIRED_ATTRIBUTES_SCHEMA = {
|
|
"type": "object",
|
|
"additionalProperties": {"anyOf": [{"type": "string"}, {"type": "null"}]},
|
|
}
|
|
|
|
|
|
def _parsed_required_attributes_def(
|
|
required_attributes: Any,
|
|
) -> List[SsoAttributeRequirement]:
|
|
validate_config(
|
|
REQUIRED_ATTRIBUTES_SCHEMA,
|
|
required_attributes,
|
|
config_path=("cas_config", "required_attributes"),
|
|
)
|
|
return [SsoAttributeRequirement(k, v) for k, v in required_attributes.items()]
|