Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/swift-plums-cover.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Remove the redundant `https://*.client.protect.clerk.com` source from CSP headers generated by `clerkMiddleware()`.
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ describe('CSP Header Utils', () => {

expect(directives).toContainEqual("default-src 'self'");
expect(directives).toContainEqual(
"connect-src 'self' https://clerk-telemetry.com https://*.clerk-telemetry.com https://api.stripe.com https://maps.googleapis.com https://img.clerk.com https://images.clerkstage.dev https://*.protect.clerk.com https://*.client.protect.clerk.com clerk.example.com",
"connect-src 'self' https://clerk-telemetry.com https://*.clerk-telemetry.com https://api.stripe.com https://maps.googleapis.com https://img.clerk.com https://images.clerkstage.dev https://*.protect.clerk.com clerk.example.com",
);
expect(directives).toContainEqual("form-action 'self'");
expect(directives).toContainEqual(
"frame-src 'self' https://challenges.cloudflare.com https://*.js.stripe.com https://js.stripe.com https://hooks.stripe.com https://*.protect.clerk.com https://*.client.protect.clerk.com",
"frame-src 'self' https://challenges.cloudflare.com https://*.js.stripe.com https://js.stripe.com https://hooks.stripe.com https://*.protect.clerk.com",
);
expect(directives).toContainEqual("img-src 'self' https://img.clerk.com");
expect(directives).toContainEqual("style-src 'self' 'unsafe-inline'");
Expand Down Expand Up @@ -78,15 +78,16 @@ describe('CSP Header Utils', () => {
expect(cspHeader[1]).toContain(`'nonce-${nonceHeader[1]}'`);
});

it('should allow Clerk abuse and fraud protection origins in default and strict modes', () => {
it('should allow Clerk subdomains needed for abuse and fraud protection in default and strict modes', () => {
for (const strict of [false, true]) {
const result = createContentSecurityPolicyHeaders(testHost, { strict });
const directives = result.headers[0][1].split('; ');

for (const directiveName of ['script-src', 'connect-src', 'frame-src']) {
const directive = directives.find(d => d.startsWith(directiveName));
expect(directive).toContain('https://*.protect.clerk.com');
expect(directive).toContain('https://*.client.protect.clerk.com');
const directiveSources = directives.find(d => d.startsWith(directiveName))?.split(' ');
expect(directiveSources).toContain('https://*.protect.clerk.com');
expect(directiveSources).not.toContain('https://*.clerk.com');
expect(directiveSources).not.toContain('https://*.client.protect.clerk.com');
}

if (strict) {
Expand All @@ -110,11 +111,11 @@ describe('CSP Header Utils', () => {
const directives = headerValue.split('; ');
expect(directives).toContainEqual("default-src 'self'");
expect(directives).toContainEqual(
"connect-src 'self' https://clerk-telemetry.com https://*.clerk-telemetry.com https://api.stripe.com https://maps.googleapis.com https://img.clerk.com https://images.clerkstage.dev https://*.protect.clerk.com https://*.client.protect.clerk.com clerk.example.com",
"connect-src 'self' https://clerk-telemetry.com https://*.clerk-telemetry.com https://api.stripe.com https://maps.googleapis.com https://img.clerk.com https://images.clerkstage.dev https://*.protect.clerk.com clerk.example.com",
);
expect(directives).toContainEqual("form-action 'self'");
expect(directives).toContainEqual(
"frame-src 'self' https://challenges.cloudflare.com https://*.js.stripe.com https://js.stripe.com https://hooks.stripe.com https://*.protect.clerk.com https://*.client.protect.clerk.com",
"frame-src 'self' https://challenges.cloudflare.com https://*.js.stripe.com https://js.stripe.com https://hooks.stripe.com https://*.protect.clerk.com",
);
expect(directives).toContainEqual("img-src 'self' https://img.clerk.com");
expect(directives).toContainEqual("style-src 'self' 'unsafe-inline'");
Expand Down Expand Up @@ -259,7 +260,7 @@ describe('CSP Header Utils', () => {

const directives = result.headers[0][1].split('; ');
expect(directives).toContainEqual(
`connect-src 'self' https://clerk-telemetry.com https://*.clerk-telemetry.com https://api.stripe.com https://maps.googleapis.com https://img.clerk.com https://images.clerkstage.dev https://*.protect.clerk.com https://*.client.protect.clerk.com clerk.example.com https://api.example.com`,
`connect-src 'self' https://clerk-telemetry.com https://*.clerk-telemetry.com https://api.stripe.com https://maps.googleapis.com https://img.clerk.com https://images.clerkstage.dev https://*.protect.clerk.com clerk.example.com https://api.example.com`,
);

const imgSrcDirective = directives.find(d => d.startsWith('img-src')) || '';
Expand All @@ -269,7 +270,7 @@ describe('CSP Header Utils', () => {
expect(imgSrcDirective).toContain('https://images.example.com');

expect(directives).toContainEqual(
`frame-src 'self' https://challenges.cloudflare.com https://*.js.stripe.com https://js.stripe.com https://hooks.stripe.com https://*.protect.clerk.com https://*.client.protect.clerk.com https://frames.example.com`,
`frame-src 'self' https://challenges.cloudflare.com https://*.js.stripe.com https://js.stripe.com https://hooks.stripe.com https://*.protect.clerk.com https://frames.example.com`,
);
});

Expand All @@ -279,12 +280,12 @@ describe('CSP Header Utils', () => {
const directives = result.headers[0][1].split('; ');

expect(directives).toContainEqual(
"connect-src 'self' https://clerk-telemetry.com https://*.clerk-telemetry.com https://api.stripe.com https://maps.googleapis.com https://img.clerk.com https://images.clerkstage.dev https://*.protect.clerk.com https://*.client.protect.clerk.com clerk.example.com",
"connect-src 'self' https://clerk-telemetry.com https://*.clerk-telemetry.com https://api.stripe.com https://maps.googleapis.com https://img.clerk.com https://images.clerkstage.dev https://*.protect.clerk.com clerk.example.com",
);
expect(directives).toContainEqual("default-src 'self'");
expect(directives).toContainEqual("form-action 'self'");
expect(directives).toContainEqual(
"frame-src 'self' https://challenges.cloudflare.com https://*.js.stripe.com https://js.stripe.com https://hooks.stripe.com https://*.protect.clerk.com https://*.client.protect.clerk.com",
"frame-src 'self' https://challenges.cloudflare.com https://*.js.stripe.com https://js.stripe.com https://hooks.stripe.com https://*.protect.clerk.com",
);
expect(directives).toContainEqual("img-src 'self' https://img.clerk.com");
expect(directives).toContainEqual("style-src 'self' 'unsafe-inline'");
Expand Down Expand Up @@ -325,11 +326,11 @@ describe('CSP Header Utils', () => {
const directives = result.headers[0][1].split('; ');

expect(directives).toContainEqual(
`connect-src 'self' https://clerk-telemetry.com https://*.clerk-telemetry.com https://api.stripe.com https://maps.googleapis.com https://img.clerk.com https://images.clerkstage.dev https://*.protect.clerk.com https://*.client.protect.clerk.com clerk.example.com`,
`connect-src 'self' https://clerk-telemetry.com https://*.clerk-telemetry.com https://api.stripe.com https://maps.googleapis.com https://img.clerk.com https://images.clerkstage.dev https://*.protect.clerk.com clerk.example.com`,
);
expect(directives).toContainEqual(`img-src 'self' https://img.clerk.com`);
expect(directives).toContainEqual(
`frame-src 'self' https://challenges.cloudflare.com https://*.js.stripe.com https://js.stripe.com https://hooks.stripe.com https://*.protect.clerk.com https://*.client.protect.clerk.com`,
`frame-src 'self' https://challenges.cloudflare.com https://*.js.stripe.com https://js.stripe.com https://hooks.stripe.com https://*.protect.clerk.com`,
);

expect(directives).toContainEqual(`default-src 'self'`);
Expand Down Expand Up @@ -391,12 +392,12 @@ describe('CSP Header Utils', () => {
const directives = result.headers[0][1].split('; ');

expect(directives).toContainEqual(
"connect-src 'self' https://clerk-telemetry.com https://*.clerk-telemetry.com https://api.stripe.com https://maps.googleapis.com https://img.clerk.com https://images.clerkstage.dev https://*.protect.clerk.com https://*.client.protect.clerk.com clerk.example.com",
"connect-src 'self' https://clerk-telemetry.com https://*.clerk-telemetry.com https://api.stripe.com https://maps.googleapis.com https://img.clerk.com https://images.clerkstage.dev https://*.protect.clerk.com clerk.example.com",
);
expect(directives).toContainEqual("default-src 'self'");
expect(directives).toContainEqual("form-action 'self'");
expect(directives).toContainEqual(
"frame-src 'self' https://challenges.cloudflare.com https://*.js.stripe.com https://js.stripe.com https://hooks.stripe.com https://*.protect.clerk.com https://*.client.protect.clerk.com value1 value2",
"frame-src 'self' https://challenges.cloudflare.com https://*.js.stripe.com https://js.stripe.com https://hooks.stripe.com https://*.protect.clerk.com value1 value2",
);
expect(directives).toContainEqual("img-src 'self' https://img.clerk.com");
expect(directives).toContainEqual("style-src 'self' 'unsafe-inline'");
Expand Down
8 changes: 4 additions & 4 deletions packages/nextjs/src/server/content-security-policy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { constants } from '@clerk/backend/internal';

const clerkProtectionOrigins = ['https://*.protect.clerk.com', 'https://*.client.protect.clerk.com'];
const clerkProtectionOrigin = 'https://*.protect.clerk.com';

/**
* Valid CSP directives according to the CSP Level 3 specification
Expand Down Expand Up @@ -105,7 +105,7 @@ class ContentSecurityPolicyDirectiveManager {
'https://maps.googleapis.com',
'https://img.clerk.com',
'https://images.clerkstage.dev',
...clerkProtectionOrigins,
clerkProtectionOrigin,
],
'default-src': ['self'],
'form-action': ['self'],
Expand All @@ -115,7 +115,7 @@ class ContentSecurityPolicyDirectiveManager {
'https://*.js.stripe.com',
'https://js.stripe.com',
'https://hooks.stripe.com',
...clerkProtectionOrigins,
clerkProtectionOrigin,
],
'img-src': ['self', 'https://img.clerk.com'],
'script-src': [
Expand All @@ -127,7 +127,7 @@ class ContentSecurityPolicyDirectiveManager {
'https://*.js.stripe.com',
'https://js.stripe.com',
'https://maps.googleapis.com',
...clerkProtectionOrigins,
clerkProtectionOrigin,
],
'style-src': ['self', 'unsafe-inline'],
'worker-src': ['self', 'blob:'],
Expand Down
Loading