This is an automated email from the ASF dual-hosted git repository.
abhishek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 378fea9517 Retain CSP configuration in ServerConfig constructor.
(#12755)
378fea9517 is described below
commit 378fea951756483831e47502fd18fb5ed58747af
Author: Gian Merlino <[email protected]>
AuthorDate: Fri Jul 8 06:49:14 2022 -0700
Retain CSP configuration in ServerConfig constructor. (#12755)
Without this change, CliIndexer would not apply custom CSP headers
and would revert to the default.
---
.../java/org/apache/druid/server/initialization/ServerConfig.java | 1 +
.../test/java/org/apache/druid/initialization/ServerConfigTest.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
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 3c031e3783..460153c95d 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 02aa4d2c1c..1f7e8165b2 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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
