From dcbe900ff854c66fb122a644e49f9d3b60ed5639 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 19 Sep 2022 15:24:11 +0000 Subject: [PATCH 1/3] Release 5.8.0-M3 --- docs/antora.yml | 7 ++++--- gradle.properties | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 90b58795a4..f87ca3d37c 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,3 +1,4 @@ -name: 'ROOT' -version: 5.8.0 -prerelease: '-SNAPSHOT' +'display_version': '5.8.0-M3' +'name': 'ROOT' +'prerelease': 'true' +'version': '5.8.0-M3' diff --git a/gradle.properties b/gradle.properties index 34487789d4..557d48b317 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ springJavaformatVersion=0.0.34 springBootVersion=2.4.2 springFrameworkVersion=5.3.23 openSamlVersion=3.4.6 -version=5.8.0-SNAPSHOT +version=5.8.0-M3 kotlinVersion=1.7.10 samplesBranch=5.8.x org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError From 9564f1b5e4e06408f6ad530b00d52df1d2fcc7f7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 19 Sep 2022 16:55:17 +0000 Subject: [PATCH 2/3] Next development version --- docs/antora.yml | 5 ++--- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index f87ca3d37c..a13e12e1e5 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,4 +1,3 @@ -'display_version': '5.8.0-M3' 'name': 'ROOT' -'prerelease': 'true' -'version': '5.8.0-M3' +'prerelease': '-SNAPSHOT' +'version': '5.8.0' diff --git a/gradle.properties b/gradle.properties index 557d48b317..34487789d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ springJavaformatVersion=0.0.34 springBootVersion=2.4.2 springFrameworkVersion=5.3.23 openSamlVersion=3.4.6 -version=5.8.0-M3 +version=5.8.0-SNAPSHOT kotlinVersion=1.7.10 samplesBranch=5.8.x org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError From 0c96989cbe13532e70d0ec0d4b9c5db97387addf Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Mon, 19 Sep 2022 15:46:23 -0300 Subject: [PATCH 3/3] Move script tag into body element Closes gh-11879 --- .../filter/Saml2WebSsoAuthenticationRequestFilter.java | 2 +- .../web/authentication/logout/Saml2LogoutRequestFilter.java | 4 ++-- .../Saml2RelyingPartyInitiatedLogoutSuccessHandler.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilter.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilter.java index e31ed167c0..4aced5f64a 100644 --- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilter.java +++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/servlet/filter/Saml2WebSsoAuthenticationRequestFilter.java @@ -268,8 +268,8 @@ public class Saml2WebSsoAuthenticationRequestFilter extends OncePerRequestFilter html.append(" \n"); html.append(" \n"); html.append(" \n"); + html.append(" \n"); html.append(" \n"); - html.append(" \n"); html.append(""); return html.toString(); } diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2LogoutRequestFilter.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2LogoutRequestFilter.java index 230cc6572e..af08f0b261 100644 --- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2LogoutRequestFilter.java +++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2LogoutRequestFilter.java @@ -219,7 +219,7 @@ public final class Saml2LogoutRequestFilter extends OncePerRequestFilter { .append("content=\"script-src 'sha256-t+jmhLjs1ocvgaHBJsFcgznRk68d37TLtbI3NE9h7EU='\">\n"); html.append(" \n"); html.append(" \n"); - html.append(" \n"); + html.append(" \n"); html.append("