@zip.js/zip.js 2.8.43 → 2.8.44

package/lib/core/zip-reader.js

@@ -93,6 +93,8 @@ import {
 	runWorker,
 	CODEC_INFLATE,
 	ERR_INVALID_SIGNATURE,
+	ERR_INVALID_CRC32,
+	ERR_INVALID_AUTHENTICATION_CODE,
 	ERR_INVALID_PASSWORD,
 	ERR_INVALID_UNCOMPRESSED_SIZE,
 	ERR_INVALID_COMPRESSED_DATA,
@@ -141,6 +143,8 @@ import {
 	OPTION_CHECK_OVERLAPPING_ENTRY,
 	OPTION_CHECK_AMBIGUITY,
 	OPTION_CHECK_SIGNATURE,
+	OPTION_CHECK_CRC32,
+	OPTION_CHECK_AUTHENTICATION_CODE,
 	OPTION_STRICTNESS,
 	OPTION_MAX_APPENDED_DATA_SIZE,
 	STRICTNESS_STRICT,
@@ -169,6 +173,7 @@ const CHARSET_UTF8 = "utf-8";
 const PROPERTY_NAME_UTF8_SUFFIX = "UTF8";
 const CHARSET_CP437 = "cp437";
 const BITFLAG_AMBIGUITY_MASK = BITFLAG_ENCRYPTED | BITFLAG_DATA_DESCRIPTOR | BITFLAG_LANG_ENCODING_FLAG;
+const VENDOR_VERSION_AE_1 = 1;
 const ZIP64_PROPERTIES = [
 	[PROPERTY_NAME_UNCOMPRESSED_SIZE, MAX_32_BITS],
 	[PROPERTY_NAME_COMPRESSED_SIZE, MAX_32_BITS],
@@ -551,6 +556,8 @@ export {
 	ERR_UNSUPPORTED_ENCRYPTION,
 	ERR_UNSUPPORTED_COMPRESSION,
 	ERR_INVALID_SIGNATURE,
+	ERR_INVALID_CRC32,
+	ERR_INVALID_AUTHENTICATION_CODE,
 	ERR_INVALID_PASSWORD,
 	ERR_INVALID_UNCOMPRESSED_SIZE,
 	ERR_INVALID_COMPRESSED_DATA,
@@ -670,6 +677,11 @@ class ZipEntry {
 		if (deflate64) {
 			useCompressionStream = false;
 		}
+		const checkCrc32Option = getOptionValue(zipEntry, options, OPTION_CHECK_CRC32);
+		const checkCrc32 = (checkCrc32Option === UNDEFINED_VALUE ?
+			getOptionValue(zipEntry, options, OPTION_CHECK_SIGNATURE) :
+			checkCrc32Option) && !passThrough &&
+			(!encrypted || zipCrypto || (extraFieldAES && extraFieldAES.vendorVersion == VENDOR_VERSION_AE_1));
 		const workerOptions = {
 			options: {
 				codecType: CODEC_INFLATE,
@@ -677,7 +689,8 @@ class ZipEntry {
 				rawPassword,
 				zipCrypto,
 				encryptionStrength: extraFieldAES && extraFieldAES.strength,
-				signed: getOptionValue(zipEntry, options, OPTION_CHECK_SIGNATURE) && !passThrough,
+				checkCrc32,
+				checkAuthenticationCode: getOptionValue(zipEntry, options, OPTION_CHECK_AUTHENTICATION_CODE),
 				passwordVerification: zipCrypto && (dataDescriptor ? ((rawLastModDate >>> 8) & MAX_8_BITS) : ((signature >>> 24) & MAX_8_BITS)),
 				outputSize: passThrough ? compressedSize : uncompressedSize,
 				signature,
@@ -793,6 +806,7 @@ function readCommonFooter(fileEntry, directory, dataView, offset, localDirectory
 	const compressionMethod = getUint16(dataView, offset + 4);
 	Object.assign(directory, {
 		signature: getUint32(dataView, offset + HEADER_OFFSET_SIGNATURE),
+		crc32: getUint32(dataView, offset + HEADER_OFFSET_SIGNATURE),
 		compressedSize: getUint32(dataView, offset + HEADER_OFFSET_COMPRESSED_SIZE),
 		uncompressedSize: getUint32(dataView, offset + HEADER_OFFSET_UNCOMPRESSED_SIZE)
 	});
@@ -894,6 +908,9 @@ function readExtraFieldAES(extraFieldAES, directory, compressionMethod) {
 		compressionMethod: getUint16(extraFieldView, 5)
 	});
 	directory.compressionMethod = extraFieldAES.compressionMethod;
+	if (extraFieldAES.vendorVersion != VENDOR_VERSION_AE_1) {
+		directory.crc32 = UNDEFINED_VALUE;
+	}
 }
 
 function readExtraFieldNTFS(extraFieldNTFS, directory) {
@@ -912,26 +929,22 @@ function readExtraFieldNTFS(extraFieldNTFS, directory) {
 	} catch {
 		// ignored
 	}
-	try {
-		if (tag1Data && tag1Data.length == 24) {
-			const tag1View = getDataView(tag1Data);
-			const rawLastModDate = tag1View.getBigUint64(0, true);
-			const rawLastAccessDate = tag1View.getBigUint64(8, true);
-			const rawCreationDate = tag1View.getBigUint64(16, true);
-			Object.assign(extraFieldNTFS, {
-				rawLastModDate,
-				rawLastAccessDate,
-				rawCreationDate
-			});
-			const lastModDate = getDateNTFS(rawLastModDate);
-			const lastAccessDate = getDateNTFS(rawLastAccessDate);
-			const creationDate = getDateNTFS(rawCreationDate);
-			const extraFieldData = { lastModDate, lastAccessDate, creationDate };
-			Object.assign(extraFieldNTFS, extraFieldData);
-			Object.assign(directory, extraFieldData);
-		}
-	} catch {
-		// ignored
+	if (tag1Data && tag1Data.length == 24) {
+		const tag1View = getDataView(tag1Data);
+		const rawLastModDate = tag1View.getBigUint64(0, true);
+		const rawLastAccessDate = tag1View.getBigUint64(8, true);
+		const rawCreationDate = tag1View.getBigUint64(16, true);
+		Object.assign(extraFieldNTFS, {
+			rawLastModDate,
+			rawLastAccessDate,
+			rawCreationDate
+		});
+		const lastModDate = getDateNTFS(rawLastModDate);
+		const lastAccessDate = getDateNTFS(rawLastAccessDate);
+		const creationDate = getDateNTFS(rawCreationDate);
+		const extraFieldData = { lastModDate, lastAccessDate, creationDate };
+		Object.assign(extraFieldNTFS, extraFieldData);
+		Object.assign(directory, extraFieldData);
 	}
 }
 
@@ -1234,11 +1247,7 @@ function getOptionValue(zipReader, options, name) {
 
 function getDate(timeRaw) {
 	const date = (timeRaw & 0xffff0000) >> 16, time = timeRaw & MAX_16_BITS;
-	try {
-		return new Date(1980 + ((date & 0xFE00) >> 9), ((date & 0x01E0) >> 5) - 1, date & 0x001F, (time & 0xF800) >> 11, (time & 0x07E0) >> 5, (time & 0x001F) * 2, 0);
-	} catch {
-		// ignored
-	}
+	return new Date(1980 + ((date & 0xFE00) >> 9), ((date & 0x01E0) >> 5) - 1, date & 0x001F, (time & 0xF800) >> 11, (time & 0x07E0) >> 5, (time & 0x001F) * 2, 0);
 }
 
 function getDateNTFS(timeRaw) {

package/lib/core/zip-writer.js

@@ -223,6 +223,8 @@ const ERR_INVALID_EXTRAFIELD_DATA = "Extra field data exceeds 64KB";
 const ERR_UNSUPPORTED_COMPRESSION = "Compression method not supported";
 const MIN_UNIX_TIME = -2147483648;
 const MAX_UNIX_TIME = 2147483647;
+const MIN_NTFS_TIME = BigInt(0);
+const MAX_NTFS_TIME = BigInt("0x7fffffffffffffff");
 const ERR_UNSUPPORTED_FORMAT = "Zip64 is not supported (set the 'zip64' option to 'true')";
 const ERR_UNDEFINED_UNCOMPRESSED_SIZE = "Undefined uncompressed size";
 const ERR_UNDEFINED_READER = "Undefined reader";
@@ -1134,9 +1136,12 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 		msdosAttributes
 	};
 	let {
-		signature,
+		crc32: signature,
 		uncompressedSize
 	} = options;
+	if (signature === UNDEFINED_VALUE) {
+		({ signature } = options);
+	}
 	let compressedSize = 0;
 	if (!passThrough) {
 		uncompressedSize = 0;
@@ -1154,7 +1159,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 				encryptionStrength,
 				zipCrypto: encrypted && zipCrypto,
 				passwordVerification: encrypted && zipCrypto && (rawLastModDate >> 8) & MAX_8_BITS,
-				signed: !passThrough,
+				computeCrc32: !passThrough,
 				compressed: compressed && !passThrough,
 				encrypted: encrypted && !passThrough,
 				useWebWorkers,
@@ -1173,7 +1178,9 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 			writer.size += compressedSize;
 			if (!passThrough) {
 				uncompressedSize = result.inputSize;
-				signature = result.signature;
+				if (!encrypted || zipCrypto) {
+					signature = result.signature;
+				}
 			}
 			if ((!zip64CompressedSize && compressedSize >= MAX_32_BITS) ||
 				(!zip64UncompressedSize && uncompressedSize >= MAX_32_BITS)) {
@@ -1212,6 +1219,7 @@ async function createFileEntry(reader, writer, { diskNumberStart, lock }, entryI
 		headerArray,
 		headerView,
 		signature,
+		crc32: encrypted && !zipCrypto ? UNDEFINED_VALUE : signature,
 		extraFieldExtendedTimestampFlag,
 		zip64UncompressedSize,
 		zip64CompressedSize
@@ -1312,8 +1320,8 @@ function getHeaderInfo(options) {
 				extraFieldNTFS.uint16(EXTRAFIELD_TYPE_NTFS_TAG1);
 				extraFieldNTFS.uint16(24);
 				extraFieldNTFS.uint64(lastModTimeNTFS);
-				extraFieldNTFS.uint64(getTimeNTFS(lastAccessDate) || lastModTimeNTFS);
-				extraFieldNTFS.uint64(getTimeNTFS(creationDate) || lastModTimeNTFS);
+				extraFieldNTFS.uint64(lastAccessDate ? getTimeNTFS(lastAccessDate) : lastModTimeNTFS);
+				extraFieldNTFS.uint64(creationDate ? getTimeNTFS(creationDate) : lastModTimeNTFS);
 				rawExtraFieldNTFS = extraFieldNTFS.array;
 			} catch {
 				rawExtraFieldNTFS = EMPTY_UINT8_ARRAY;
@@ -1373,7 +1381,7 @@ function getHeaderInfo(options) {
 	if (extraFieldLength > MAX_16_BITS) {
 		throw new Error(ERR_INVALID_EXTRAFIELD_DATA);
 	}
-	const dosLastModDate = new Date(Math.ceil(lastModDate.getTime() / 2000) * 2000);
+	const dosLastModDate = new Date(Math.ceil(Math.floor(lastModDate.getTime() / 1000) / 2) * 2000);
 	const {
 		headerArray,
 		headerView,
@@ -1882,7 +1890,8 @@ async function flushBufferedData(readable, writer, signal, onChunkWritten) {
 
 function getTimeNTFS(date) {
 	if (date) {
-		return ((BigInt(date.getTime()) + BigInt(11644473600000)) * BigInt(10000));
+		const timeNTFS = ((BigInt(date.getTime()) + BigInt(11644473600000)) * BigInt(10000));
+		return timeNTFS < MIN_NTFS_TIME ? MIN_NTFS_TIME : timeNTFS > MAX_NTFS_TIME ? MAX_NTFS_TIME : timeNTFS;
 	}
 }
 

package/lib/zip-core-reader.js

@@ -39,6 +39,8 @@ export {
 	ERR_UNSUPPORTED_ENCRYPTION,
 	ERR_UNSUPPORTED_COMPRESSION,
 	ERR_INVALID_SIGNATURE,
+	ERR_INVALID_CRC32,
+	ERR_INVALID_AUTHENTICATION_CODE,
 	ERR_INVALID_UNCOMPRESSED_SIZE,
 	ERR_INVALID_PASSWORD,
 	ERR_INVALID_COMPRESSED_DATA,

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.43",
+  "version": "2.8.44",
   "type": "module",
   "keywords": [
     "zip",

package/worker-message-property-names.js

@@ -1,3 +1,3 @@
-const WORKER_MESSAGE_PROPERTY_NAMES = ["baseURI", "cause", "checkPasswordOnly", "chunkSize", "code", "codecType", "codecURI", "compressed", "compressionMethod", "config", "deflate64", "done", "encrypted", "encryptionStrength", "error", "format", "inputSize", "level", "message", "messageId", "name", "options", "outputSize", "password", "passwordVerification", "rawBitFlag", "rawPassword", "readable", "result", "signature", "signed", "stack", "transferStreams", "type", "useCompressionStream", "useWebWorkers", "value", "wasmURI", "workerStartupTimeout", "writable", "zipCrypto"];
+const WORKER_MESSAGE_PROPERTY_NAMES = ["baseURI", "cause", "checkAuthenticationCode", "checkCrc32", "checkPasswordOnly", "chunkSize", "code", "codecType", "codecURI", "compressed", "compressionMethod", "computeCrc32", "config", "deflate64", "done", "encrypted", "encryptionStrength", "error", "format", "inputSize", "level", "message", "messageId", "name", "options", "outputSize", "password", "passwordVerification", "rawBitFlag", "rawPassword", "readable", "result", "signature", "stack", "transferStreams", "type", "useCompressionStream", "useWebWorkers", "value", "wasmURI", "workerStartupTimeout", "writable", "zipCrypto"];
 
 export { WORKER_MESSAGE_PROPERTY_NAMES };