') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); fix(backend): Require configured JWT header type by jescalan · Pull Request #8471 · clerk/javascript · GitHub
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/tidy-chicken-bathe.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": patch
---

Require configured JWT header type.
11 changes: 8 additions & 3 deletions packages/backend/src/jwt/__tests__/assertions.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,10 +107,15 @@ describe('assertAudienceClaim(audience?, aud?)', () => {
});

describe('assertHeaderType(typ?, allowedTypes?)', () => {
it('does not throw error if type is missing', () => {
it('does not throw error if type is missing and allowed types are not configured', () => {
expect(() => assertHeaderType(undefined)).not.toThrow();
expect(() => assertHeaderType(undefined, 'JWT')).not.toThrow();
expect(() => assertHeaderType(undefined, ['JWT', 'at+jwt'])).not.toThrow();
});

it('throws error if type is missing and allowed types are configured', () => {
expect(() => assertHeaderType(undefined, 'JWT')).toThrow(`Invalid JWT type undefined. Expected "JWT".`);
expect(() => assertHeaderType(undefined, ['JWT', 'at+jwt'])).toThrow(
`Invalid JWT type undefined. Expected "JWT, at+jwt".`,
);
});

it('does not throw error if type matches default allowed type (JWT)', () => {
Expand Down
16 changes: 16 additions & 0 deletions packages/backend/src/jwt/__tests__/verifyJwt.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,6 +189,22 @@ describe('verifyJwt(jwt, options)', () => {
expect(error?.message).toContain('Expected "at+jwt"');
});

it('rejects JWT with missing type when headerType is configured', async () => {
const jwtWithoutTyp = createJwt({
header: { typ: undefined },
});
const inputVerifyJwtOptions = {
key: mockJwks.keys[0],
issuer: mockJwtPayload.iss,
authorizedParties: ['https://accounts.inspired.puma-74.lcl.dev'],
headerType: 'at+jwt',
};
const { errors: [error] = [] } = await verifyJwt(jwtWithoutTyp, inputVerifyJwtOptions);
expect(error).toBeDefined();
expect(error?.message).toContain('Invalid JWT type undefined');
expect(error?.message).toContain('Expected "at+jwt"');
});

it('rejects OAuth JWT when headerType does not match', async () => {
const inputVerifyJwtOptions = {
key: mockJwks.keys[0],
Expand Down
7 changes: 4 additions & 3 deletions packages/backend/src/jwt/assertions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,12 +47,13 @@ export const assertAudienceClaim = (aud?: unknown, audience?: unknown) => {
}
};

export const assertHeaderType = (typ?: unknown, allowedTypes: string | string[] = 'JWT') => {
if (typeof typ === 'undefined') {
export const assertHeaderType = (typ?: unknown, allowedTypes?: string | string[]) => {
if (typeof typ === 'undefined' && typeof allowedTypes === 'undefined') {
return;
}

const allowed = Array.isArray(allowedTypes) ? allowedTypes : [allowedTypes];
const expectedTypes = allowedTypes ?? 'JWT';
const allowed = Array.isArray(expectedTypes) ? expectedTypes : [expectedTypes];
if (!allowed.includes(typ as string)) {
throw new TokenVerificationError({
action: TokenVerificationErrorAction.EnsureClerkJWT,
Expand Down
Loading