fix(auth): isolate unsigned macOS keychain entries - #201

Merged
wyattjoh merged 1 commit into
mainfrom
wyattjoh/clerk-cli-macos-keychain-password-prompt-issue
Apr 21, 2026
Merged

fix(auth): isolate unsigned macOS keychain entries#201
wyattjoh merged 1 commit into
mainfrom
wyattjoh/clerk-cli-macos-keychain-password-prompt-issue

Conversation

@wyattjoh

@wyattjohwyattjoh commented Apr 21, 2026

Copy link
Copy Markdown
Contributor

Summary

On macOS, local and unsigned CLI builds were writing OAuth tokens under the same Keychain service name (clerk-cli) as the signed release binary. macOS binds Keychain item ACLs to the code signature of the writer, so a later read from a differently signed (or unsigned) binary triggers a login-password prompt, and an accepted prompt grants that build permanent access to the release credential entry.

Net effect: running a locally compiled clerk (via bun run build:compile, bun run src/cli.ts, or a Bun-launched script) after a signed release login would either pop a password prompt or silently contaminate the release Keychain entry with a dev-build ACL.

Fix

  • Reserve the clerk-cli Keychain service for binaries that codesign-verify as an official release: TeamIdentifier=L8SD6SB282andIdentifier=clerk, with CLI_VERSION populated (i.e. built by the release workflow, not 0.0.0-dev).
  • Route every other darwin invocation (unversioned dev builds, unsigned local compiles, bun run from source, non-Clerk signatures) to a new clerk-cli-dev service. Linux and Windows paths are unchanged.
  • The classifier (isReleaseSignedMacosBinary) is a pure function over the codesign -dvvv output + CLI_VERSION, so it is covered by unit tests without shelling out. The per-process lookup is memoized in a promise so we run codesign at most once per CLI run.

Existing release credentials are not migrated. A developer who had previously approved a prompt will find their dev logins now live in clerk-cli-dev; the release clerk keeps using clerk-cli as before.

Test plan

  • bun test packages/cli-core/src/lib/credential-store-signing.test.ts (new classifier: dev/unversioned, release, non-Clerk signer, mismatched identifier)
  • bun test packages/cli-core/src/lib/credential-store.test.ts
  • bun run format:check, bun run lint, bun run typecheck, bun run test
  • Manual on a Mac with a prior signed-release login: run a locally compiled clerk whoami, confirm no password prompt and --verbose reports the clerk-cli-dev service; then run the signed release clerk whoami and confirm it still reads from clerk-cli.

Prevent local and unsigned macOS builds from writing to the release keychain namespace so developer builds do not trigger prompts or contaminate release credentials.
@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3b2c8ee

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
clerkPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@wyattjoh
wyattjoh marked this pull request as ready for review April 21, 2026 22:04
@coderabbitai

coderabbitaiBot commented Apr 21, 2026

Copy link
Copy Markdown
📝 Walkthrough

Walkthrough

This pull request introduces macOS-specific keychain service isolation to prevent local unsigned builds from accessing the release keychain namespace. The changes add a new isReleaseSignedMacosBinary() function that detects whether the CLI binary is release-signed by parsing codesign -dvvv output. The credential store dynamically selects between a release keychain service and a local dev-only service based on this detection. A new test file validates the signing detection logic across multiple scenarios (unsigned builds, valid Clerk signatures, invalid signatories, mismatched identifiers), and test infrastructure is updated to support the new behavior. A Changeset entry documents the patch version bump.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Details

The changes span four files with mixed complexity. The test additions are straightforward and homogeneous, following standard patterns. The credential-store modifications introduce new logic for parsing codesign output and managing service resolution through caching, requiring understanding of the signing detection heuristics and how they integrate with keyring operations. The integration updates are simple. Overall scope is contained and focused on a specific macOS keychain behavior.

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Title check✅ PassedThe title clearly and concisely summarizes the main change: isolating unsigned macOS keychain entries from the release keychain service.
Description check✅ PassedThe description is thorough and directly related to the changeset, explaining the problem, the fix, and the test plan for isolating macOS keychain entries.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Comment @coderabbitai help to get the list of available commands and usage tips.

@wyattjohwyattjoh changed the title fix: isolate unsigned macOS keychain entriesfix(auth): isolate unsigned macOS keychain entriesApr 21, 2026

@rafa-thaytorafa-thayto left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wyattjoh
wyattjoh merged commit bbbbed6 into mainApr 21, 2026
10 checks passed
@wyattjoh
wyattjoh deleted the wyattjoh/clerk-cli-macos-keychain-password-prompt-issue branch April 21, 2026 23:04
@github-actionsgithub-actionsBot mentioned this pull request Apr 21, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wyattjoh@rafa-thayto
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

