صفحهٔ اصلی گشت‌و‌گذار راهنما
ثبت نام ورود
github
/
spring-security
mirrorاز https://github.com/spring-projects/spring-security
2
0
انشعاب 0
پرونده‌ها مشکلات 0 ویکی
فهرست منبع

Merge branch '5.8.x' into 6.0.x

Closes gh-13141
Marcus Da Coregio 2 سال پیش
والد
dfbfa9199d 8d5304f530
کامیت
0b6e84b8b7
6فایلهای تغییر یافته به همراه20 افزوده شده و 20 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 3 3
      saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2WebSsoAuthenticationRequestFilter.java
  2. 4 4
      saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2LogoutRequestFilter.java
  3. 4 4
      saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2RelyingPartyInitiatedLogoutSuccessHandler.java
  4. 3 3
      saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2WebSsoAuthenticationRequestFilterTests.java
  5. 3 3
      saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2LogoutRequestFilterTests.java
  6. 3 3
      saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2RelyingPartyInitiatedLogoutSuccessHandlerTests.java

+ 3 - 3
saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2WebSsoAuthenticationRequestFilter.java
مشاهده فایل 

@@ -1,5 +1,5 @@
 
 /*
 
- * Copyright 2002-2022 the original author or authors.
 
+ * Copyright 2002-2023 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.
 
@@ -145,7 +145,7 @@ public class Saml2WebSsoAuthenticationRequestFilter extends OncePerRequestFilter
 
 		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-t+jmhLjs1ocvgaHBJsFcgznRk68d37TLtbI3NE9h7EU='\">\n");
 
+				.append("content=\"script-src 'sha256-oZhLbc2kO8b8oaYLrUc7uye1MgVKMyLtPqWR4WtKF+c='\">\n");
 
 		html.append("        <meta charset=\"utf-8\" />\n");
 
 		html.append("    </head>\n");
 
 		html.append("    <body>\n");
 
@@ -176,8 +176,8 @@ public class Saml2WebSsoAuthenticationRequestFilter extends OncePerRequestFilter
 
 		html.append("            </noscript>\n");
 
 		html.append("        </form>\n");
 
 		html.append("        \n");
 
+		html.append("        <script>window.onload = function() { document.forms[0].submit(); }</script>\n");
 
 		html.append("    </body>\n");
 
-		html.append("    <script>window.onload = () => document.forms[0].submit();</script>\n");
 
 		html.append("</html>");
 
 		return html.toString();
 
 	}

+ 4 - 4
saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2LogoutRequestFilter.java
مشاهده فایل 

@@ -1,5 +1,5 @@
 
 /*
 
- * Copyright 2002-2022 the original author or authors.
 
+ * Copyright 2002-2023 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.
 
@@ -215,10 +215,10 @@ public final class Saml2LogoutRequestFilter extends OncePerRequestFilter {
 
 		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-t+jmhLjs1ocvgaHBJsFcgznRk68d37TLtbI3NE9h7EU='\">\n");
 
+				.append("content=\"script-src 'sha256-oZhLbc2kO8b8oaYLrUc7uye1MgVKMyLtPqWR4WtKF+c='\">\n");
 
 		html.append("        <meta charset=\"utf-8\" />\n");
 
 		html.append("    </head>\n");
 
-		html.append("    <body onload=\"document.forms[0].submit()\">\n");
 
+		html.append("    <body>\n");
 
 		html.append("        <noscript>\n");
 
 		html.append("            <p>\n");
 
 		html.append("                <strong>Note:</strong> Since your browser does not support JavaScript,\n");
 
@@ -246,8 +246,8 @@ public final class Saml2LogoutRequestFilter extends OncePerRequestFilter {
 
 		html.append("            </noscript>\n");
 
 		html.append("        </form>\n");
 
 		html.append("        \n");
 
+		html.append("        <script>window.onload = function() { document.forms[0].submit(); }</script>\n");
 
 		html.append("    </body>\n");
 
-		html.append("    <script>window.onload = () => document.forms[0].submit();</script>\n");
 
 		html.append("</html>");
 
 		return html.toString();
 
 	}

+ 4 - 4
saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2RelyingPartyInitiatedLogoutSuccessHandler.java
مشاهده فایل 

@@ -1,5 +1,5 @@
 
 /*
 
- * Copyright 2002-2022 the original author or authors.
 
+ * Copyright 2002-2023 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.
 
@@ -119,10 +119,10 @@ public final class Saml2RelyingPartyInitiatedLogoutSuccessHandler implements Log
 
 		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-t+jmhLjs1ocvgaHBJsFcgznRk68d37TLtbI3NE9h7EU='\">\n");
 
+				.append("content=\"script-src 'sha256-oZhLbc2kO8b8oaYLrUc7uye1MgVKMyLtPqWR4WtKF+c='\">\n");
 
 		html.append("        <meta charset=\"utf-8\" />\n");
 
 		html.append("    </head>\n");
 
-		html.append("    <body onload=\"document.forms[0].submit()\">\n");
 
+		html.append("    <body>\n");
 
 		html.append("        <noscript>\n");
 
 		html.append("            <p>\n");
 
 		html.append("                <strong>Note:</strong> Since your browser does not support JavaScript,\n");
 
@@ -150,8 +150,8 @@ public final class Saml2RelyingPartyInitiatedLogoutSuccessHandler implements Log
 
 		html.append("            </noscript>\n");
 
 		html.append("        </form>\n");
 
 		html.append("        \n");
 
+		html.append("        <script>window.onload = function() { document.forms[0].submit(); }</script>\n");
 
 		html.append("    </body>\n");
 
-		html.append("    <script>window.onload = () => document.forms[0].submit();</script>\n");
 
 		html.append("</html>");
 
 		return html.toString();
 
 	}

+ 3 - 3
saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2WebSsoAuthenticationRequestFilterTests.java
مشاهده فایل 

@@ -1,5 +1,5 @@
 
 /*
 
- * Copyright 2002-2022 the original author or authors.
 
+ * Copyright 2002-2023 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.
 
@@ -170,8 +170,8 @@ public class Saml2WebSsoAuthenticationRequestFilterTests {
 
 		this.filter.doFilterInternal(this.request, this.response, this.filterChain);
 
 		assertThat(this.response.getHeader("Location")).isNull();
 
 		assertThat(this.response.getContentAsString()).contains(
 
-				"<meta http-equiv=\"Content-Security-Policy\" content=\"script-src 'sha256-t+jmhLjs1ocvgaHBJsFcgznRk68d37TLtbI3NE9h7EU='\">")
 
-				.contains("<script>window.onload = () => document.forms[0].submit();</script>")
 
+				"<meta http-equiv=\"Content-Security-Policy\" content=\"script-src 'sha256-oZhLbc2kO8b8oaYLrUc7uye1MgVKMyLtPqWR4WtKF+c='\">")
 
+				.contains("<script>window.onload = function() { document.forms[0].submit(); }</script>")
 
 				.contains("<form action=\"https://sso-url.example.com/IDP/SSO\" method=\"post\">")
 
 				.contains("<input type=\"hidden\" name=\"SAMLRequest\"")
 
 				.contains("value=\"" + relayStateEncoded + "\"");

+ 3 - 3
saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2LogoutRequestFilterTests.java
مشاهده فایل 

@@ -1,5 +1,5 @@
 
 /*
 
- * Copyright 2002-2022 the original author or authors.
 
+ * Copyright 2002-2023 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.
 
@@ -118,8 +118,8 @@ public class Saml2LogoutRequestFilterTests {
 
 		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-t+jmhLjs1ocvgaHBJsFcgznRk68d37TLtbI3NE9h7EU='\">");
 
-		assertThat(content).contains("<script>window.onload = () => document.forms[0].submit();</script>");
 
+				"<meta http-equiv=\"Content-Security-Policy\" content=\"script-src 'sha256-oZhLbc2kO8b8oaYLrUc7uye1MgVKMyLtPqWR4WtKF+c='\">");
 
+		assertThat(content).contains("<script>window.onload = function() { document.forms[0].submit(); }</script>");
 
 		verify(this.securityContextHolderStrategy).getContext();
 
 	}

+ 3 - 3
saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2RelyingPartyInitiatedLogoutSuccessHandlerTests.java
مشاهده فایل 

@@ -1,5 +1,5 @@
 
 /*
 
- * Copyright 2002-2022 the original author or authors.
 
+ * Copyright 2002-2023 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.
 
@@ -98,8 +98,8 @@ public class Saml2RelyingPartyInitiatedLogoutSuccessHandlerTests {
 
 		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-t+jmhLjs1ocvgaHBJsFcgznRk68d37TLtbI3NE9h7EU='\">");
 
-		assertThat(content).contains("<script>window.onload = () => document.forms[0].submit();</script>");
 
+				"<meta http-equiv=\"Content-Security-Policy\" content=\"script-src 'sha256-oZhLbc2kO8b8oaYLrUc7uye1MgVKMyLtPqWR4WtKF+c='\">");
 
+		assertThat(content).contains("<script>window.onload = function() { document.forms[0].submit(); }</script>");
 
 	}
 
 
 	private Saml2Authentication authentication(RelyingPartyRegistration registration) {