You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2020/03/12 11:07:52 UTC

[wicket] branch master updated: WICKET-6747 keep shorter getCspSettings()

This is an automated email from the ASF dual-hosted git repository.

svenmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/master by this push:
     new 1245ee2  WICKET-6747 keep shorter getCspSettings()
1245ee2 is described below

commit 1245ee2998930f3b9169ca8afa4018d49e2346e4
Author: Sven Meier <sv...@apache.org>
AuthorDate: Thu Mar 12 11:49:10 2020 +0100

    WICKET-6747 keep shorter getCspSettings()
---
 .../wicket/csp/ContentSecurityPolicySettings.java  |  4 +--
 .../org/apache/wicket/mock/MockApplication.java    |  2 +-
 .../wicket/protocol/http/WebApplication.java       | 21 ++++++-----
 .../csp/CSPSettingRequestCycleListenerTest.java    | 42 +++++++++++-----------
 .../head/filter/FilteringHeaderResponseTest.java   |  4 +--
 .../wicket/examples/WicketExampleApplication.java  |  2 +-
 .../MyAuthenticatedWebApplication.java             |  2 +-
 .../wicket/examples/images/ImagesApplication.java  |  2 +-
 .../wicket/examples/media/VideosApplication.java   |  2 +-
 .../examples/websocket/JSR356Application.java      |  2 +-
 10 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/wicket-core/src/main/java/org/apache/wicket/csp/ContentSecurityPolicySettings.java b/wicket-core/src/main/java/org/apache/wicket/csp/ContentSecurityPolicySettings.java
index df58497..c072818 100644
--- a/wicket-core/src/main/java/org/apache/wicket/csp/ContentSecurityPolicySettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/csp/ContentSecurityPolicySettings.java
@@ -36,13 +36,13 @@ import org.apache.wicket.util.lang.Args;
  * 
  * <pre>
  * {@code
- *  myApplication.getContentSecuritySettings().blocking().clear()
+ *  myApplication.getCspSettings().blocking().clear()
  *      .add(CSPDirective.DEFAULT_SRC, CSPDirectiveSrcValue.NONE)
  *      .add(CSPDirective.SCRIPT_SRC, CSPDirectiveSrcValue.SELF)
  *      .add(CSPDirective.IMG_SRC, CSPDirectiveSrcValue.SELF)
  *      .add(CSPDirective.FONT_SRC, CSPDirectiveSrcValue.SELF));
  *
- *  myApplication.getContentSecuritySettings().reporting().strict();
+ *  myApplication.getCspSettings().reporting().strict();
  * 	}
  * </pre>
  * 
diff --git a/wicket-core/src/main/java/org/apache/wicket/mock/MockApplication.java b/wicket-core/src/main/java/org/apache/wicket/mock/MockApplication.java
index 8dd8920..ecee55c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/mock/MockApplication.java
+++ b/wicket-core/src/main/java/org/apache/wicket/mock/MockApplication.java
@@ -75,6 +75,6 @@ public class MockApplication extends WebApplication
 		// and isn't needed, because the markup isn't rendered by a browser
 		getResourceSettings().disableWicketCoreCSS();
 		// disable nonces, CSP is not needed anyway during tests
-		getContentSecurityPolicySettings().blocking().disabled();
+		getCspSettings().blocking().disabled();
 	}
 }
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
index 6c02a29..a1763c5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
@@ -18,14 +18,17 @@ package org.apache.wicket.protocol.http;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
+import java.time.Duration;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.Locale;
 import java.util.function.Function;
+
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+
 import org.apache.wicket.Application;
 import org.apache.wicket.Page;
 import org.apache.wicket.RuntimeConfigurationType;
@@ -42,8 +45,6 @@ import org.apache.wicket.core.util.file.WebApplicationPath;
 import org.apache.wicket.core.util.resource.ClassPathResourceFinder;
 import org.apache.wicket.csp.CSPHeaderConfiguration;
 import org.apache.wicket.csp.ContentSecurityPolicySettings;
