From 67beba946426d794948fe7c317afeb5d251fd2ed Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 30 May 2014 16:45:07 +0100 Subject: [PATCH] Switch HSTS enum to upper case. Since the RelaxedBinder now supports it. --- .../boot/autoconfigure/security/SecurityProperties.java | 4 ++-- .../security/SpringBootWebSecurityConfiguration.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java index 2e3e60b7cf1..cbf19b6ffdb 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java @@ -121,7 +121,7 @@ public class SecurityProperties implements SecurityPrequisite { public static class Headers { public static enum HSTS { - none, domain, all + NONE, DOMAIN, ALL } private boolean xss; @@ -132,7 +132,7 @@ public class SecurityProperties implements SecurityPrequisite { private boolean contentType; - private HSTS hsts = HSTS.all; + private HSTS hsts = HSTS.ALL; public boolean isXss() { return this.xss; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java index b480d01fe02..1dee19c1570 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java @@ -93,8 +93,8 @@ public class SpringBootWebSecurityConfiguration { public static void configureHeaders(HeadersConfigurer configurer, SecurityProperties.Headers headers) throws Exception { - if (headers.getHsts() != Headers.HSTS.none) { - boolean includeSubdomains = headers.getHsts() == Headers.HSTS.all; + if (headers.getHsts() != Headers.HSTS.NONE) { + boolean includeSubdomains = headers.getHsts() == Headers.HSTS.ALL; HstsHeaderWriter writer = new HstsHeaderWriter(includeSubdomains); writer.setRequestMatcher(AnyRequestMatcher.INSTANCE); configurer.addHeaderWriter(writer);