fix(auth): isolate unsigned macOS keychain entries - #201

Merged
wyattjoh merged 1 commit into
mainfrom
wyattjoh/clerk-cli-macos-keychain-password-prompt-issue
Apr 21, 2026
Merged

fix(auth): isolate unsigned macOS keychain entries#201
wyattjoh merged 1 commit into
mainfrom
wyattjoh/clerk-cli-macos-keychain-password-prompt-issue

Conversation

@wyattjoh

@wyattjohwyattjoh commented Apr 21, 2026

Copy link
Copy Markdown
Contributor

Summary

On macOS, local and unsigned CLI builds were writing OAuth tokens under the same Keychain service name (clerk-cli) as the signed release binary. macOS binds Keychain item ACLs to the code signature of the writer, so a later read from a differently signed (or unsigned) binary triggers a login-password prompt, and an accepted prompt grants that build permanent access to the release credential entry.

Net effect: running a locally compiled clerk (via bun run build:compile, bun run src/cli.ts, or a Bun-launched script) after a signed release login would either pop a password prompt or silently contaminate the release Keychain entry with a dev-build ACL.

Fix

  • Reserve the clerk-cli Keychain service for binaries that codesign-verify as an official release: TeamIdentifier=L8SD6SB282andIdentifier=clerk, with CLI_VERSION populated (i.e. built by the release workflow, not 0.0.0-dev).
  • Route every other darwin invocation (unversioned dev builds, unsigned local compiles, bun run from source, non-Clerk signatures) to a new clerk-cli-dev service. Linux and Windows paths are unchanged.
  • The classifier (isReleaseSignedMacosBinary) is a pure function over the codesign -dvvv output + CLI_VERSION, so it is covered by unit tests without shelling out. The per-process lookup is memoized in a promise so we run codesign at most once per CLI run.

Existing release credentials are not migrated. A developer who had previously approved a prompt will find their dev logins now live in clerk-cli-dev; the release clerk keeps using clerk-cli as before.

Test plan

  • bun test packages/cli-core/src/lib/credential-store-signing.test.ts (new classifier: dev/unversioned, release, non-Clerk signer, mismatched identifier)
  • bun test packages/cli-core/src/lib/credential-store.test.ts
  • bun run format:check, bun run lint, bun run typecheck, bun run test
  • Manual on a Mac with a prior signed-release login: run a locally compiled clerk whoami, confirm no password prompt and --verbose reports the clerk-cli-dev service; then run the signed release clerk whoami and confirm it still reads from clerk-cli.

Prevent local and unsigned macOS builds from writing to the release keychain namespace so developer builds do not trigger prompts or contaminate release credentials.
@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3b2c8ee

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
clerkPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@wyattjoh
wyattjoh marked this pull request as ready for review April 21, 2026 22:04
@coderabbitai

coderabbitaiBot commented Apr 21, 2026

Copy link
Copy Markdown
📝 Walkthrough

Walkthrough

This pull request introduces macOS-specific keychain service isolation to prevent local unsigned builds from accessing the release keychain namespace. The changes add a new isReleaseSignedMacosBinary() function that detects whether the CLI binary is release-signed by parsing codesign -dvvv output. The credential store dynamically selects between a release keychain service and a local dev-only service based on this detection. A new test file validates the signing detection logic across multiple scenarios (unsigned builds, valid Clerk signatures, invalid signatories, mismatched identifiers), and test infrastructure is updated to support the new behavior. A Changeset entry documents the patch version bump.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Details

The changes span four files with mixed complexity. The test additions are straightforward and homogeneous, following standard patterns. The credential-store modifications introduce new logic for parsing codesign output and managing service resolution through caching, requiring understanding of the signing detection heuristics and how they integrate with keyring operations. The integration updates are simple. Overall scope is contained and focused on a specific macOS keychain behavior.

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Title check✅ PassedThe title clearly and concisely summarizes the main change: isolating unsigned macOS keychain entries from the release keychain service.
Description check✅ PassedThe description is thorough and directly related to the changeset, explaining the problem, the fix, and the test plan for isolating macOS keychain entries.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Comment @coderabbitai help to get the list of available commands and usage tips.

@wyattjohwyattjoh changed the title fix: isolate unsigned macOS keychain entriesfix(auth): isolate unsigned macOS keychain entriesApr 21, 2026

@rafa-thaytorafa-thayto left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wyattjoh
wyattjoh merged commit bbbbed6 into mainApr 21, 2026
10 checks passed
@wyattjoh
wyattjoh deleted the wyattjoh/clerk-cli-macos-keychain-password-prompt-issue branch April 21, 2026 23:04
@github-actionsgithub-actionsBot mentioned this pull request Apr 21, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wyattjoh@rafa-thayto
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(auth): isolate unsigned macOS keychain entries - #201

