Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 13:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Base64 encoder with no CRLF in output for SAML 2.0 messages

Browse Source 
Closes gh-11262
This commit is contained in:
Juny Tse
2022-05-21 23:58:37 +08:00
committed by Josh Cummings
parent 4caf53e96d
commit d0da160007
7 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2Utils.java
+1 -1
View File
@@ -36,7 +36,7 @@ final class Saml2Utils {
}
static String samlEncode(byte[] b) {
return Base64.getMimeEncoder().encodeToString(b);
return Base64.getEncoder().encodeToString(b);
}
static byte[] samlDecode(String s) {
saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/logout/Saml2Utils.java
+1 -1
View File
@@ -40,7 +40,7 @@ final class Saml2Utils {
}
static String samlEncode(byte[] b) {
return Base64.getMimeEncoder().encodeToString(b);
return Base64.getEncoder().encodeToString(b);
}
static byte[] samlDecode(String s) {
saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/Saml2Utils.java
+1 -1
View File
@@ -40,7 +40,7 @@ final class Saml2Utils {
}
static String samlEncode(byte[] b) {
return Base64.getMimeEncoder().encodeToString(b);
return Base64.getEncoder().encodeToString(b);
}
static byte[] samlDecode(String s) {
saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2Utils.java
+1 -1
View File
@@ -40,7 +40,7 @@ final class Saml2Utils {
}
static String samlEncode(byte[] b) {
return Base64.getMimeEncoder().encodeToString(b);
return Base64.getEncoder().encodeToString(b);
}
static byte[] samlDecode(String s) {
saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/core/Saml2Utils.java
+1 -6
View File
@@ -32,13 +32,8 @@ public final class Saml2Utils {
private Saml2Utils() {
}
@Deprecated
public static String samlEncodeNotRfc2045(byte[] b) {
return Base64.getEncoder().encodeToString(b);
}
public static String samlEncode(byte[] b) {
return Base64.getMimeEncoder().encodeToString(b);
return Base64.getEncoder().encodeToString(b);
}
public static byte[] samlDecode(String s) {
saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2AuthenticationTokenConverterTests.java
+2 -2
View File
@@ -64,7 +64,7 @@ public class Saml2AuthenticationTokenConverterTests {
.willReturn(this.relyingPartyRegistration);
MockHttpServletRequest request = new MockHttpServletRequest();
request.setParameter(Saml2ParameterNames.SAML_RESPONSE,
Saml2Utils.samlEncodeNotRfc2045("response".getBytes(StandardCharsets.UTF_8)));
Saml2Utils.samlEncode("response".getBytes(StandardCharsets.UTF_8)));
Saml2AuthenticationToken token = converter.convert(request);
assertThat(token.getSaml2Response()).isEqualTo("response");
assertThat(token.getRelyingPartyRegistration().getRegistrationId())
@@ -115,7 +115,7 @@ public class Saml2AuthenticationTokenConverterTests {
MockHttpServletRequest request = new MockHttpServletRequest();
request.setMethod("GET");
byte[] deflated = Saml2Utils.samlDeflate("response");
String encoded = Saml2Utils.samlEncodeNotRfc2045(deflated);
String encoded = Saml2Utils.samlEncode(deflated);
request.setParameter(Saml2ParameterNames.SAML_RESPONSE, encoded);
Saml2AuthenticationToken token = converter.convert(request);
assertThat(token.getSaml2Response()).isEqualTo("response");