mirror of
https://github.com/spring-projects/spring-security.git
synced 2025-02-15 10:54:51 +00:00
Merge branch '6.0.x' into 6.1.x
This commit is contained in:
commit
e916e44a5e
saml2/saml2-service-provider/src
main/java/org/springframework/security/saml2/provider/service/web
test/java/org/springframework/security/saml2/provider/service/web
@ -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());
|
||||
}
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user