Merged
wyattjoh merged 1 commit into
mainfrom
wyattjoh/clerk-cli-macos-keychain-password-prompt-issue
Apr 21, 2026
Merged

fix(auth): isolate unsigned macOS keychain entries#201
wyattjoh merged 1 commit into
mainfrom
wyattjoh/clerk-cli-macos-keychain-password-prompt-issue

Conversation

@wyattjoh

@wyattjohwyattjoh commented Apr 21, 2026

Copy link
Copy Markdown
Contributor

Summary

On macOS, local and unsigned CLI builds were writing OAuth tokens under the same Keychain service name (clerk-cli) as the signed release binary. macOS binds Keychain item ACLs to the code signature of the writer, so a later read from a differently signed (or unsigned) binary triggers a login-password prompt, and an accepted prompt grants that build permanent access to the release credential entry.

Net effect: running a locally compiled clerk (via bun run build:compile, bun run src/cli.ts, or a Bun-launched script) after a signed release login would either pop a password prompt or silently contaminate the release Keychain entry with a dev-build ACL.

Fix

  • Reserve the clerk-cli Keychain service for binaries that codesign-verify as an official release: TeamIdentifier=L8SD6SB282andIdentifier=clerk, with CLI_VERSION populated (i.e. built by the release workflow, not 0.0.0-dev).
  • Route every other darwin invocation (unversioned dev builds, unsigned local compiles, bun run from source, non-Clerk signatures) to a new clerk-cli-dev service. Linux and Windows paths are unchanged.
  • The classifier (isReleaseSignedMacosBinary) is a pure function over the codesign -dvvv output + CLI_VERSION, so it is covered by unit tests without shelling out. The per-process lookup is memoized in a promise so we run codesign at most once per CLI run.

Existing release credentials are not migrated. A developer who had previously approved a prompt will find their dev logins now live in clerk-cli-dev; the release clerk keeps using clerk-cli as before.

Test plan

  • bun test packages/cli-core/src/lib/credential-store-signing.test.ts (new classifier: dev/unversioned, release, non-Clerk signer, mismatched identifier)
  • bun test packages/cli-core/src/lib/credential-store.test.ts
  • bun run format:check, bun run lint, bun run typecheck, bun run test
  • Manual on a Mac with a prior signed-release login: run a locally compiled clerk whoami, confirm no password prompt and --verbose reports the clerk-cli-dev service; then run the signed release clerk whoami and confirm it still reads from clerk-cli.

Prevent local and unsigned macOS builds from writing to the release keychain namespace so developer builds do not trigger prompts or contaminate release credentials.
@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3b2c8ee

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
clerkPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@wyattjoh
wyattjoh marked this pull request as ready for review April 21, 2026 22:04
@coderabbitai

coderabbitaiBot commented Apr 21, 2026

Copy link
Copy Markdown
📝 Walkthrough

Walkthrough

This pull request introduces macOS-specific keychain service isolation to prevent local unsigned builds from accessing the release keychain namespace. The changes add a new isReleaseSignedMacosBinary() function that detects whether the CLI binary is release-signed by parsing codesign -dvvv output. The credential store dynamically selects between a release keychain service and a local dev-only service based on this detection. A new test file validates the signing detection logic across multiple scenarios (unsigned builds, valid Clerk signatures, invalid signatories, mismatched identifiers), and test infrastructure is updated to support the new behavior. A Changeset entry documents the patch version bump.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Details

The changes span four files with mixed complexity. The test additions are straightforward and homogeneous, following standard patterns. The credential-store modifications introduce new logic for parsing codesign output and managing service resolution through caching, requiring understanding of the signing detection heuristics and how they integrate with keyring operations. The integration updates are simple. Overall scope is contained and focused on a specific macOS keychain behavior.

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Title check✅ PassedThe title clearly and concisely summarizes the main change: isolating unsigned macOS keychain entries from the release keychain service.
Description check✅ PassedThe description is thorough and directly related to the changeset, explaining the problem, the fix, and the test plan for isolating macOS keychain entries.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Comment @coderabbitai help to get the list of available commands and usage tips.

@wyattjohwyattjoh changed the title fix: isolate unsigned macOS keychain entriesfix(auth): isolate unsigned macOS keychain entriesApr 21, 2026

@rafa-thaytorafa-thayto left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wyattjoh
wyattjoh merged commit bbbbed6 into mainApr 21, 2026
10 checks passed
@wyattjoh
wyattjoh deleted the wyattjoh/clerk-cli-macos-keychain-password-prompt-issue branch April 21, 2026 23:04
@github-actionsgithub-actionsBot mentioned this pull request Apr 21, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wyattjoh@rafa-thayto
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(auth): isolate unsigned macOS keychain entries - #201

