Add hash-based Content-Security-Policy for SAML pages

Closes gh-11631
spring-projects · Jul 28, 2022 · 4393c2e · 4393c2e
1 parent f86d30f
commit 4393c2e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 2 deletions.
diff --git a/...ecurity/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilter.java b/...ecurity/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilter.java
@@ -146,6 +146,8 @@ private String createSamlPostRequestFormData(Saml2PostAuthenticationRequest auth
 		StringBuilder html = new StringBuilder();
 		html.append("<!DOCTYPE html>\n");
 		html.append("<html>\n").append("    <head>\n");
+		html.append("        <meta http-equiv=\"Content-Security-Policy\" ")
+				.append("content=\"script-src 'sha256-ePniVEkSivX/c7XWBGafqh8tSpiRrKiqYeqbG7N1TOE='\">\n");
 		html.append("        <meta charset=\"utf-8\" />\n");
 		html.append("    </head>\n");
 		html.append("    <body onload=\"document.forms[0].submit()\">\n");

diff --git a/...k/security/saml2/provider/service/web/authentication/logout/Saml2LogoutRequestFilter.java b/...k/security/saml2/provider/service/web/authentication/logout/Saml2LogoutRequestFilter.java
@@ -199,6 +199,8 @@ private String createSamlPostRequestFormData(String location, String saml, Strin
 		StringBuilder html = new StringBuilder();
 		html.append("<!DOCTYPE html>\n");
 		html.append("<html>\n").append("    <head>\n");
+		html.append("        <meta http-equiv=\"Content-Security-Policy\" ")
+				.append("content=\"script-src 'sha256-ePniVEkSivX/c7XWBGafqh8tSpiRrKiqYeqbG7N1TOE='\">\n");
 		html.append("        <meta charset=\"utf-8\" />\n");
 		html.append("    </head>\n");
 		html.append("    <body onload=\"document.forms[0].submit()\">\n");

diff --git a/...der/service/web/authentication/logout/Saml2RelyingPartyInitiatedLogoutSuccessHandler.java b/...der/service/web/authentication/logout/Saml2RelyingPartyInitiatedLogoutSuccessHandler.java
@@ -118,6 +118,8 @@ private String createSamlPostRequestFormData(String location, String saml, Strin
 		StringBuilder html = new StringBuilder();
 		html.append("<!DOCTYPE html>\n");
 		html.append("<html>\n").append("    <head>\n");
+		html.append("        <meta http-equiv=\"Content-Security-Policy\" ")
+				.append("content=\"script-src 'sha256-ePniVEkSivX/c7XWBGafqh8tSpiRrKiqYeqbG7N1TOE='\">\n");
 		html.append("        <meta charset=\"utf-8\" />\n");
 		html.append("    </head>\n");
 		html.append("    <body onload=\"document.forms[0].submit()\">\n");

diff --git a/...ty/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilterTests.java b/...ty/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilterTests.java
@@ -170,7 +170,9 @@ public void doFilterWhenPostFormDataIsPresent() throws Exception {
 		given(this.authenticationRequestResolver.resolve(any())).willReturn(request);
 		this.filter.doFilterInternal(this.request, this.response, this.filterChain);
 		assertThat(this.response.getHeader("Location")).isNull();
-		assertThat(this.response.getContentAsString())
+		assertThat(this.response.getContentAsString()).contains(
+				"<meta http-equiv=\"Content-Security-Policy\" content=\"script-src 'sha256-ePniVEkSivX/c7XWBGafqh8tSpiRrKiqYeqbG7N1TOE='\">")
+				.contains("<body onload=\"document.forms[0].submit()\">")
 				.contains("<form action=\"https://sso-url.example.com/IDP/SSO\" method=\"post\">")
 				.contains("<input type=\"hidden\" name=\"SAMLRequest\"")
 				.contains("value=\"" + relayStateEncoded + "\"");

diff --git a/...urity/saml2/provider/service/web/authentication/logout/Saml2LogoutRequestFilterTests.java b/...urity/saml2/provider/service/web/authentication/logout/Saml2LogoutRequestFilterTests.java
@@ -111,6 +111,9 @@ public void doFilterWhenSamlRequestThenPosts() throws Exception {
 		String content = response.getContentAsString();
 		assertThat(content).contains(Saml2ParameterNames.SAML_RESPONSE);
 		assertThat(content).contains(registration.getAssertingPartyDetails().getSingleLogoutServiceResponseLocation());
+		assertThat(content).contains(
+				"<meta http-equiv=\"Content-Security-Policy\" content=\"script-src 'sha256-ePniVEkSivX/c7XWBGafqh8tSpiRrKiqYeqbG7N1TOE='\">");
+		assertThat(content).contains("<body onload=\"document.forms[0].submit()\">");
 	}
 
 	@Test

diff --git a/...ervice/web/authentication/logout/Saml2RelyingPartyInitiatedLogoutSuccessHandlerTests.java b/...ervice/web/authentication/logout/Saml2RelyingPartyInitiatedLogoutSuccessHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -97,6 +97,9 @@ public void onLogoutSuccessWhenPostThenPostsToAssertingParty() throws Exception
 		String content = response.getContentAsString();
 		assertThat(content).contains(Saml2ParameterNames.SAML_REQUEST);
 		assertThat(content).contains(registration.getAssertingPartyDetails().getSingleLogoutServiceLocation());
+		assertThat(content).contains(
+				"<meta http-equiv=\"Content-Security-Policy\" content=\"script-src 'sha256-ePniVEkSivX/c7XWBGafqh8tSpiRrKiqYeqbG7N1TOE='\">");
+		assertThat(content).contains("<body onload=\"document.forms[0].submit()\">");
 	}
 
 	private Saml2Authentication authentication(RelyingPartyRegistration registration) {