From d39c732367193f9148036e542c2b49f0bcced47a Mon Sep 17 00:00:00 2001 From: bbimber Date: Thu, 20 Feb 2025 07:25:42 -0800 Subject: [PATCH] Add ContentSecurityPolicyFilter.registerAllowedSources() --- mGAP/src/org/labkey/mgap/mGAPModule.java | 4 +++- mcc/src/org/labkey/mcc/MccModule.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mGAP/src/org/labkey/mgap/mGAPModule.java b/mGAP/src/org/labkey/mgap/mGAPModule.java index 8e7abbf7..037d1892 100644 --- a/mGAP/src/org/labkey/mgap/mGAPModule.java +++ b/mGAP/src/org/labkey/mgap/mGAPModule.java @@ -35,6 +35,7 @@ import org.labkey.api.ldk.notification.NotificationService; import org.labkey.api.module.ModuleContext; import org.labkey.api.query.FieldKey; +import org.labkey.api.security.Directive; import org.labkey.api.sequenceanalysis.SequenceAnalysisService; import org.labkey.api.sequenceanalysis.pipeline.SequencePipelineService; import org.labkey.api.util.PageFlowUtil; @@ -107,7 +108,8 @@ public void doStartupAfterSpringConfig(ModuleContext moduleContext) SystemMaintenance.addTask(new mGapMaintenanceTask()); - ContentSecurityPolicyFilter.registerAllowedConnectionSource(this.getClass().getName(), "https://*.fontawesome.com", "https://code.jquery.com", "https://www.gstatic.com"); + ContentSecurityPolicyFilter.registerAllowedSources(Directive.Connection, this.getClass().getName(), "https://*.fontawesome.com", "https://code.jquery.com"); + ContentSecurityPolicyFilter.registerAllowedSources(Directive.Style, this.getClass().getName(), "https://code.jquery.com", "https://www.gstatic.com"); new PipelineStartup(); } diff --git a/mcc/src/org/labkey/mcc/MccModule.java b/mcc/src/org/labkey/mcc/MccModule.java index 3e951040..8545429f 100644 --- a/mcc/src/org/labkey/mcc/MccModule.java +++ b/mcc/src/org/labkey/mcc/MccModule.java @@ -29,6 +29,7 @@ import org.labkey.api.module.ModuleContext; import org.labkey.api.query.DefaultSchema; import org.labkey.api.query.QuerySchema; +import org.labkey.api.security.Directive; import org.labkey.api.security.permissions.ReadPermission; import org.labkey.api.security.roles.RoleManager; import org.labkey.api.study.Study; @@ -137,7 +138,8 @@ protected void doStartupAfterSpringConfig(ModuleContext moduleContext) SystemMaintenance.addTask(new MccMaintenanceTask()); - ContentSecurityPolicyFilter.registerAllowedConnectionSource(this.getClass().getName(), "https://cdn.datatables.net"); + ContentSecurityPolicyFilter.registerAllowedSources(Directive.Connection, this.getClass().getName(), "https://cdn.datatables.net"); + ContentSecurityPolicyFilter.registerAllowedSources(Directive.Style, this.getClass().getName(), "https://cdn.datatables.net"); } @Override