Merged
wyattjoh merged 1 commit into
mainfrom
wyattjoh/clerk-cli-macos-keychain-password-prompt-issue
Apr 21, 2026
Merged

fix(auth): isolate unsigned macOS keychain entries#201
wyattjoh merged 1 commit into
mainfrom
wyattjoh/clerk-cli-macos-keychain-password-prompt-issue

Conversation

@wyattjoh

@wyattjohwyattjoh commented Apr 21, 2026

Copy link
Copy Markdown
Contributor

Summary

On macOS, local and unsigned CLI builds were writing OAuth tokens under the same Keychain service name (clerk-cli) as the signed release binary. macOS binds Keychain item ACLs to the code signature of the writer, so a later read from a differently signed (or unsigned) binary triggers a login-password prompt, and an accepted prompt grants that build permanent access to the release credential entry.

Net effect: running a locally compiled clerk (via bun run build:compile, bun run src/cli.ts, or a Bun-launched script) after a signed release login would either pop a password prompt or silently contaminate the release Keychain entry with a dev-build ACL.

Fix

  • Reserve the clerk-cli Keychain service for binaries that codesign-verify as an official release: TeamIdentifier=L8SD6SB282andIdentifier=clerk, with CLI_VERSION populated (i.e. built by the release workflow, not 0.0.0-dev).
  • Route every other darwin invocation (unversioned dev builds, unsigned local compiles, bun run from source, non-Clerk signatures) to a new clerk-cli-dev service. Linux and Windows paths are unchanged.
  • The classifier (isReleaseSignedMacosBinary) is a pure function over the codesign -dvvv output + CLI_VERSION, so it is covered by unit tests without shelling out. The per-process lookup is memoized in a promise so we run codesign at most once per CLI run.

Existing release credentials are not migrated. A developer who had previously approved a prompt will find their dev logins now live in clerk-cli-dev; the release clerk keeps using clerk-cli as before.

Test plan

  • bun test packages/cli-core/src/lib/credential-store-signing.test.ts (new classifier: dev/unversioned, release, non-Clerk signer, mismatched identifier)
  • bun test packages/cli-core/src/lib/credential-store.test.ts
  • bun run format:check, bun run lint, bun run typecheck, bun run test
  • Manual on a Mac with a prior signed-release login: run a locally compiled clerk whoami, confirm no password prompt and --verbose reports the clerk-cli-dev service; then run the signed release clerk whoami and confirm it still reads from clerk-cli.

Prevent local and unsigned macOS builds from writing to the release keychain namespace so developer builds do not trigger prompts or contaminate release credentials.
@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3b2c8ee

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
clerkPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@wyattjoh
wyattjoh marked this pull request as ready for review April 21, 2026 22:04
@coderabbitai

coderabbitaiBot commented Apr 21, 2026

Copy link
Copy Markdown
📝 Walkthrough

Walkthrough

This pull request introduces macOS-specific keychain service isolation to prevent local unsigned builds from accessing the release keychain namespace. The changes add a new isReleaseSignedMacosBinary() function that detects whether the CLI binary is release-signed by parsing codesign -dvvv output. The credential store dynamically selects between a release keychain service and a local dev-only service based on this detection. A new test file validates the signing detection logic across multiple scenarios (unsigned builds, valid Clerk signatures, invalid signatories, mismatched identifiers), and test infrastructure is updated to support the new behavior. A Changeset entry documents the patch version bump.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Details

The changes span four files with mixed complexity. The test additions are straightforward and homogeneous, following standard patterns. The credential-store modifications introduce new logic for parsing codesign output and managing service resolution through caching, requiring understanding of the signing detection heuristics and how they integrate with keyring operations. The integration updates are simple. Overall scope is contained and focused on a specific macOS keychain behavior.

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Title check✅ PassedThe title clearly and concisely summarizes the main change: isolating unsigned macOS keychain entries from the release keychain service.
Description check✅ PassedThe description is thorough and directly related to the changeset, explaining the problem, the fix, and the test plan for isolating macOS keychain entries.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Comment @coderabbitai help to get the list of available commands and usage tips.

@wyattjohwyattjoh changed the title fix: isolate unsigned macOS keychain entriesfix(auth): isolate unsigned macOS keychain entriesApr 21, 2026

@rafa-thaytorafa-thayto left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wyattjoh
wyattjoh merged commit bbbbed6 into mainApr 21, 2026
10 checks passed
@wyattjoh
wyattjoh deleted the wyattjoh/clerk-cli-macos-keychain-password-prompt-issue branch April 21, 2026 23:04
@github-actionsgithub-actionsBot mentioned this pull request Apr 21, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wyattjoh@rafa-thayto
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

