From fd108657a643321f6037e90fd5b7bba9e6b097f0 Mon Sep 17 00:00:00 2001 From: bbimber Date: Tue, 9 Apr 2024 17:27:06 -0500 Subject: [PATCH 1/2] Add registerAllowedConnectionSource to JBrowse and mGAP (#280) --- jbrowse/src/org/labkey/jbrowse/JBrowseModule.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jbrowse/src/org/labkey/jbrowse/JBrowseModule.java b/jbrowse/src/org/labkey/jbrowse/JBrowseModule.java index 7221529af..2f62a435e 100644 --- a/jbrowse/src/org/labkey/jbrowse/JBrowseModule.java +++ b/jbrowse/src/org/labkey/jbrowse/JBrowseModule.java @@ -34,6 +34,7 @@ import org.labkey.api.util.SystemMaintenance; import org.labkey.api.view.WebPartFactory; import org.labkey.api.webdav.WebdavService; +import org.labkey.filters.ContentSecurityPolicyFilter; import org.labkey.jbrowse.button.AddLibraryButton; import org.labkey.jbrowse.button.AddTrackButton; import org.labkey.jbrowse.button.ModifyTrackConfigButton; @@ -110,6 +111,9 @@ public void doStartupAfterSpringConfig(ModuleContext moduleContext) JBrowseService.get().registerFieldCustomizer(new JBrowseLuceneSearch.DefaultJBrowseFieldCustomizer()); JBrowseService.get().registerGroupsProvider(new JBrowseLuceneSearch.TestJBrowseGroupProvider()); + + // These are all part of the JBrowse demo data: + ContentSecurityPolicyFilter.registerAllowedConnectionSource(this.getClass().getName(), "https://jbrowse.org", "https://s3.amazonaws.com/jbrowse.org", "https://ftp.ncbi.nlm.nih.gov/pub/clinvar"); } public static void registerPipelineSteps() From cdc68e9a1ce0369792eb37ebb9229d6408c43238 Mon Sep 17 00:00:00 2001 From: bbimber Date: Tue, 9 Apr 2024 19:40:23 -0700 Subject: [PATCH 2/2] Update registerAllowedConnectionSource URLs --- jbrowse/src/org/labkey/jbrowse/JBrowseModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jbrowse/src/org/labkey/jbrowse/JBrowseModule.java b/jbrowse/src/org/labkey/jbrowse/JBrowseModule.java index 2f62a435e..a05f1be6a 100644 --- a/jbrowse/src/org/labkey/jbrowse/JBrowseModule.java +++ b/jbrowse/src/org/labkey/jbrowse/JBrowseModule.java @@ -113,7 +113,7 @@ public void doStartupAfterSpringConfig(ModuleContext moduleContext) JBrowseService.get().registerGroupsProvider(new JBrowseLuceneSearch.TestJBrowseGroupProvider()); // These are all part of the JBrowse demo data: - ContentSecurityPolicyFilter.registerAllowedConnectionSource(this.getClass().getName(), "https://jbrowse.org", "https://s3.amazonaws.com/jbrowse.org", "https://ftp.ncbi.nlm.nih.gov/pub/clinvar"); + ContentSecurityPolicyFilter.registerAllowedConnectionSource(this.getClass().getName(), "https://jbrowse.org", "https://s3.amazonaws.com", "https://ftp.ncbi.nlm.nih.gov/pub/clinvar"); } public static void registerPipelineSteps()