diff --git a/server/src/main/java/org/apache/druid/server/initialization/ServerConfig.java b/server/src/main/java/org/apache/druid/server/initialization/ServerConfig.java index 3c031e37835..460153c95d9 100644 --- a/server/src/main/java/org/apache/druid/server/initialization/ServerConfig.java +++ b/server/src/main/java/org/apache/druid/server/initialization/ServerConfig.java @@ -87,6 +87,7 @@ public class ServerConfig this.allowedHttpMethods = allowedHttpMethods; this.showDetailedJettyErrors = showDetailedJettyErrors; this.errorResponseTransformStrategy = errorResponseTransformStrategy; + this.contentSecurityPolicy = contentSecurityPolicy; } public ServerConfig() diff --git a/server/src/test/java/org/apache/druid/initialization/ServerConfigTest.java b/server/src/test/java/org/apache/druid/initialization/ServerConfigTest.java index 02aa4d2c1c9..1f7e8165b27 100644 --- a/server/src/test/java/org/apache/druid/initialization/ServerConfigTest.java +++ b/server/src/test/java/org/apache/druid/initialization/ServerConfigTest.java @@ -61,7 +61,7 @@ public class ServerConfigTest ImmutableList.of(HttpMethod.OPTIONS), true, new AllowedRegexErrorResponseTransformStrategy(ImmutableList.of(".*")), - defaultConfig.getContentSecurityPolicy() + "my-cool-policy" ); String modifiedConfigJson = OBJECT_MAPPER.writeValueAsString(modifiedConfig); ServerConfig modifiedConfig2 = OBJECT_MAPPER.readValue(modifiedConfigJson, ServerConfig.class); @@ -72,6 +72,8 @@ public class ServerConfigTest Assert.assertTrue(modifiedConfig2.isEnableForwardedRequestCustomizer()); Assert.assertEquals(1, modifiedConfig2.getAllowedHttpMethods().size()); Assert.assertTrue(modifiedConfig2.getAllowedHttpMethods().contains(HttpMethod.OPTIONS)); + Assert.assertEquals("my-cool-policy", modifiedConfig.getContentSecurityPolicy()); + Assert.assertEquals("my-cool-policy", modifiedConfig2.getContentSecurityPolicy()); } @Test