Skip to content

Change CSP allowed-sources registration method signature #814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 1 commit into from
Mar 28, 2025
Merged

Change CSP allowed-sources registration method signature #814

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions snprc_scheduler/src/org/labkey/snprc_scheduler/SNPRC_schedulerModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerManager;
import org.labkey.api.ehr.EHRService;
import org.labkey.api.module.DefaultModule;
Expand All @@ -19,7 +18,6 @@
import org.labkey.api.view.Portal;
import org.labkey.api.view.ViewContext;
import org.labkey.api.view.WebPartFactory;
import org.labkey.api.view.WebPartView;
import org.labkey.filters.ContentSecurityPolicyFilter;
import org.labkey.snprc_scheduler.security.SNPRC_schedulerAdminRole;
import org.labkey.snprc_scheduler.security.SNPRC_schedulerEditorsRole;
Expand Down Expand Up @@ -63,7 +61,7 @@ protected Collection<WebPartFactory> createWebPartFactories()
webPartFactories.add(new BaseWebPartFactory("SNPRC Scheduler", WebPartFactory.LOCATION_BODY, WebPartFactory.LOCATION_RIGHT)
{
@Override
public WebPartView getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart)
public SchedulerWebPart getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart)
{
return new SchedulerWebPart();
}
Expand All @@ -89,8 +87,8 @@ protected void init()

// There are two versions of bootstrap in the main app for this module so the css for bootstrap 3.3.7 is brought in via CDN instead of NPM.
// Register the external CDN sources for CSP filters.
ContentSecurityPolicyFilter.registerAllowedSources(Directive.Style, "bs_style", "https://maxcdn.bootstrapcdn.com/bootstrap/");
ContentSecurityPolicyFilter.registerAllowedSources(Directive.Font, "bs_font", "https://maxcdn.bootstrapcdn.com/bootstrap/");
ContentSecurityPolicyFilter.registerAllowedSources("bs_style", Directive.Style, "https://maxcdn.bootstrapcdn.com/bootstrap/");
ContentSecurityPolicyFilter.registerAllowedSources("bs_font", Directive.Font, "https://maxcdn.bootstrapcdn.com/bootstrap/");
}

@Override
Expand Down Expand Up @@ -127,16 +125,6 @@ public QuerySchema createSchema(final DefaultSchema schema, Module module)
// }
}




@Override
@NotNull
public Collection<String> getSummary(Container c)
{
return Collections.emptyList();
}

@Override
@NotNull
public Set<String> getSchemaNames()
Expand Down