fix(auth): isolate unsigned macOS keychain entries - #201

Merged
wyattjoh merged 1 commit into
mainfrom
wyattjoh/clerk-cli-macos-keychain-password-prompt-issue
Apr 21, 2026
Merged

fix(auth): isolate unsigned macOS keychain entries#201
wyattjoh merged 1 commit into
mainfrom
wyattjoh/clerk-cli-macos-keychain-password-prompt-issue

Conversation

@wyattjoh

@wyattjohwyattjoh commented Apr 21, 2026

Copy link
Copy Markdown
Contributor

Summary

On macOS, local and unsigned CLI builds were writing OAuth tokens under the same Keychain service name (clerk-cli) as the signed release binary. macOS binds Keychain item ACLs to the code signature of the writer, so a later read from a differently signed (or unsigned) binary triggers a login-password prompt, and an accepted prompt grants that build permanent access to the release credential entry.

Net effect: running a locally compiled clerk (via bun run build:compile, bun run src/cli.ts, or a Bun-launched script) after a signed release login would either pop a password prompt or silently contaminate the release Keychain entry with a dev-build ACL.

Fix

  • Reserve the clerk-cli Keychain service for binaries that codesign-verify as an official release: TeamIdentifier=L8SD6SB282andIdentifier=clerk, with CLI_VERSION populated (i.e. built by the release workflow, not 0.0.0-dev).
  • Route every other darwin invocation (unversioned dev builds, unsigned local compiles, bun run from source, non-Clerk signatures) to a new clerk-cli-dev service. Linux and Windows paths are unchanged.
  • The classifier (isReleaseSignedMacosBinary) is a pure function over the codesign -dvvv output + CLI_VERSION, so it is covered by unit tests without shelling out. The per-process lookup is memoized in a promise so we run codesign at most once per CLI run.

Existing release credentials are not migrated. A developer who had previously approved a prompt will find their dev logins now live in clerk-cli-dev; the release clerk keeps using clerk-cli as before.

Test plan

  • bun test packages/cli-core/src/lib/credential-store-signing.test.ts (new classifier: dev/unversioned, release, non-Clerk signer, mismatched identifier)
  • bun test packages/cli-core/src/lib/credential-store.test.ts
  • bun run format:check, bun run lint, bun run typecheck, bun run test
  • Manual on a Mac with a prior signed-release login: run a locally compiled clerk whoami, confirm no password prompt and --verbose reports the clerk-cli-dev service; then run the signed release clerk whoami and confirm it still reads from clerk-cli.

Prevent local and unsigned macOS builds from writing to the release keychain namespace so developer builds do not trigger prompts or contaminate release credentials.
@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3b2c8ee

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
clerkPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@wyattjoh
wyattjoh marked this pull request as ready for review April 21, 2026 22:04
@coderabbitai

coderabbitaiBot commented Apr 21, 2026

Copy link
Copy Markdown
📝 Walkthrough

Walkthrough

This pull request introduces macOS-specific keychain service isolation to prevent local unsigned builds from accessing the release keychain namespace. The changes add a new isReleaseSignedMacosBinary() function that detects whether the CLI binary is release-signed by parsing codesign -dvvv output. The credential store dynamically selects between a release keychain service and a local dev-only service based on this detection. A new test file validates the signing detection logic across multiple scenarios (unsigned builds, valid Clerk signatures, invalid signatories, mismatched identifiers), and test infrastructure is updated to support the new behavior. A Changeset entry documents the patch version bump.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Details

The changes span four files with mixed complexity. The test additions are straightforward and homogeneous, following standard patterns. The credential-store modifications introduce new logic for parsing codesign output and managing service resolution through caching, requiring understanding of the signing detection heuristics and how they integrate with keyring operations. The integration updates are simple. Overall scope is contained and focused on a specific macOS keychain behavior.

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Title check✅ PassedThe title clearly and concisely summarizes the main change: isolating unsigned macOS keychain entries from the release keychain service.
Description check✅ PassedThe description is thorough and directly related to the changeset, explaining the problem, the fix, and the test plan for isolating macOS keychain entries.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Comment @coderabbitai help to get the list of available commands and usage tips.

@wyattjohwyattjoh changed the title fix: isolate unsigned macOS keychain entriesfix(auth): isolate unsigned macOS keychain entriesApr 21, 2026

@rafa-thaytorafa-thayto left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wyattjoh
wyattjoh merged commit bbbbed6 into mainApr 21, 2026
10 checks passed
@wyattjoh
wyattjoh deleted the wyattjoh/clerk-cli-macos-keychain-password-prompt-issue branch April 21, 2026 23:04
@github-actionsgithub-actionsBot mentioned this pull request Apr 21, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wyattjoh@rafa-thayto
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(auth): isolate unsigned macOS keychain entries - #201

