mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-10-26 18:31:34 +01:00
fix: fail closed on unusable Codex auth during sandbox auth merge
When reusing a Codex sandbox, the workspace-restore step now performs an auth-merge check before adopting the sandbox's auth.json. The merge fails closed when: - host or sandbox Codex auth is unusable (missing token or account) - the subscription payload shapes differ between host and sandbox - subscription account identities do not match Additional hardening: node absence on PATH during the embedded decision script now exits non-zero instead of silently falling through. Co-change comments link parseAuth (the embedded script) to hasUsableAuthPayload (codex-home.ts) so a future auth-format change cannot silently diverge between the two implementations. Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
commit
98df214917
3422 files changed
+1614966
No files matched your search
@@ -0,0 +1,132 @@
|
||||
#!/usr/bin/env node
|
||||
/**
|
||||
* get-bot-token.mjs
|
||||
* Generates a short-lived GitHub installation token for the commitperclip app.
|
||||
* Reads COMMITPERCLIP_KEY env var (PEM content of private key).
|
||||
* Prints the token to stdout.
|
||||
*
|
||||
* Also exports: generateJWT(privateKey), ghFetch(path, token, options)
|
||||
* These are used by all other gate scripts.
|
||||
*/
|
||||
import { createSign } from 'node:crypto';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
const APP_ID = '3718661';
|
||||
const OWNER_PATTERN = /^[a-zA-Z0-9_.-]+$/;
|
||||
const REPO_PATTERN = /^[a-zA-Z0-9_.-]+\/[a-zA-Z0-9_.-]+$/;
|
||||
|
||||
export function generateJWT(privateKey) {
|
||||
const now = Math.floor(Date.now() / 1000);
|
||||
const payload = { iat: now - 10, exp: now + 60, iss: APP_ID };
|
||||
const header = Buffer.from(JSON.stringify({ alg: 'RS256', typ: 'JWT' })).toString('base64url');
|
||||
const body = Buffer.from(JSON.stringify(payload)).toString('base64url');
|
||||
const data = `${header}.${body}`;
|
||||
const sig = createSign('RSA-SHA256').update(data).sign(privateKey, 'base64url');
|
||||
return `${data}.${sig}`;
|
||||
}
|
||||
|
||||
// Per-call timeout so a single slow/hung GitHub endpoint cannot eat the entire
|
||||
// workflow budget. Overridable via options.timeoutMs for callers that need
|
||||
// different bounds.
|
||||
export const GH_FETCH_DEFAULT_TIMEOUT_MS = 15_000;
|
||||
|
||||
export async function ghFetch(path, token, options = {}) {
|
||||
const { timeoutMs = GH_FETCH_DEFAULT_TIMEOUT_MS, signal: externalSignal, ...fetchOptions } = options;
|
||||
const controller = new AbortController();
|
||||
const timer = setTimeout(() => controller.abort(new Error(`ghFetch timeout after ${timeoutMs}ms: ${path}`)), timeoutMs);
|
||||
const abortOnExternal = () => controller.abort(externalSignal?.reason);
|
||||
if (externalSignal) {
|
||||
if (externalSignal.aborted) abortOnExternal();
|
||||
else externalSignal.addEventListener('abort', abortOnExternal, { once: true });
|
||||
}
|
||||
try {
|
||||
const res = await fetch(`https://api.github.com${path}`, {
|
||||
...fetchOptions,
|
||||
signal: controller.signal,
|
||||
headers: {
|
||||
Authorization: `Bearer ${token}`,
|
||||
Accept: 'application/vnd.github+json',
|
||||
'X-GitHub-Api-Version': '2022-11-28',
|
||||
...fetchOptions.headers,
|
||||
},
|
||||
});
|
||||
const text = await res.text();
|
||||
if (!res.ok) throw new Error(`GitHub API ${fetchOptions.method ?? 'GET'} ${path} → ${res.status}: ${text}`);
|
||||
return JSON.parse(text);
|
||||
} finally {
|
||||
clearTimeout(timer);
|
||||
if (externalSignal) externalSignal.removeEventListener('abort', abortOnExternal);
|
||||
}
|
||||
}
|
||||
|
||||
export async function resolveInstallationId(fetchInstallation, token, repo, owner) {
|
||||
if (repo) {
|
||||
if (!REPO_PATTERN.test(repo)) {
|
||||
throw new Error('ERROR: GH_REPO/GITHUB_REPOSITORY must be in owner/repo format.');
|
||||
}
|
||||
|
||||
const installation = await fetchInstallation(`/repos/${repo}/installation`, token);
|
||||
return installation.id;
|
||||
}
|
||||
|
||||
const installations = await fetchInstallation('/app/installations', token);
|
||||
if (!installations.length) {
|
||||
throw new Error(
|
||||
'ERROR: No installations found for commitperclip. Install URL: https://github.com/apps/commitperclip/installations/new'
|
||||
);
|
||||
}
|
||||
|
||||
if (owner) {
|
||||
if (!OWNER_PATTERN.test(owner)) {
|
||||
throw new Error('ERROR: GITHUB_REPOSITORY_OWNER must be a valid GitHub owner name.');
|
||||
}
|
||||
|
||||
const match = installations.find(
|
||||
installation => installation.account?.login?.toLowerCase() === owner.toLowerCase()
|
||||
);
|
||||
|
||||
if (match) {
|
||||
return match.id;
|
||||
}
|
||||
}
|
||||
|
||||
if (installations.length === 1) {
|
||||
return installations[0].id;
|
||||
}
|
||||
|
||||
throw new Error(
|
||||
'ERROR: Multiple commitperclip installations found. Set GH_REPO or GITHUB_REPOSITORY so the correct installation can be selected.'
|
||||
);
|
||||
}
|
||||
|
||||
async function main() {
|
||||
const privateKey = process.env.COMMITPERCLIP_KEY;
|
||||
if (!privateKey) {
|
||||
console.error('ERROR: COMMITPERCLIP_KEY env var not set.');
|
||||
console.error('Add to ~/.bash_profile: export COMMITPERCLIP_KEY="$(cat ~/.config/commitperclip/private-key.pem)"');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const jwt = generateJWT(privateKey);
|
||||
const repo = process.env.GH_REPO ?? process.env.GITHUB_REPOSITORY;
|
||||
const owner = process.env.GITHUB_REPOSITORY_OWNER ?? repo?.split('/')[0];
|
||||
|
||||
const installationId = await resolveInstallationId(ghFetch, jwt, repo, owner);
|
||||
|
||||
const { token } = await ghFetch(
|
||||
`/app/installations/${installationId}/access_tokens`,
|
||||
jwt,
|
||||
{ method: 'POST', headers: { 'Content-Type': 'application/json' } }
|
||||
);
|
||||
|
||||
if (!token) {
|
||||
console.error('ERROR: Failed to get installation token from GitHub API.');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
process.stdout.write(token);
|
||||
}
|
||||
|
||||
if (process.argv[1] === fileURLToPath(import.meta.url)) {
|
||||
main().catch(e => { console.error(e.message); process.exit(1); });
|
||||
}
|
||||
Reference in new issue
Block a user