AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.
HTML ai-agentcloudflarecloudflare-d1cloudflare-r2cloudflare-workersdockerelectronevernoteevernote-alternativeknowledge-basemcpnote-takingobsidian-alternativeoffline-firstpersonal-knowledge-basepwaself-hostedsqlitetiptapweb-clipper
fix(release): parse scheme-prefixed APK signers
tianma-if14af9b6da2a7
diff --git a/scripts/verify-android-apk-signature.mjs b/scripts/verify-android-apk-signature.mjsindex f8e3255e..91edae2e 100644--- a/scripts/verify-android-apk-signature.mjs+++ b/scripts/verify-android-apk-signature.mjs@@ -10,27 +10,35 @@ const normalizeFingerprint = (value) =>value.toLowerCase().replace(/[^0-9a-f]/g, "");export const verifyAndroidSignerOutput = (output) => {- const signerDigests = [+ const digestMatches = [...output.matchAll(- /^Signer #\d+ certificate SHA-256 digest:\s*(.+)$/gim,+ /^(?:Signer #\d+|V\d+(?:\.\d+)? Signer:) certificate SHA-256 digest:\s*(.+)$/gim,),- ]+ ];+ const signerDigests = digestMatches.map((match) => normalizeFingerprint(match[1])).filter((digest) => digest.length === 64);-- if (signerDigests.length !== 1) {+ const uniqueSignerDigests = [...new Set(signerDigests)];+ const reportedSignerCount = output.match(+ /^Number of signers:\s*(\d+)$/im,+ )?.[1];+ const signerCount = reportedSignerCount+ ? Number(reportedSignerCount)+ : signerDigests.length;++ if (signerCount !== 1 || uniqueSignerDigests.length !== 1) {throw new Error(- `Expected exactly one Android signer, found ${signerDigests.length}.`,+ `Expected exactly one Android signer, found ${signerCount}.`,);}- if (signerDigests[0] !== EDGE_EVER_ANDROID_SIGNER_SHA256) {+ if (uniqueSignerDigests[0] !== EDGE_EVER_ANDROID_SIGNER_SHA256) {throw new Error(- `Android signer mismatch: expected ${EDGE_EVER_ANDROID_SIGNER_SHA256}, received ${signerDigests[0]}.`,+ `Android signer mismatch: expected ${EDGE_EVER_ANDROID_SIGNER_SHA256}, received ${uniqueSignerDigests[0]}.`,);}- return signerDigests[0];+ return uniqueSignerDigests[0];};const findApkSigner = (explicitPath) => {diff --git a/scripts/verify-android-apk-signature.test.mjs b/scripts/verify-android-apk-signature.test.mjsindex 8174bf3c..c760fa2d 100644--- a/scripts/verify-android-apk-signature.test.mjs+++ b/scripts/verify-android-apk-signature.test.mjs@@ -35,6 +35,17 @@ describe("Android APK signer verification", () => {).toBe(EDGE_EVER_ANDROID_SIGNER_SHA256);});+ test("accepts scheme-prefixed signer output from Linux build tools", () => {+ expect(+ verifyAndroidSignerOutput(+ [+ "Number of signers: 1",+ `V2 Signer: certificate SHA-256 digest: ${EDGE_EVER_ANDROID_SIGNER_SHA256}`,+ ].join("\n"),+ ),+ ).toBe(EDGE_EVER_ANDROID_SIGNER_SHA256);+ });+test("rejects an APK signed by a different certificate", () => {expect(() =>verifyAndroidSignerOutput(