Merged
wyattjoh merged 1 commit into
mainfrom
wyattjoh/clerk-cli-macos-keychain-password-prompt-issue
Apr 21, 2026
Merged

fix(auth): isolate unsigned macOS keychain entries#201
wyattjoh merged 1 commit into
mainfrom
wyattjoh/clerk-cli-macos-keychain-password-prompt-issue

Conversation

@wyattjoh

@wyattjohwyattjoh commented Apr 21, 2026

Copy link
Copy Markdown
Contributor

Summary

On macOS, local and unsigned CLI builds were writing OAuth tokens under the same Keychain service name (clerk-cli) as the signed release binary. macOS binds Keychain item ACLs to the code signature of the writer, so a later read from a differently signed (or unsigned) binary triggers a login-password prompt, and an accepted prompt grants that build permanent access to the release credential entry.

Net effect: running a locally compiled clerk (via bun run build:compile, bun run src/cli.ts, or a Bun-launched script) after a signed release login would either pop a password prompt or silently contaminate the release Keychain entry with a dev-build ACL.

Fix

  • Reserve the clerk-cli Keychain service for binaries that codesign-verify as an official release: TeamIdentifier=L8SD6SB282andIdentifier=clerk, with CLI_VERSION populated (i.e. built by the release workflow, not 0.0.0-dev).
  • Route every other darwin invocation (unversioned dev builds, unsigned local compiles, bun run from source, non-Clerk signatures) to a new clerk-cli-dev service. Linux and Windows paths are unchanged.
  • The classifier (isReleaseSignedMacosBinary) is a pure function over the codesign -dvvv output + CLI_VERSION, so it is covered by unit tests without shelling out. The per-process lookup is memoized in a promise so we run codesign at most once per CLI run.

Existing release credentials are not migrated. A developer who had previously approved a prompt will find their dev logins now live in clerk-cli-dev; the release clerk keeps using clerk-cli as before.

Test plan

  • bun test packages/cli-core/src/lib/credential-store-signing.test.ts (new classifier: dev/unversioned, release, non-Clerk signer, mismatched identifier)
  • bun test packages/cli-core/src/lib/credential-store.test.ts
  • bun run format:check, bun run lint, bun run typecheck, bun run test
  • Manual on a Mac with a prior signed-release login: run a locally compiled clerk whoami, confirm no password prompt and --verbose reports the clerk-cli-dev service; then run the signed release clerk whoami and confirm it still reads from clerk-cli.

Prevent local and unsigned macOS builds from writing to the release keychain namespace so developer builds do not trigger prompts or contaminate release credentials.
@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3b2c8ee

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
clerkPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@wyattjoh
wyattjoh marked this pull request as ready for review April 21, 2026 22:04
@coderabbitai

coderabbitaiBot commented Apr 21, 2026

Copy link
Copy Markdown
📝 Walkthrough

Walkthrough

This pull request introduces macOS-specific keychain service isolation to prevent local unsigned builds from accessing the release keychain namespace. The changes add a new isReleaseSignedMacosBinary() function that detects whether the CLI binary is release-signed by parsing codesign -dvvv output. The credential store dynamically selects between a release keychain service and a local dev-only service based on this detection. A new test file validates the signing detection logic across multiple scenarios (unsigned builds, valid Clerk signatures, invalid signatories, mismatched identifiers), and test infrastructure is updated to support the new behavior. A Changeset entry documents the patch version bump.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Details

The changes span four files with mixed complexity. The test additions are straightforward and homogeneous, following standard patterns. The credential-store modifications introduce new logic for parsing codesign output and managing service resolution through caching, requiring understanding of the signing detection heuristics and how they integrate with keyring operations. The integration updates are simple. Overall scope is contained and focused on a specific macOS keychain behavior.

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Title check✅ PassedThe title clearly and concisely summarizes the main change: isolating unsigned macOS keychain entries from the release keychain service.
Description check✅ PassedThe description is thorough and directly related to the changeset, explaining the problem, the fix, and the test plan for isolating macOS keychain entries.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Comment @coderabbitai help to get the list of available commands and usage tips.

@wyattjohwyattjoh changed the title fix: isolate unsigned macOS keychain entriesfix(auth): isolate unsigned macOS keychain entriesApr 21, 2026

@rafa-thaytorafa-thayto left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wyattjoh
wyattjoh merged commit bbbbed6 into mainApr 21, 2026
10 checks passed
@wyattjoh
wyattjoh deleted the wyattjoh/clerk-cli-macos-keychain-password-prompt-issue branch April 21, 2026 23:04
@github-actionsgithub-actionsBot mentioned this pull request Apr 21, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wyattjoh@rafa-thayto
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(auth): isolate unsigned macOS keychain entries - #201

