From 7426260ee1f2b6b5bbb64520a8336d52b60c73b0 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Thu, 28 Oct 2021 17:25:54 -0600 Subject: [PATCH] Add Second Tenant to SAML 2.0 Login --- .../java/example/Saml2LoginApplicationITests.java | 5 +++-- .../java/saml2/login/src/main/resources/application.yml | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java b/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java index 00334e8..bd0fe33 100644 --- a/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java +++ b/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java @@ -74,7 +74,7 @@ public class Saml2LoginApplicationITests { @Test void indexWhenSamlResponseThenShowsUserInformation() throws Exception { HttpSession session = this.mvc.perform(get("http://localhost:8080/")).andExpect(status().is3xxRedirection()) - .andExpect(redirectedUrl("http://localhost:8080/saml2/authenticate/one")).andReturn().getRequest() + .andExpect(redirectedUrl("http://localhost:8080/login")).andReturn().getRequest() .getSession(); this.mvc.perform(post("http://localhost:8080/login/saml2/sso/one").param("SAMLResponse", SIGNED_RESPONSE) @@ -108,7 +108,8 @@ public class Saml2LoginApplicationITests { } private HtmlPage performLogin() throws IOException { - HtmlPage assertingParty = this.webClient.getPage("/"); + HtmlPage login = this.webClient.getPage("/"); + HtmlPage assertingParty = login.getAnchorByHref("/saml2/authenticate/one").click(); HtmlForm form = assertingParty.getFormByName("f"); HtmlInput username = form.getInputByName("username"); HtmlInput password = form.getInputByName("password"); diff --git a/servlet/spring-boot/java/saml2/login/src/main/resources/application.yml b/servlet/spring-boot/java/saml2/login/src/main/resources/application.yml index 05666f4..bb0f783 100644 --- a/servlet/spring-boot/java/saml2/login/src/main/resources/application.yml +++ b/servlet/spring-boot/java/saml2/login/src/main/resources/application.yml @@ -4,11 +4,16 @@ spring: relyingparty: registration: one: - signing.credentials: + signing.credentials: &rp-metadata - private-key-location: classpath:credentials/rp-private.key certificate-location: classpath:credentials/rp-certificate.crt identityprovider: metadata-uri: https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php + two: + signing.credentials: *rp-metadata + decryption.credentials: *rp-metadata + identityprovider: + metadata-uri: https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php logging.level: