@zip.js/zip.js 2.8.46 → 2.8.47

package/lib/core/zip-writer.js

@@ -88,6 +88,7 @@ import {
 	SPLIT_ZIP_FILE_SIGNATURE,
 	LOCAL_FILE_HEADER_SIGNATURE,
 	DATA_DESCRIPTOR_RECORD_SIGNATURE,
+	DIGITAL_SIGNATURE_RECORD_SIGNATURE,
 	CENTRAL_FILE_HEADER_SIGNATURE,
 	CENTRAL_FILE_HEADER_LENGTH,
 	END_OF_CENTRAL_DIR_SIGNATURE,
@@ -146,7 +147,8 @@ import { getRegisteredCodec } from "./codec-registry.js";
 import { supportsDeflate } from "./codec-worker.js";
 import {
 	CODEC_DEFLATE,
-	runWorker
+	runWorker,
+	ERR_UNSUPPORTED_CRYPTO_API
 } from "./codec-pool.js";
 import {
 	initStream,
@@ -209,7 +211,8 @@ import {
 	OPTION_OFFSET,
 	OPTION_USDZ,
 	OPTION_UNIX_EXTRA_FIELD_TYPE,
-	OPTION_LOCAL_EXTRA_FIELD
+	OPTION_LOCAL_EXTRA_FIELD,
+	OPTION_SIGN_CENTRAL_DIRECTORY
 } from "./options.js";
 
 const ERR_DUPLICATED_NAME = "File already exists";
@@ -237,6 +240,7 @@ const ERR_INVALID_UNIX_EXTRA_FIELD_TYPE = "Invalid unixExtraFieldType (must be '
 const ERR_INVALID_UNIX_ID_SIZE = "uid/gid must be 0..65535 for unixExtraFieldType 'unix' (use 'infozip' for larger ids)";
 const ERR_INVALID_MSDOS_ATTRIBUTES = "Invalid msdosAttributesRaw (must be integer 0..255)";
 const ERR_INVALID_MSDOS_DATA = "Invalid msdosAttributes (must be an object with boolean flags)";
+const ERR_INVALID_SIGNATURE_DATA = "Signature data exceeds 64KB";
 
 const EXTRAFIELD_DATA_AES = new Uint8Array([0x07, 0x00, 0x02, 0x00, 0x41, 0x45, 0x03, 0x00, 0x00]);
 const EXTRAFIELD_OFFSET_AES_VENDOR_VERSION = 4;
@@ -515,7 +519,16 @@ export {
 	ERR_UNSUPPORTED_FORMAT,
 	ERR_UNDEFINED_UNCOMPRESSED_SIZE,
 	ERR_UNDEFINED_READER,
-	ERR_ZIP_NOT_EMPTY
+	ERR_ZIP_NOT_EMPTY,
+	ERR_INVALID_SIGNATURE_DATA,
+	ERR_INVALID_UID,
+	ERR_INVALID_GID,
+	ERR_INVALID_UNIX_MODE,
+	ERR_INVALID_UNIX_EXTRA_FIELD_TYPE,
+	ERR_INVALID_UNIX_ID_SIZE,
+	ERR_INVALID_MSDOS_ATTRIBUTES,
+	ERR_INVALID_MSDOS_DATA,
+	ERR_UNSUPPORTED_CRYPTO_API
 };
 
 async function addFile(zipWriter, name, reader, options) {
@@ -1614,8 +1627,9 @@ function updateLocalHeader({
 
 async function closeFile(zipWriter, comment, options) {
 	const directoryDataLength = createDirectoryRecords(zipWriter.files);
-	const directoryStart = await writeDirectoryRecords(zipWriter, directoryDataLength, options);
-	await writeEndOfDirectoryRecord(zipWriter, comment, options, { directoryStart, directoryDataLength });
+	const { directoryStart, directoryArray } = await writeDirectoryRecords(zipWriter, directoryDataLength, options);
+	const signatureLength = await writeDigitalSignatureRecord(zipWriter, directoryArray, options);
+	await writeEndOfDirectoryRecord(zipWriter, comment, options, { directoryStart, directoryDataLength, signatureLength });
 }
 
 function createDirectoryRecords(files) {
@@ -1772,12 +1786,33 @@ async function writeDirectoryRecords(zipWriter, directoryDataLength, options) {
 		}
 	}
 	await writeData(writer, directoryDiskOffset ? directoryArray.slice(directoryDiskOffset) : directoryArray);
-	return { diskNumber: directoryStartDiskNumber, diskOffset: directoryStartDiskOffset };
+	return {
+		directoryStart: { diskNumber: directoryStartDiskNumber, diskOffset: directoryStartDiskOffset },
+		directoryArray
+	};
+}
+
+async function writeDigitalSignatureRecord(zipWriter, directoryArray, options) {
+	const signCentralDirectory = getOptionValue(zipWriter, options, OPTION_SIGN_CENTRAL_DIRECTORY);
+	if (signCentralDirectory) {
+		const signatureData = await signCentralDirectory(directoryArray);
+		const signatureDataLength = getLength(signatureData);
+		if (signatureDataLength > MAX_16_BITS) {
+			throw new Error(ERR_INVALID_SIGNATURE_DATA);
+		}
+		const signatureRecord = createRecordWriter(6 + signatureDataLength);
+		signatureRecord.uint32(DIGITAL_SIGNATURE_RECORD_SIGNATURE);
+		signatureRecord.uint16(signatureDataLength);
+		signatureRecord.bytes(signatureData);
+		await writeData(zipWriter.writer, signatureRecord.array);
+		return 6 + signatureDataLength;
+	}
+	return 0;
 }
 
 async function writeEndOfDirectoryRecord(zipWriter, comment, options, cdInfo) {
 	const { writer } = zipWriter;
-	const { directoryStart } = cdInfo;
+	const { directoryStart, signatureLength } = cdInfo;
 	let { directoryDataLength } = cdInfo;
 	let filesLength = zipWriter.files.size;
 	let diskNumber = directoryStart.diskNumber;
@@ -1816,7 +1851,7 @@ async function writeEndOfDirectoryRecord(zipWriter, comment, options, cdInfo) {
 		endOfdirectoryRecord.uint64(directoryOffset);
 		endOfdirectoryRecord.uint32(ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIGNATURE);
 		endOfdirectoryRecord.uint32(lastDiskNumber);
-		endOfdirectoryRecord.uint64(BigInt(getSegmentOffset(zipWriter, writer)) + BigInt(directoryDataLength));
+		endOfdirectoryRecord.uint64(BigInt(getSegmentOffset(zipWriter, writer)) + BigInt(directoryDataLength) + BigInt(signatureLength));
 		endOfdirectoryRecord.uint32(lastDiskNumber + 1);
 		const supportZip64SplitFile = getOptionValue(zipWriter, options, OPTION_SUPPORT_ZIP64_SPLIT_FILE, true);
 		if (supportZip64SplitFile) {

package/lib/zip-core-base.js

@@ -77,5 +77,6 @@ export {
 	createBlobTempStream
 } from "./core/util/blob-temp-stream.js";
 export {
-	createSyncAccessHandleTempStream
+	createSyncAccessHandleTempStream,
+	ERR_UNSUPPORTED_CONTEXT
 } from "./core/util/sync-access-handle-temp-stream.js";

package/lib/zip-core-reader.js

@@ -47,5 +47,6 @@ export {
 	ERR_SPLIT_ZIP_FILE,
 	ERR_OVERLAPPING_ENTRY,
 	ERR_AMBIGUOUS_ARCHIVE,
-	ERR_ENCRYPTED_CENTRAL_DIRECTORY
+	ERR_ENCRYPTED_CENTRAL_DIRECTORY,
+	ERR_WORKER_STARTUP_TIMEOUT
 } from "./core/zip-reader.js";

package/lib/zip-core-writer.js

@@ -41,5 +41,14 @@ export {
 	ERR_UNSUPPORTED_FORMAT,
 	ERR_UNDEFINED_UNCOMPRESSED_SIZE,
 	ERR_UNDEFINED_READER,
-	ERR_ZIP_NOT_EMPTY
+	ERR_ZIP_NOT_EMPTY,
+	ERR_INVALID_SIGNATURE_DATA,
+	ERR_INVALID_UID,
+	ERR_INVALID_GID,
+	ERR_INVALID_UNIX_MODE,
+	ERR_INVALID_UNIX_EXTRA_FIELD_TYPE,
+	ERR_INVALID_UNIX_ID_SIZE,
+	ERR_INVALID_MSDOS_ATTRIBUTES,
+	ERR_INVALID_MSDOS_DATA,
+	ERR_UNSUPPORTED_CRYPTO_API
 } from "./core/zip-writer.js";

package/package.json

@@ -3,7 +3,7 @@
   "description": "A JavaScript library to zip and unzip files in the browser, Deno and Node.js",
   "author": "Gildas Lormeau",
   "license": "BSD-3-Clause",
-  "version": "2.8.46",
+  "version": "2.8.47",
   "type": "module",
   "keywords": [
     "zip",