Skip to content

New metrics to track report and enforce CSPs #6369

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

Closed
labkey-jeckels wants to merge 1 commit into from
Closed

New metrics to track report and enforce CSPs #6369

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
9 changes: 8 additions & 1 deletion api/src/org/labkey/api/ApiModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@
import org.labkey.api.settings.OptionalFeatureService.FeatureType;
import org.labkey.api.settings.OptionalFeatureStartupListener;
import org.labkey.api.settings.WriteableLookAndFeelProperties;
import org.labkey.api.usageMetrics.UsageMetricsService;
import org.labkey.api.util.ChecksumUtil;
import org.labkey.api.util.Compress;
import org.labkey.api.util.ContextListener;
Expand Down Expand Up @@ -216,6 +217,8 @@ public class ApiModule extends CodeOnlyModule
private static final String CORS_PREFIX = "cors.";
private static final String CORS_FILTER_NAME = "CorsFilter";

private static final Map<String, Object> CSP_METRICS = new HashMap<>();

@Override
protected void init()
{
Expand Down Expand Up @@ -261,6 +264,9 @@ protected void doStartup(ModuleContext moduleContext)
ContextListener.addStartupListener(new OptionalFeatureStartupListener());
ContextListener.addStartupListener(new SystemMaintenanceStartupListener());
ContextListener.addStartupListener(new StartupPropertyStartupListener());

UsageMetricsService.get().registerUsageMetrics(getName(), () ->
Map.of("contentSecurityPolicy", Collections.unmodifiableMap(CSP_METRICS)));
}

@Override
Expand Down Expand Up @@ -314,6 +320,7 @@ private void addCSPFilter(ServletContext servletCtx, String parameterName, Strin
String policy = servletCtx.getInitParameter(parameterName);
if (null != policy)
{
CSP_METRICS.put(disposition, policy);
FilterRegistration registration = servletCtx.addFilter(filterName, new ContentSecurityPolicyFilter());
registration.addMappingForUrlPatterns(allOf(DispatcherType.class), false, "/*");
registration.setInitParameters(Map.of("policy", policy, "disposition", disposition));
Expand Down Expand Up @@ -537,7 +544,7 @@ public JSONObject getPageContextJson(ContainerUser context)
{
JSONObject json = new JSONObject(getDefaultPageContextJson(context.getContainer()));

AuthenticationConfiguration.SSOAuthenticationConfiguration config = AuthenticationManager.getAutoRedirectSSOAuthConfiguration();
AuthenticationConfiguration.SSOAuthenticationConfiguration<?> config = AuthenticationManager.getAutoRedirectSSOAuthConfiguration();
if (config != null)
json.put("AutoRedirectSSOAuthConfiguration", config.getDescription());

Expand Down