Add server version info to CSP reports

LabKey · Jan 27, 2024 · d62d166 · d62d166
1 parent add9029
commit d62d166
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 215 deletions.
diff --git a/server/bootstrap/src/org/labkey/filters/ContentSecurityPolicyFilter.java b/server/bootstrap/src/org/labkey/filters/ContentSecurityPolicyFilter.java
diff --git a/server/embedded/src/org/labkey/embedded/LabKeyServer.java b/server/embedded/src/org/labkey/embedded/LabKeyServer.java
@@ -8,7 +8,6 @@
 import org.apache.tomcat.util.descriptor.web.FilterDef;
 import org.apache.tomcat.util.descriptor.web.FilterMap;
 import org.labkey.bootstrap.ConfigException;
-import org.labkey.filters.ContentSecurityPolicyFilter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.ApplicationPidFileWriter;
@@ -130,10 +129,12 @@ protected TomcatWebServer getTomcatWebServer(Tomcat tomcat)
 
                     if (cspFilterProperties.getEnforce() != null)
                     {
+                        context.addParameter("csp.enforce", cspFilterProperties.getEnforce());
                         addCSPFilter("enforce", cspFilterProperties.getEnforce(), ENFORCE_CSP_FILTER_NAME ,context);
                     }
                     if (cspFilterProperties.getReport() != null)
                     {
+                        context.addParameter("csp.report", cspFilterProperties.getReport());
                         addCSPFilter("report", cspFilterProperties.getReport(), REPORT_CSP_FILTER_NAME, context);
                     }
 
@@ -199,7 +200,7 @@ private void addCSPFilter(String disposition, String policy, String filterName,
             {
                 FilterDef filterDef = new FilterDef();
                 filterDef.setFilterName(filterName);
-                filterDef.setFilter(new ContentSecurityPolicyFilter());
+//                filterDef.setFilter(new ContentSecurityPolicyFilter());
                 filterDef.addInitParameter("policy", policy);
                 filterDef.addInitParameter("disposition", disposition);