-import org.apache.wicket.csp.ReportCSPViolationMapper;
-import org.apache.wicket.csp.CSPNonceHeaderResponseDecorator;
 import org.apache.wicket.markup.MarkupType;
 import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -74,7 +75,6 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
 import org.apache.wicket.request.resource.ResourceReference;
 import org.apache.wicket.resource.bundles.ReplacementResourceBundleReference;
 import org.apache.wicket.session.HttpSessionStore;
-import org.apache.wicket.settings.JavaScriptLibrarySettings;
 import org.apache.wicket.util.crypt.CharEncoding;
 import org.apache.wicket.util.file.FileCleaner;
 import org.apache.wicket.util.file.IFileCleaner;
@@ -82,7 +82,6 @@ import org.apache.wicket.util.file.Path;
 import org.apache.wicket.util.lang.Args;
 import org.apache.wicket.util.lang.PackageName;
 import org.apache.wicket.util.string.Strings;
-import java.time.Duration;
 import org.apache.wicket.util.watch.IModificationWatcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -763,7 +762,7 @@ public abstract class WebApplication extends Application
 			});
 		});
 
-		getContentSecurityPolicySettings().enforce(this);
+		getCspSettings().enforce(this);
 		
 		// Configure the app.
 		configure();
@@ -775,9 +774,9 @@ public abstract class WebApplication extends Application
 			{
 				getResourceSettings().getResourceFinders().add(new Path(resourceFolder));
 			}
-			getContentSecurityPolicySettings().blocking().reportBack();
+			getCspSettings().blocking().reportBack();
 		}
-		getContentSecurityPolicySettings().blocking().strict();
+		getCspSettings().blocking().strict();
 	}
 
 	/**
@@ -1092,9 +1091,9 @@ public abstract class WebApplication extends Application
 	 * Builds the {@link ContentSecurityPolicySettings} to be used for this application. Override
 	 * this method to provider your own implementation.
 	 * 
-	 * @return The newly created CSP enforcer.
+	 * @return The newly created CSP settings.
 	 */
-	protected ContentSecurityPolicySettings newContentSecurityPolicySettings()
+	protected ContentSecurityPolicySettings newCspSettings()
 	{
 		return new ContentSecurityPolicySettings(this);
 	}
@@ -1108,13 +1107,13 @@ public abstract class WebApplication extends Application
 	 * @see ContentSecurityPolicySettings
 	 * @see CSPHeaderConfiguration
 	 */
-	public ContentSecurityPolicySettings getContentSecurityPolicySettings()
+	public ContentSecurityPolicySettings getCspSettings()
 	{
 		checkSettingsAvailable();
 
 		if (cspSettings == null)
 		{
-			cspSettings = newContentSecurityPolicySettings();
+			cspSettings = newCspSettings();
 		}
 		return cspSettings;
 	}
diff --git a/wicket-core/src/test/java/org/apache/wicket/csp/CSPSettingRequestCycleListenerTest.java b/wicket-core/src/test/java/org/apache/wicket/csp/CSPSettingRequestCycleListenerTest.java
index 64788ca..25eb9d9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/csp/CSPSettingRequestCycleListenerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/csp/CSPSettingRequestCycleListenerTest.java
@@ -54,7 +54,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testNullSrcInputIsRejected()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		Assertions.assertThrows(IllegalArgumentException.class, () -> {
 			settings.blocking().add(DEFAULT_SRC, (String) null);
 		});
@@ -63,7 +63,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testEmptySrcInputIsRejected()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		Assertions.assertThrows(IllegalArgumentException.class, () -> {
 			settings.blocking().add(DEFAULT_SRC, "");
 		});
@@ -76,7 +76,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testInvalidSrcInputIsRejected()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		Assertions.assertThrows(IllegalArgumentException.class, () -> {
 			settings.blocking().add(DEFAULT_SRC, "abc?^()-_\'xyz");
 		});
@@ -89,7 +89,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testMultipleSrcInputWithNoneIsRejected1()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		Assertions.assertThrows(IllegalArgumentException.class, () -> {
 			settings.blocking().add(DEFAULT_SRC, SELF, NONE);
 		});
