summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorGabriel Rodríguez <gabrc52@gmail.com>2023-08-11 16:15:17 -0400
committerGitHub <noreply@github.com>2023-08-11 20:15:17 +0000
commit9ff84bccbb152460913d63d4b8e9dffc220adfea (patch)
tree2ccf3015f1bc8677c89831c0c1a79fc0aec51b02 /synapse/config
parentAdd linearizer on user ID to push rule PUT/DELETE requests (#16052) (diff)
downloadsynapse-9ff84bccbb152460913d63d4b8e9dffc220adfea.tar.xz
Allow customizing IdP name and icon for SAML and CAS (#16094)
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/cas.py4
-rw-r--r--synapse/config/saml2.py6
2 files changed, 10 insertions, 0 deletions
diff --git a/synapse/config/cas.py b/synapse/config/cas.py

index 9152c06bd6..c4e63e7411 100644 --- a/synapse/config/cas.py +++ b/synapse/config/cas.py
@@ -47,6 +47,10 @@ class CasConfig(Config): required_attributes ) + self.idp_name = cas_config.get("idp_name", "CAS") + self.idp_icon = cas_config.get("idp_icon") + self.idp_brand = cas_config.get("idp_brand") + else: self.cas_server_url = None self.cas_service_url = None diff --git a/synapse/config/saml2.py b/synapse/config/saml2.py
index 49ca663dde..c69e24cf26 100644 --- a/synapse/config/saml2.py +++ b/synapse/config/saml2.py
@@ -89,8 +89,14 @@ class SAML2Config(Config): "grandfathered_mxid_source_attribute", "uid" ) + # refers to a SAML IdP entity ID self.saml2_idp_entityid = saml2_config.get("idp_entityid", None) + # IdP properties for Matrix clients + self.idp_name = saml2_config.get("idp_name", "SAML") + self.idp_icon = saml2_config.get("idp_icon") + self.idp_brand = saml2_config.get("idp_brand") + # user_mapping_provider may be None if the key is present but has no value ump_dict = saml2_config.get("user_mapping_provider") or {}