Skip to content

Commit f8d4813

Browse files
committed
fix(auth): read GitHub App PKCS#8 Key directly from env
1 parent 5270312 commit f8d4813

1 file changed

Lines changed: 5 additions & 24 deletions

File tree

backend/src/utils/secrets.ts

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -158,35 +158,16 @@ export async function getGithubClientSecret(env: Env): Promise<string | undefine
158158
}
159159

160160
/**
161-
* Helper to fetch the full GitHub App Private Key from split Base64 secrets.
161+
* Helper to fetch the full GitHub App Private Key.
162162
* @param env The worker environment bindings
163-
* @returns The reconstructed PEM private key string
163+
* @returns The PEM private key string
164164
*/
165165
export async function getGitHubPrivateKey(env: Env): Promise<string> {
166-
// 1. Try Direct Bindings first (Preferred)
167-
let pt1, pt2, pt3;
168-
169-
if (env.GITHUB_APP_PRIVATE_KEY_PT1) pt1 = await env.GITHUB_APP_PRIVATE_KEY_PT1.get();
170-
if (env.GITHUB_APP_PRIVATE_KEY_PT2) pt2 = await env.GITHUB_APP_PRIVATE_KEY_PT2.get();
171-
if (env.GITHUB_APP_PRIVATE_KEY_PT3) pt3 = await env.GITHUB_APP_PRIVATE_KEY_PT3.get();
172-
173-
// 2. Fallback to getSecret (Managed/Pointer) if any part is missing
174-
if (!pt1) pt1 = await getSecret(env, "GITHUB_APP_PRIVATE_KEY_PT1");
175-
if (!pt2) pt2 = await getSecret(env, "GITHUB_APP_PRIVATE_KEY_PT2");
176-
if (!pt3) pt3 = await getSecret(env, "GITHUB_APP_PRIVATE_KEY_PT3");
177-
178-
if (!pt1 || !pt2 || !pt3) {
179-
throw new Error("Missing GitHub Private Key parts in Secrets Store");
166+
if (env.GITHUB_APP_PRIVATE_KEY) {
167+
return env.GITHUB_APP_PRIVATE_KEY;
180168
}
181169

182-
// 3. Concatenate the Base64 chunks and decode
183-
const fullB64 = pt1 + pt2 + pt3;
184-
185-
try {
186-
return atob(fullB64);
187-
} catch (e) {
188-
throw new Error("Failed to decode GitHub Private Key. Ensure it was stored as valid Base64.");
189-
}
170+
throw new Error("Missing GITHUB_APP_PRIVATE_KEY in Environment/Secrets Store");
190171
}
191172

192173
/**

0 commit comments

Comments
 (0)