Merged
wyattjoh merged 1 commit into
mainfrom
wyattjoh/clerk-cli-macos-keychain-password-prompt-issue
Apr 21, 2026
Merged

fix(auth): isolate unsigned macOS keychain entries#201
wyattjoh merged 1 commit into
mainfrom
wyattjoh/clerk-cli-macos-keychain-password-prompt-issue

Conversation

@wyattjoh

@wyattjohwyattjoh commented Apr 21, 2026

Copy link
Copy Markdown
Contributor

Summary

On macOS, local and unsigned CLI builds were writing OAuth tokens under the same Keychain service name (clerk-cli) as the signed release binary. macOS binds Keychain item ACLs to the code signature of the writer, so a later read from a differently signed (or unsigned) binary triggers a login-password prompt, and an accepted prompt grants that build permanent access to the release credential entry.

Net effect: running a locally compiled clerk (via bun run build:compile, bun run src/cli.ts, or a Bun-launched script) after a signed release login would either pop a password prompt or silently contaminate the release Keychain entry with a dev-build ACL.

Fix

  • Reserve the clerk-cli Keychain service for binaries that codesign-verify as an official release: TeamIdentifier=L8SD6SB282andIdentifier=clerk, with CLI_VERSION populated (i.e. built by the release workflow, not 0.0.0-dev).
  • Route every other darwin invocation (unversioned dev builds, unsigned local compiles, bun run from source, non-Clerk signatures) to a new clerk-cli-dev service. Linux and Windows paths are unchanged.
  • The classifier (isReleaseSignedMacosBinary) is a pure function over the codesign -dvvv output + CLI_VERSION, so it is covered by unit tests without shelling out. The per-process lookup is memoized in a promise so we run codesign at most once per CLI run.

Existing release credentials are not migrated. A developer who had previously approved a prompt will find their dev logins now live in clerk-cli-dev; the release clerk keeps using clerk-cli as before.

Test plan

  • bun test packages/cli-core/src/lib/credential-store-signing.test.ts (new classifier: dev/unversioned, release, non-Clerk signer, mismatched identifier)
  • bun test packages/cli-core/src/lib/credential-store.test.ts
  • bun run format:check, bun run lint, bun run typecheck, bun run test
  • Manual on a Mac with a prior signed-release login: run a locally compiled clerk whoami, confirm no password prompt and --verbose reports the clerk-cli-dev service; then run the signed release clerk whoami and confirm it still reads from clerk-cli.

Prevent local and unsigned macOS builds from writing to the release keychain namespace so developer builds do not trigger prompts or contaminate release credentials.
@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3b2c8ee

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
clerkPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@wyattjoh
wyattjoh marked this pull request as ready for review April 21, 2026 22:04
@coderabbitai

coderabbitaiBot commented Apr 21, 2026

Copy link
Copy Markdown
📝 Walkthrough

Walkthrough

This pull request introduces macOS-specific keychain service isolation to prevent local unsigned builds from accessing the release keychain namespace. The changes add a new isReleaseSignedMacosBinary() function that detects whether the CLI binary is release-signed by parsing codesign -dvvv output. The credential store dynamically selects between a release keychain service and a local dev-only service based on this detection. A new test file validates the signing detection logic across multiple scenarios (unsigned builds, valid Clerk signatures, invalid signatories, mismatched identifiers), and test infrastructure is updated to support the new behavior. A Changeset entry documents the patch version bump.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Details

The changes span four files with mixed complexity. The test additions are straightforward and homogeneous, following standard patterns. The credential-store modifications introduce new logic for parsing codesign output and managing service resolution through caching, requiring understanding of the signing detection heuristics and how they integrate with keyring operations. The integration updates are simple. Overall scope is contained and focused on a specific macOS keychain behavior.

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Title check✅ PassedThe title clearly and concisely summarizes the main change: isolating unsigned macOS keychain entries from the release keychain service.
Description check✅ PassedThe description is thorough and directly related to the changeset, explaining the problem, the fix, and the test plan for isolating macOS keychain entries.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Comment @coderabbitai help to get the list of available commands and usage tips.

@wyattjohwyattjoh changed the title fix: isolate unsigned macOS keychain entriesfix(auth): isolate unsigned macOS keychain entriesApr 21, 2026

@rafa-thaytorafa-thayto left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wyattjoh
wyattjoh merged commit bbbbed6 into mainApr 21, 2026
10 checks passed
@wyattjoh
wyattjoh deleted the wyattjoh/clerk-cli-macos-keychain-password-prompt-issue branch April 21, 2026 23:04
@github-actionsgithub-actionsBot mentioned this pull request Apr 21, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wyattjoh@rafa-thayto
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