@@ -102,7 +102,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testMultipleSrcInputWithNoneIsRejected2()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		Assertions.assertThrows(IllegalArgumentException.class, () -> {
 			settings.blocking().add(DEFAULT_SRC, NONE, SELF);
 		});
@@ -115,7 +115,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testMultipleSrcInputWithStarIsRejected1()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		settings.blocking().add(DEFAULT_SRC, SELF);
 		Assertions.assertThrows(IllegalArgumentException.class, () -> {
 			settings.blocking().add(DEFAULT_SRC, WILDCARD);
@@ -129,7 +129,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testMultipleSrcInputWithStarIsRejected2()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		settings.blocking().add(DEFAULT_SRC, WILDCARD);
 		Assertions.assertThrows(IllegalArgumentException.class, () -> {
 			settings.blocking().add(DEFAULT_SRC, SELF);
@@ -139,7 +139,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testWrongSrcInputIsRejected()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		Assertions.assertThrows(IllegalArgumentException.class, () -> {
 			settings.blocking().add(DEFAULT_SRC, ALLOW_FORMS);
 		});
@@ -148,7 +148,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testWrongSandboxInputIsRejected()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		Assertions.assertThrows(IllegalArgumentException.class, () -> {
 			settings.blocking().add(SANDBOX, SELF);
 		});
@@ -157,7 +157,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testNullSandboxInputIsRejected()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		Assertions.assertThrows(IllegalArgumentException.class, () -> {
 			settings.blocking().add(SANDBOX, (String) null);
 		});
@@ -166,14 +166,14 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testEmptySandboxInputIsAccepted()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		settings.blocking().add(SANDBOX, CSPDirectiveSandboxValue.EMPTY);
 	}
 
 	@Test
 	public void testInvalidSandboxInputIsRejected()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		Assertions.assertThrows(IllegalArgumentException.class, () -> {
 			settings.blocking().add(SANDBOX, "abcxyz");
 		});
@@ -182,7 +182,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testMultipleSandboxInputWithEmptyStringIsRejected1()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		settings.blocking().add(SANDBOX, ALLOW_FORMS);
 		Assertions.assertThrows(IllegalArgumentException.class, () -> {
 			settings.blocking().add(SANDBOX, EMPTY);
@@ -192,7 +192,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testMultipleSandboxInputWithEmptyStringIsRejected2()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		settings.blocking().add(SANDBOX, EMPTY);
 		Assertions.assertThrows(IllegalArgumentException.class, () -> {
 			settings.blocking().add(SANDBOX, ALLOW_FORMS);
@@ -202,7 +202,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testNullReportUriInputIsRejected()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		Assertions.assertThrows(IllegalArgumentException.class, () -> {
 			settings.blocking().add(REPORT_URI, (String) null);
 		});
@@ -211,7 +211,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testEmptyReportUriInputIsRejected()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		Assertions.assertThrows(IllegalArgumentException.class, () -> {
 			settings.blocking().add(REPORT_URI, "");
 		});
@@ -220,7 +220,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testInvalidReportUriInputIsRejected()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		Assertions.assertThrows(IllegalArgumentException.class, () -> {
 			settings.blocking().add(REPORT_URI, "abc?^()-_\'xyz");
 		});
@@ -229,7 +229,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testAllCSPSrcDefaultEnumsAreSetCorrectly() throws NoSuchAlgorithmException
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 
 		final int cspDirectiveCount = CSPDirective.values().length;
 		final int cspDirectiveSrcValueCount = CSPDirectiveSrcValue.values().length;
@@ -258,7 +258,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testCSPReportUriDirectiveSetCorrectly()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		settings.blocking().add(REPORT_URI, "http://report.example.com");
 		settings.reporting().add(REPORT_URI, "/example-report-uri");
 
@@ -273,7 +273,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testCSPSandboxDirectiveSetCorrectly()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		final int cspSandboxDirectiveValueCount = CSPDirectiveSandboxValue.values().length;
 		for (int i = 0; i < cspSandboxDirectiveValueCount; i++)
 		{
@@ -300,7 +300,7 @@ public class CSPSettingRequestCycleListenerTest extends WicketTestCase
 	@Test
 	public void testChildSrcDirectiveAlsoSetsFrameSrcDirective()
 	{
-		ContentSecurityPolicySettings settings = tester.getApplication().getContentSecurityPolicySettings();
+		ContentSecurityPolicySettings settings = tester.getApplication().getCspSettings();
 		settings.blocking().add(CHILD_SRC, SELF);
 		settings.reporting().add(CHILD_SRC, SELF);
 		List<String> headerErrors = checkHeaders();
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
index 2286a4c..ab1276a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java
@@ -45,7 +45,7 @@ class FilteringHeaderResponseTest extends WicketTestCase
 		return new MockApplication()
 		{
 			@Override
-			protected ContentSecurityPolicySettings newContentSecurityPolicySettings()
+			protected ContentSecurityPolicySettings newCspSettings()
 			{
 				return new ContentSecurityPolicySettings(this)
 				{
@@ -117,7 +117,7 @@ class FilteringHeaderResponseTest extends WicketTestCase
 	@Test
 	void nonce() throws Exception
 	{
-		tester.getApplication().getContentSecurityPolicySettings().blocking().strict();
+		tester.getApplication().getCspSettings().blocking().strict();
 		executeTest(CspNoncePage.class, "CspNoncePageExpected.html");
 	}
 }
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java
index a2c7b1c..2303b34 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java
@@ -63,7 +63,7 @@ public abstract class WicketExampleApplication extends WebApplication
 		getDebugSettings().setDevelopmentUtilitiesEnabled(true);
 		
 		getResourceSettings().setCssCompressor(new CssUrlReplacer());
-		getContentSecurityPolicySettings().blocking().strict().reportBack()
+		getCspSettings().blocking().strict().reportBack()
 		                .add(CSPDirective.STYLE_SRC,
 						"https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css")
 		                .add(CSPDirective.FONT_SRC, "https://maxcdn.bootstrapcdn.com");
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebApplication.java
index 6628679..d01c1a1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MyAuthenticatedWebApplication.java
@@ -54,7 +54,7 @@ public class MyAuthenticatedWebApplication extends AuthenticatedWebApplication
 		super.init();
 		getDebugSettings().setDevelopmentUtilitiesEnabled(true);
 
-		getContentSecurityPolicySettings().blocking()
+		getCspSettings().blocking()
 		                .strict()
 		                .reportBack()
 		                .add(CSPDirective.STYLE_SRC,
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java
index 59eccc0..4487be6 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java
@@ -41,7 +41,7 @@ public class ImagesApplication extends WicketExampleApplication
 		super.init();
 
 		getSharedResources().add("cancelButton", new DefaultButtonImageResource("Cancel"));
-		getContentSecurityPolicySettings().blocking().add(CSPDirective.IMG_SRC, "data:");
+		getCspSettings().blocking().add(CSPDirective.IMG_SRC, "data:");
 	}
 
 }
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/media/VideosApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/media/VideosApplication.java
index 8494511..59dd0a3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/media/VideosApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/media/VideosApplication.java
@@ -49,7 +49,7 @@ public class VideosApplication extends WicketExampleApplication
 			guard.addPattern("+*.mp4");
 		}
 		
-		getContentSecurityPolicySettings().blocking()
+		getCspSettings().blocking()
 		                .add(CSPDirective.MEDIA_SRC, CSPDirectiveSrcValue.SELF)
 		                .add(CSPDirective.MEDIA_SRC, "https://w3c-test.org/media/movie_300.mp4");
 	}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/JSR356Application.java b/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/JSR356Application.java
index b72a300..b8c68cf 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/JSR356Application.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/JSR356Application.java
@@ -65,7 +65,7 @@ public class JSR356Application extends WicketExampleApplication
 
 		// The websocket example loads JS from ajax.googleapis.com, which is not allowed by the CSP.
 		// This now serves as an example on how to disable CSP
-		getContentSecurityPolicySettings().blocking().disabled();
+		getCspSettings().blocking().disabled();
 	}
 
     @Override