3333import org .springframework .beans .factory .support .ManagedList ;
3434import org .springframework .beans .factory .xml .BeanDefinitionParser ;
3535import org .springframework .beans .factory .xml .ParserContext ;
36- import org .springframework .security .web .header .ContentSecurityPolicyNonceGeneratingFilter ;
3736import org .springframework .security .web .header .HeaderWriterFilter ;
3837import org .springframework .security .web .header .writers .CacheControlHeadersWriter ;
3938import org .springframework .security .web .header .writers .ContentSecurityPolicyHeaderWriter ;
5554import org .springframework .security .web .header .writers .frameoptions .XFrameOptionsHeaderWriter ;
5655import org .springframework .util .StringUtils ;
5756import 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 ) {
0 commit comments