fix(auth): isolate unsigned macOS keychain entries - #201

Merged
wyattjoh merged 1 commit into
mainfrom
wyattjoh/clerk-cli-macos-keychain-password-prompt-issue
Apr 21, 2026
Merged

fix(auth): isolate unsigned macOS keychain entries#201
wyattjoh merged 1 commit into
mainfrom
wyattjoh/clerk-cli-macos-keychain-password-prompt-issue

Conversation

@wyattjoh

@wyattjohwyattjoh commented Apr 21, 2026

Copy link
Copy Markdown
Contributor

Summary

On macOS, local and unsigned CLI builds were writing OAuth tokens under the same Keychain service name (clerk-cli) as the signed release binary. macOS binds Keychain item ACLs to the code signature of the writer, so a later read from a differently signed (or unsigned) binary triggers a login-password prompt, and an accepted prompt grants that build permanent access to the release credential entry.

Net effect: running a locally compiled clerk (via bun run build:compile, bun run src/cli.ts, or a Bun-launched script) after a signed release login would either pop a password prompt or silently contaminate the release Keychain entry with a dev-build ACL.

Fix

  • Reserve the clerk-cli Keychain service for binaries that codesign-verify as an official release: TeamIdentifier=L8SD6SB282andIdentifier=clerk, with CLI_VERSION populated (i.e. built by the release workflow, not 0.0.0-dev).
  • Route every other darwin invocation (unversioned dev builds, unsigned local compiles, bun run from source, non-Clerk signatures) to a new clerk-cli-dev service. Linux and Windows paths are unchanged.
  • The classifier (isReleaseSignedMacosBinary) is a pure function over the codesign -dvvv output + CLI_VERSION, so it is covered by unit tests without shelling out. The per-process lookup is memoized in a promise so we run codesign at most once per CLI run.

Existing release credentials are not migrated. A developer who had previously approved a prompt will find their dev logins now live in clerk-cli-dev; the release clerk keeps using clerk-cli as before.

Test plan

  • bun test packages/cli-core/src/lib/credential-store-signing.test.ts (new classifier: dev/unversioned, release, non-Clerk signer, mismatched identifier)
  • bun test packages/cli-core/src/lib/credential-store.test.ts
  • bun run format:check, bun run lint, bun run typecheck, bun run test
  • Manual on a Mac with a prior signed-release login: run a locally compiled clerk whoami, confirm no password prompt and --verbose reports the clerk-cli-dev service; then run the signed release clerk whoami and confirm it still reads from clerk-cli.

Prevent local and unsigned macOS builds from writing to the release keychain namespace so developer builds do not trigger prompts or contaminate release credentials.
@changeset-bot

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3b2c8ee

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
clerkPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@wyattjoh
wyattjoh marked this pull request as ready for review April 21, 2026 22:04
@coderabbitai

coderabbitaiBot commented Apr 21, 2026

Copy link
Copy Markdown
📝 Walkthrough

Walkthrough

This pull request introduces macOS-specific keychain service isolation to prevent local unsigned builds from accessing the release keychain namespace. The changes add a new isReleaseSignedMacosBinary() function that detects whether the CLI binary is release-signed by parsing codesign -dvvv output. The credential store dynamically selects between a release keychain service and a local dev-only service based on this detection. A new test file validates the signing detection logic across multiple scenarios (unsigned builds, valid Clerk signatures, invalid signatories, mismatched identifiers), and test infrastructure is updated to support the new behavior. A Changeset entry documents the patch version bump.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Details

The changes span four files with mixed complexity. The test additions are straightforward and homogeneous, following standard patterns. The credential-store modifications introduce new logic for parsing codesign output and managing service resolution through caching, requiring understanding of the signing detection heuristics and how they integrate with keyring operations. The integration updates are simple. Overall scope is contained and focused on a specific macOS keychain behavior.

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Title check✅ PassedThe title clearly and concisely summarizes the main change: isolating unsigned macOS keychain entries from the release keychain service.
Description check✅ PassedThe description is thorough and directly related to the changeset, explaining the problem, the fix, and the test plan for isolating macOS keychain entries.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Comment @coderabbitai help to get the list of available commands and usage tips.

@wyattjohwyattjoh changed the title fix: isolate unsigned macOS keychain entriesfix(auth): isolate unsigned macOS keychain entriesApr 21, 2026

@rafa-thaytorafa-thayto left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wyattjoh
wyattjoh merged commit bbbbed6 into mainApr 21, 2026
10 checks passed
@wyattjoh
wyattjoh deleted the wyattjoh/clerk-cli-macos-keychain-password-prompt-issue branch April 21, 2026 23:04
@github-actionsgithub-actionsBot mentioned this pull request Apr 21, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wyattjoh@rafa-thayto