diff --git a/src/artifacts/ZipArtifactReader.ts b/src/artifacts/ZipArtifactReader.ts index 9499966782..6b5e53e950 100644 --- a/src/artifacts/ZipArtifactReader.ts +++ b/src/artifacts/ZipArtifactReader.ts @@ -45,7 +45,7 @@ import { accountZipMemberRegion, type ZipLocalRecord, type ZipMemberRegionAccount, -} from "./ZipMemberRegion.js"; +} from "../domain/zip/zipMemberRegion.js"; import type { ZipPackageFormat } from "../domain/zipPackageFormat.js"; import { artifactExpansionBudgetBytes } from "../domain/artifactExpansionBudget.js"; import { artifactReaderLimitFailure } from "./ArtifactReaderLimits.js"; @@ -53,6 +53,7 @@ import type { StableRegularFileDescriptor } from "../filesystem/RegularFile.js"; import { ArtifactFileSource } from "./ArtifactFileSource.js"; import { readFileHandleRange } from "../filesystem/readFileHandleRange.js"; import { strictUtf8Decoder } from "../domain/strictUtf8.js"; +import { decodeZipCp437 } from "../domain/zip/zipEntryText.js"; import { invariantViolation } from "../domain/internalInvariant.js"; const ZIP_UTF8_DECODER = strictUtf8Decoder("preserve"); @@ -497,26 +498,9 @@ export const decodeZipEntryText = ( if (type !== "filename") return undefined; if (encoding === "utf-8") return decodeStrictZipUtf8(bytes, "ZIP filename is not valid UTF-8"); - return encoding === "cp437" ? decodeCp437(bytes) : undefined; + return encoding === "cp437" ? decodeZipCp437(bytes) : undefined; }; -/** CP437 characters for bytes 0x80-0xFF. */ -const CP437_HIGH_HALF = - "ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■\u00A0"; - -/** - * Decode a legacy ZIP name with the Unicode CP437 mapping, which Python's - * zipfile also uses: bytes below 0x80 are ASCII. zip.js shows 0x01-0x1F and - * 0x7F as IBM PC display glyphs, which turns the macOS folder icon file - * `Icon\r` into `Icon♪`. - */ -const decodeCp437 = (bytes: Uint8Array): string => - Array.from(bytes, (byte) => - byte < 0x80 - ? String.fromCharCode(byte) - : CP437_HIGH_HALF.charAt(byte - 0x80), - ).join(""); - /** An entry's name, from a valid Unicode Path extra field when it has one. */ export const zipEntryPath = (entry: Entry): string => { const field = entry.extraFieldUnicodePath; diff --git a/src/artifacts/ZipMemberRegion.test.ts b/src/artifacts/ZipMemberRegion.test.ts index 26c0411a9b..e1d0a24f04 100644 --- a/src/artifacts/ZipMemberRegion.test.ts +++ b/src/artifacts/ZipMemberRegion.test.ts @@ -9,7 +9,7 @@ import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory import type { ArtifactReaderTraversal } from "../resources/ArtifactReader.js"; import { scanReader } from "./inventory/scanReader.js"; import { ZipArtifactReader } from "./ZipArtifactReader.js"; -import { accountZipMemberRegion } from "./ZipMemberRegion.js"; +import { accountZipMemberRegion } from "../domain/zip/zipMemberRegion.js"; interface Member { readonly name: string; diff --git a/src/domain/zip/zipEntryText.test.ts b/src/domain/zip/zipEntryText.test.ts new file mode 100644 index 0000000000..1fe3864b87 --- /dev/null +++ b/src/domain/zip/zipEntryText.test.ts @@ -0,0 +1,13 @@ +import { expect, it } from "vitest"; + +import { decodeZipCp437 } from "./zipEntryText.js"; + +it("decodes legacy ZIP names as ASCII below 0x80 and Unicode CP437 above", () => { + // macOS folder icon file: the trailing CR stays a control character. + expect(decodeZipCp437(Uint8Array.of(0x49, 0x63, 0x6f, 0x6e, 0x0d))).toBe( + "Icon\r", + ); + expect(decodeZipCp437(Uint8Array.of(0x80, 0x9e, 0xe1, 0xff))).toBe( + `Ç₧ß${String.fromCharCode(0xa0)}`, + ); +}); diff --git a/src/domain/zip/zipEntryText.ts b/src/domain/zip/zipEntryText.ts new file mode 100644 index 0000000000..6f533d1933 --- /dev/null +++ b/src/domain/zip/zipEntryText.ts @@ -0,0 +1,16 @@ +/** CP437 characters for bytes 0x80-0xFF. */ +const CP437_HIGH_HALF = + "ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■\u00A0"; + +/** + * Decode a legacy ZIP name with the Unicode CP437 mapping, which Python's + * zipfile also uses: bytes below 0x80 are ASCII. zip.js shows 0x01-0x1F and + * 0x7F as IBM PC display glyphs, which turns the macOS folder icon file + * `Icon\r` into `Icon♪`. + */ +export const decodeZipCp437 = (bytes: Uint8Array): string => + Array.from(bytes, (byte) => + byte < 0x80 + ? String.fromCharCode(byte) + : CP437_HIGH_HALF.charAt(byte - 0x80), + ).join(""); diff --git a/src/artifacts/ZipMemberRegion.ts b/src/domain/zip/zipMemberRegion.ts similarity index 98% rename from src/artifacts/ZipMemberRegion.ts rename to src/domain/zip/zipMemberRegion.ts index 7dd1e5e366..60b992954a 100644 --- a/src/artifacts/ZipMemberRegion.ts +++ b/src/domain/zip/zipMemberRegion.ts @@ -1,8 +1,8 @@ -import { BinaryReader } from "../domain/binaryContainer.js"; +import { BinaryReader } from "../binaryContainer.js"; import { apkSigningPairEnd, APK_SIGNING_BLOCK_MAX_PAIRS, -} from "../domain/apkSignature/apkSigningBlock.js"; +} from "../apkSignature/apkSigningBlock.js"; /** One central-directory record's claim on the member region before the directory. */ export interface ZipLocalRecord {