Skip to content

GitHub Issue 1189: Update Google Analytics CSP #7700

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

Open
labkey-jeckels wants to merge 1 commit into
base: release26.3-SNAPSHOT
Choose a base branch
from
+4 −2
Open

GitHub Issue 1189: Update Google Analytics CSP #7700

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
6 changes: 4 additions & 2 deletions core/src/org/labkey/core/analytics/AnalyticsServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public class AnalyticsServiceImpl implements AnalyticsService
{
private static final String SEPARATOR = ",";
private static final String GOOGLE_TAG_MANAGER_URL = "https://www.googletagmanager.com";
private static final String GOOGLE_URL = "https://www.google.com";
private static final String ANALYTICS_CSP_KEY = AnalyticsServiceImpl.class.getName();

public static AnalyticsServiceImpl get()
Expand Down Expand Up @@ -123,8 +124,9 @@ public void resetCSP()

if (getTrackingStatus().contains(TrackingStatus.ga4FullUrl))
{
ContentSecurityPolicyFilter.registerAllowedSources(ANALYTICS_CSP_KEY, Directive.Connection, "https://*.googletagmanager.com", "https://*.google-analytics.com", "https://*.analytics.google.com");
ContentSecurityPolicyFilter.registerAllowedSources(ANALYTICS_CSP_KEY, Directive.Image, "https://www.googletagmanager.com");
// Per https://developers.google.com/tag-platform/security/guides/csp (plus other variants we have seen in the wild)
ContentSecurityPolicyFilter.registerAllowedSources(ANALYTICS_CSP_KEY, Directive.Connection, "https://*.googletagmanager.com", "https://*.google-analytics.com", "https://*.analytics.google.com", GOOGLE_URL);
ContentSecurityPolicyFilter.registerAllowedSources(ANALYTICS_CSP_KEY, Directive.Image, GOOGLE_TAG_MANAGER_URL);
}
}

Expand Down