Skip to content

Commit 458918a

Browse files
committed
Do Not Support CSP Nonces in XML
Upon further review, I don't think that we should support this at this time. XML is effectively deprecated and we aren't adding more features unless it comes for free. Signed-off-by: Josh Cummings <[email protected]>
1 parent 0b9971f commit 458918a

2 files changed

Lines changed: 11 additions & 22 deletions

File tree

‎config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.springframework.beans.factory.support.ManagedList;
3434
import org.springframework.beans.factory.xml.BeanDefinitionParser;
3535
import org.springframework.beans.factory.xml.ParserContext;
36-
import org.springframework.security.web.header.ContentSecurityPolicyNonceGeneratingFilter;
3736
import org.springframework.security.web.header.HeaderWriterFilter;
3837
import org.springframework.security.web.header.writers.CacheControlHeadersWriter;
3938
import org.springframework.security.web.header.writers.ContentSecurityPolicyHeaderWriter;
@@ -55,7 +54,6 @@
5554
import org.springframework.security.web.header.writers.frameoptions.XFrameOptionsHeaderWriter;
5655
import org.springframework.util.StringUtils;
5756
import org.springframework.util.xml.DomUtils;
58-
import org.springframework.web.filter.CompositeFilter;
5957

6058
/**
6159
* Parser for the {@code HeadersFilter}.
@@ -135,8 +133,6 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
135133

136134
private ManagedList<BeanMetadataElement> headerWriters;
137135

138-
private BeanDefinition nonceGeneratingFilter;
139-
140136
@Override
141137
public BeanDefinition parse(Element element, ParserContext parserContext) {
142138
this.headerWriters = new ManagedList<>();
@@ -168,13 +164,7 @@ else if (noWriters) {
168164
return null;
169165
}
170166
builder.addConstructorArgValue(this.headerWriters);
171-
BeanDefinition headerWriterFilter = builder.getBeanDefinition();
172-
if (this.nonceGeneratingFilter == null) {
173-
return headerWriterFilter;
174-
}
175-
return BeanDefinitionBuilder.rootBeanDefinition(CompositeFilter.class)
176-
.addPropertyValue("filters", ManagedList.of(this.nonceGeneratingFilter, headerWriterFilter))
177-
.getBeanDefinition();
167+
return builder.getBeanDefinition();
178168
}
179169

180170
/**
@@ -325,6 +315,12 @@ private void addContentSecurityPolicy(Element contentSecurityPolicyElement, Pars
325315
context.getReaderContext()
326316
.error(ATT_POLICY_DIRECTIVES + " requires a 'value' to be set.", contentSecurityPolicyElement);
327317
}
318+
else if (resolveAttribute(context, contentSecurityPolicyElement, ATT_POLICY_DIRECTIVES).contains("{nonce}")) {
319+
context.getReaderContext()
320+
.error("Nonce-based " + CONTENT_SECURITY_POLICY_ELEMENT
321+
+ " is not supported in XML configuration; use Java configuration instead.",
322+
contentSecurityPolicyElement);
323+
}
328324
else {
329325
headersWriter.addConstructorArgValue(policyDirectives);
330326
}
@@ -333,9 +329,6 @@ private void addContentSecurityPolicy(Element contentSecurityPolicyElement, Pars
333329
headersWriter.addPropertyValue("reportOnly", reportOnly);
334330
}
335331
this.headerWriters.add(headersWriter.getBeanDefinition());
336-
this.nonceGeneratingFilter = BeanDefinitionBuilder
337-
.rootBeanDefinition(ContentSecurityPolicyNonceGeneratingFilter.class)
338-
.getBeanDefinition();
339332
}
340333

341334
private void parseReferrerPolicyElement(Element element, ParserContext context) {

‎config/src/test/java/org/springframework/security/config/http/HttpHeadersConfigTests.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444

4545
import static org.assertj.core.api.Assertions.assertThat;
4646
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
47-
import static org.hamcrest.Matchers.matchesRegex;
4847
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
4948
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
5049
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -710,13 +709,10 @@ public void configureWhenContentSecurityPolicyConfiguredWithEmptyDirectivesThenA
710709
}
711710

712711
@Test
713-
void requestWhenContentSecurityPolicyDirectivesConfiguredWithNoncePlaceholderThenHeaderContainsNonce()
714-
throws Exception {
715-
this.spring.configLocations(this.xml("ContentSecurityPolicyWithNonceBasedDirectives")).autowire();
716-
this.mvc.perform(get("/").secure(true))
717-
.andExpect(status().isOk())
718-
.andExpect(header().string("Content-Security-Policy",
719-
matchesRegex("^script-src 'self' 'nonce-[A-Za-z0-9+/]{22,}={0,2}'$")));
712+
public void configureWhenContentSecurityPolicyDirectivesContainNoncePlaceholderThenAutowireFails() {
713+
assertThatExceptionOfType(BeanDefinitionParsingException.class).isThrownBy(
714+
() -> this.spring.configLocations(this.xml("ContentSecurityPolicyWithNonceBasedDirectives")).autowire())
715+
.withMessageContaining("Nonce-based content-security-policy is not supported in XML configuration");
720716
}
721717

722718
@Test

0 commit comments

Comments
 (0)