From 37f3c4b6bcdda364650e1e19c009f7334cd0f3b3 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Thu, 27 Mar 2025 11:07:16 -0700 Subject: [PATCH] Change CSP host registration method signature --- mGAP/src/org/labkey/mgap/mGAPModule.java | 6 +++--- mcc/src/org/labkey/mcc/MccModule.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mGAP/src/org/labkey/mgap/mGAPModule.java b/mGAP/src/org/labkey/mgap/mGAPModule.java index c8ecc532..86e2a4c6 100644 --- a/mGAP/src/org/labkey/mgap/mGAPModule.java +++ b/mGAP/src/org/labkey/mgap/mGAPModule.java @@ -108,9 +108,9 @@ public void doStartupAfterSpringConfig(ModuleContext moduleContext) SystemMaintenance.addTask(new mGapMaintenanceTask()); - ContentSecurityPolicyFilter.registerAllowedSources(Directive.Connection, this.getClass().getName(), "https://code.jquery.com", "https://*.fontawesome.com"); - ContentSecurityPolicyFilter.registerAllowedSources(Directive.Style, this.getClass().getName(), "https://code.jquery.com", "https://www.gstatic.com"); - ContentSecurityPolicyFilter.registerAllowedSources(Directive.Font, this.getClass().getName(), "https://*.fontawesome.com"); + ContentSecurityPolicyFilter.registerAllowedSources(this.getClass().getName(), Directive.Connection, "https://code.jquery.com", "https://*.fontawesome.com"); + ContentSecurityPolicyFilter.registerAllowedSources(this.getClass().getName(), Directive.Style, "https://code.jquery.com", "https://www.gstatic.com"); + ContentSecurityPolicyFilter.registerAllowedSources(this.getClass().getName(), Directive.Font, "https://*.fontawesome.com"); new PipelineStartup(); } diff --git a/mcc/src/org/labkey/mcc/MccModule.java b/mcc/src/org/labkey/mcc/MccModule.java index 1b1acf3c..c5217661 100644 --- a/mcc/src/org/labkey/mcc/MccModule.java +++ b/mcc/src/org/labkey/mcc/MccModule.java @@ -138,9 +138,9 @@ protected void doStartupAfterSpringConfig(ModuleContext moduleContext) SystemMaintenance.addTask(new MccMaintenanceTask()); - ContentSecurityPolicyFilter.registerAllowedSources(Directive.Connection, this.getClass().getName(), "https://cdn.datatables.net"); - ContentSecurityPolicyFilter.registerAllowedSources(Directive.Style, this.getClass().getName(), "https://cdn.datatables.net"); - ContentSecurityPolicyFilter.registerAllowedSources(Directive.Image, this.getClass().getName(), "https://cdn.datatables.net"); + ContentSecurityPolicyFilter.registerAllowedSources(this.getClass().getName(), Directive.Connection, "https://cdn.datatables.net"); + ContentSecurityPolicyFilter.registerAllowedSources(this.getClass().getName(), Directive.Style, "https://cdn.datatables.net"); + ContentSecurityPolicyFilter.registerAllowedSources(this.getClass().getName(), Directive.Image, "https://cdn.datatables.net"); } @Override