Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-05-31 09:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

HeadersBuilder-HeadersSpec

Browse Source 
Issue: gh-4822
This commit is contained in:
Rob Winch 2017-11-13 15:53:28 -06:00
parent 53ddbfc0ab
commit fd4726afaf
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
View File

@ -97,7 +97,7 @@ public class ServerHttpSecurity {
private AuthorizeExchangeSpec authorizeExchange;
private HeaderBuilder headers = new HeaderBuilder();
private HeaderSpec headers = new HeaderSpec();
private CsrfBuilder csrf = new CsrfBuilder();
@ -175,9 +175,9 @@ public class ServerHttpSecurity {
return this.formLogin;
}
public HeaderBuilder headers() {
public HeaderSpec headers() {
if(this.headers == null) {
this.headers = new HeaderBuilder();
this.headers = new HeaderSpec();
}
return this.headers;
}
@ -627,7 +627,7 @@ public class ServerHttpSecurity {
* @author Rob Winch
* @since 5.0
*/
public class HeaderBuilder {
public class HeaderSpec {
private final List<ServerHttpHeadersWriter> writers;
private CacheControlServerHttpHeadersWriter cacheControl = new CacheControlServerHttpHeadersWriter();
@ -672,7 +672,7 @@ public class ServerHttpSecurity {
public class CacheSpec {
public void disable() {
HeaderBuilder.this.writers.remove(HeaderBuilder.this.cacheControl);
HeaderSpec.this.writers.remove(HeaderSpec.this.cacheControl);
}
private CacheSpec() {}
@ -680,7 +680,7 @@ public class ServerHttpSecurity {
public class ContentTypeOptionsSpec {
public void disable() {
HeaderBuilder.this.writers.remove(HeaderBuilder.this.contentTypeOptions);
HeaderSpec.this.writers.remove(HeaderSpec.this.contentTypeOptions);
}
private ContentTypeOptionsSpec() {}
@ -688,10 +688,10 @@ public class ServerHttpSecurity {
public class FrameOptionsSpec {
public void mode(XFrameOptionsServerHttpHeadersWriter.Mode mode) {
HeaderBuilder.this.frameOptions.setMode(mode);
HeaderSpec.this.frameOptions.setMode(mode);
}
public void disable() {
HeaderBuilder.this.writers.remove(HeaderBuilder.this.frameOptions);
HeaderSpec.this.writers.remove(HeaderSpec.this.frameOptions);
}
private FrameOptionsSpec() {}
@ -699,15 +699,15 @@ public class ServerHttpSecurity {
public class HstsSpec {
public void maxAge(Duration maxAge) {
HeaderBuilder.this.hsts.setMaxAge(maxAge);
HeaderSpec.this.hsts.setMaxAge(maxAge);
}
public void includeSubdomains(boolean includeSubDomains) {
HeaderBuilder.this.hsts.setIncludeSubDomains(includeSubDomains);
HeaderSpec.this.hsts.setIncludeSubDomains(includeSubDomains);
}
public void disable() {
HeaderBuilder.this.writers.remove(HeaderBuilder.this.hsts);
HeaderSpec.this.writers.remove(HeaderSpec.this.hsts);
}
private HstsSpec() {}
@ -715,13 +715,13 @@ public class ServerHttpSecurity {
public class XssProtectionSpec {
public void disable() {
HeaderBuilder.this.writers.remove(HeaderBuilder.this.xss);
HeaderSpec.this.writers.remove(HeaderSpec.this.xss);
}
private XssProtectionSpec() {}
}
private HeaderBuilder() {
private HeaderSpec() {
this.writers = new ArrayList<>(
Arrays.asList(this.cacheControl, this.contentTypeOptions, this.hsts,
this.frameOptions, this.xss));

4
config/src/test/java/org/springframework/security/config/web/server/HeaderBuilderTests.java → config/src/test/java/org/springframework/security/config/web/server/HeaderSpecTests.java
View File

@ -39,9 +39,9 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
* @author Rob Winch
* @since 5.0
*/
public class HeaderBuilderTests {
public class HeaderSpecTests {
ServerHttpSecurity.HeaderBuilder headers = ServerHttpSecurity.http().headers();
ServerHttpSecurity.HeaderSpec headers = ServerHttpSecurity.http().headers();
HttpHeaders expectedHeaders = new HttpHeaders();