From dde253f2ed08ea06a7682359d2a7e90b8dff372d Mon Sep 17 00:00:00 2001 From: Lars Franke Date: Fri, 17 Apr 2020 17:05:46 +0200 Subject: [PATCH 1/4] Fix indention in generated config file Also adjust sample_config.yaml Signed-off-by: Lars Franke --- docs/sample_config.yaml | 52 +++++++++++++++++----------------- synapse/config/saml2_config.py | 44 ++++++++++++++-------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 81dccbd99738..8e4d48aa4c5b 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1340,32 +1340,32 @@ saml2_config: # remote: # - url: https://our_idp/metadata.xml # - # # By default, the user has to go to our login page first. If you'd like - # # to allow IdP-initiated login, set 'allow_unsolicited: true' in a - # # 'service.sp' section: - # # - # #service: - # # sp: - # # allow_unsolicited: true - # - # # The examples below are just used to generate our metadata xml, and you - # # may well not need them, depending on your setup. Alternatively you - # # may need a whole lot more detail - see the pysaml2 docs! - # - # description: ["My awesome SP", "en"] - # name: ["Test SP", "en"] - # - # organization: - # name: Example com - # display_name: - # - ["Example co", "en"] - # url: "http://example.com" - # - # contact_person: - # - given_name: Bob - # sur_name: "the Sysadmin" - # email_address": ["admin@example.com"] - # contact_type": technical + # # By default, the user has to go to our login page first. If you'd like + # # to allow IdP-initiated login, set 'allow_unsolicited: true' in a + # # 'service.sp' section: + # # + # #service: + # # sp: + # # allow_unsolicited: true + # + # # The examples below are just used to generate our metadata xml, and you + # # may well not need them, depending on your setup. Alternatively you + # # may need a whole lot more detail - see the pysaml2 docs! + # + # description: ["My awesome SP", "en"] + # name: ["Test SP", "en"] + # + # organization: + # name: Example com + # display_name: + # - ["Example co", "en"] + # url: "http://example.com" + # + # contact_person: + # - given_name: Bob + # sur_name: "the Sysadmin" + # email_address": ["admin@example.com"] + # contact_type": technical # Instead of putting the config inline as above, you can specify a # separate pysaml2 configuration file: diff --git a/synapse/config/saml2_config.py b/synapse/config/saml2_config.py index 8fe64d90f857..726a27d7b20a 100644 --- a/synapse/config/saml2_config.py +++ b/synapse/config/saml2_config.py @@ -248,32 +248,32 @@ def generate_config_section(self, config_dir_path, server_name, **kwargs): # remote: # - url: https://our_idp/metadata.xml # - # # By default, the user has to go to our login page first. If you'd like - # # to allow IdP-initiated login, set 'allow_unsolicited: true' in a - # # 'service.sp' section: - # # - # #service: - # # sp: - # # allow_unsolicited: true + # # By default, the user has to go to our login page first. If you'd like + # # to allow IdP-initiated login, set 'allow_unsolicited: true' in a + # # 'service.sp' section: + # # + # #service: + # # sp: + # # allow_unsolicited: true # - # # The examples below are just used to generate our metadata xml, and you - # # may well not need them, depending on your setup. Alternatively you - # # may need a whole lot more detail - see the pysaml2 docs! + # # The examples below are just used to generate our metadata xml, and you + # # may well not need them, depending on your setup. Alternatively you + # # may need a whole lot more detail - see the pysaml2 docs! # - # description: ["My awesome SP", "en"] - # name: ["Test SP", "en"] + # description: ["My awesome SP", "en"] + # name: ["Test SP", "en"] # - # organization: - # name: Example com - # display_name: - # - ["Example co", "en"] - # url: "http://example.com" + # organization: + # name: Example com + # display_name: + # - ["Example co", "en"] + # url: "http://example.com" # - # contact_person: - # - given_name: Bob - # sur_name: "the Sysadmin" - # email_address": ["admin@example.com"] - # contact_type": technical + # contact_person: + # - given_name: Bob + # sur_name: "the Sysadmin" + # email_address": ["admin@example.com"] + # contact_type": technical # Instead of putting the config inline as above, you can specify a # separate pysaml2 configuration file: From 62f7ea50a7338d01cacd59dc3ac139e4a284c9a5 Mon Sep 17 00:00:00 2001 From: Lars Franke Date: Fri, 17 Apr 2020 19:37:37 +0200 Subject: [PATCH 2/4] Add changelog --- changelog.d/7300.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/7300.bugfix diff --git a/changelog.d/7300.bugfix b/changelog.d/7300.bugfix new file mode 100644 index 000000000000..e59f1a47f626 --- /dev/null +++ b/changelog.d/7300.bugfix @@ -0,0 +1 @@ +Fix generated SAML Service Provider configuration. Contributed by @frcl. From 8124e35197e68057f6252be972dc47ce55420146 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Mon, 20 Apr 2020 16:22:26 +0100 Subject: [PATCH 3/4] Update changelog.d/7300.bugfix --- changelog.d/7300.bugfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/7300.bugfix b/changelog.d/7300.bugfix index e59f1a47f626..7b3bc362b822 100644 --- a/changelog.d/7300.bugfix +++ b/changelog.d/7300.bugfix @@ -1 +1 @@ -Fix generated SAML Service Provider configuration. Contributed by @frcl. +Fix sample SAML Service Provider configuration. Contributed by @frcl. From e8d420ffe83c9eb684419f23a97e719f08891bcf Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Mon, 20 Apr 2020 16:22:54 +0100 Subject: [PATCH 4/4] not really a bugfix --- changelog.d/{7300.bugfix => 7300.misc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog.d/{7300.bugfix => 7300.misc} (100%) diff --git a/changelog.d/7300.bugfix b/changelog.d/7300.misc similarity index 100% rename from changelog.d/7300.bugfix rename to changelog.d/7300.misc