Skip to content

fix(export): redact cached Orb token envelopes #1679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JSONbored merged 4 commits into from
Jun 29, 2026
Merged

fix(export): redact cached Orb token envelopes #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8716b92
fix(export): redact cached Orb token envelopes
JSONbored Jun 28, 2026
4d51737
Merge branch 'main' into codex/fix-cached-orb-tokens-export-redaction
JSONbored Jun 28, 2026
d1ad6dd
Merge branch 'main' into codex/fix-cached-orb-tokens-export-redaction
JSONbored Jun 29, 2026
2352994
Merge branch 'main' into codex/fix-cached-orb-tokens-export-redaction
JSONbored Jun 29, 2026
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
3 changes: 2 additions & 1 deletion scripts/export-d1-core.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ export const EXCLUDED_TABLES = new Set(["sqlite_sequence", "sqlite_stat1", "d1_m
// • submission_user_tokens.encrypted_token — short-lived GitHub OAuth token envelopes, cloud-scoped.
// • orb_enrollments.secret_hash — one-time enrollment secret hashes.
// • orb_enrollments.relay_secret_* — encrypted relay webhook signing secret material.
// • orb_enrollments.cached_token_json — encrypted GitHub installation-token cache envelope.
export const REDACTED_COLUMNS = {
auth_sessions: ["token_hash"],
webhook_events: ["payload_hash"],
repository_ai_keys: ["ciphertext"],
submission_user_tokens: ["encrypted_token"],
orb_enrollments: ["secret_hash", "relay_secret_enc", "relay_secret_iv", "relay_secret_salt"],
orb_enrollments: ["secret_hash", "relay_secret_enc", "relay_secret_iv", "relay_secret_salt", "cached_token_json"],
};

// A table name is only ever interpolated into SQL (`SELECT * FROM "<name>"`) after passing this allowlist, so a
Expand Down
5 changes: 3 additions & 2 deletions test/unit/export-d1-core.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe("export-d1-core redaction (#selfhost-migration)", () => {
webhook_events: ["payload_hash"],
repository_ai_keys: ["ciphertext"],
submission_user_tokens: ["encrypted_token"],
orb_enrollments: ["secret_hash", "relay_secret_enc", "relay_secret_iv", "relay_secret_salt"],
orb_enrollments: ["secret_hash", "relay_secret_enc", "relay_secret_iv", "relay_secret_salt", "cached_token_json"],
});
expect(redactRow("webhook_events", { delivery_id: "d1", payload_hash: "h" })).toEqual({ delivery_id: "d1" });
expect(redactRow("repository_ai_keys", { repo_full_name: "o/r", ciphertext: "ENCRYPTED" })).toEqual({ repo_full_name: "o/r" });
Expand All @@ -59,9 +59,10 @@ describe("export-d1-core redaction (#selfhost-migration)", () => {
relay_secret_enc: "LEAK_RELAY_SECRET",
relay_secret_iv: "LEAK_RELAY_IV",
relay_secret_salt: "LEAK_RELAY_SALT",
cached_token_json: "LEAK_CACHED_ORB_TOKEN_ENVELOPE",
},
]);
expect(orbExport?.redactedColumns).toEqual(["secret_hash", "relay_secret_enc", "relay_secret_iv", "relay_secret_salt"]);
expect(orbExport?.redactedColumns).toEqual(["secret_hash", "relay_secret_enc", "relay_secret_iv", "relay_secret_salt", "cached_token_json"]);
expect(orbExport?.rows).toEqual([{ enroll_id: "e1", installation_id: 42 }]);

expect(JSON.stringify([draftExport, orbExport])).not.toMatch(/LEAK_/);
Expand Down