root
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

This commit is contained in:
Marcus Da Coregio 2023-09-25 10:10:48 -03:00
parent 27f0ab9eee e916e44a5e
commit d6fac11bfe
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilter.java
View File

@ -108,7 +108,7 @@ public final class Saml2MetadataFilter extends OncePerRequestFilter {
String fileName = metadata.getFileName();
String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.name());
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, String.format(format, fileName, encodedFileName));
response.setContentLength(metadata.getMetadata().length());
response.setContentLength(metadata.getMetadata().getBytes(StandardCharsets.UTF_8).length);
response.setCharacterEncoding(StandardCharsets.UTF_8.name());
response.getWriter().write(metadata.getMetadata());
}

2
saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilterTests.java
View File

@ -177,6 +177,8 @@ public class Saml2MetadataFilterTests {
this.filter.doFilter(this.request, this.response, this.chain);
assertThat(this.response.getCharacterEncoding()).isEqualTo(StandardCharsets.UTF_8.name());
assertThat(this.response.getContentAsString(StandardCharsets.UTF_8)).isEqualTo(generatedMetadata);
assertThat(this.response.getContentLength())
.isEqualTo(generatedMetadata.getBytes(StandardCharsets.UTF_8).length);
}
@Test