@zip.js/zip.js 2.7.69 → 2.7.71

package/lib/core/codec-pool.js

@@ -33,6 +33,7 @@ import {
 	CODEC_INFLATE,
 	CODEC_DEFLATE,
 	ERR_INVALID_SIGNATURE,
+	ERR_INVALID_UNCOMPRESSED_SIZE,
 	ERR_INVALID_PASSWORD,
 	ERR_ABORT_CHECK_PASSWORD
 } from "./streams/codec-stream.js";
@@ -47,6 +48,7 @@ export {
 	CODEC_DEFLATE,
 	CODEC_INFLATE,
 	ERR_INVALID_SIGNATURE,
+	ERR_INVALID_UNCOMPRESSED_SIZE,
 	ERR_INVALID_PASSWORD,
 	ERR_ABORT_CHECK_PASSWORD
 };

package/lib/core/constants.js

@@ -45,6 +45,10 @@ const ZIP64_END_OF_CENTRAL_DIR_LOCATOR_LENGTH = 20;
 const ZIP64_END_OF_CENTRAL_DIR_LENGTH = 56;
 const ZIP64_END_OF_CENTRAL_DIR_TOTAL_LENGTH = END_OF_CENTRAL_DIR_LENGTH + ZIP64_END_OF_CENTRAL_DIR_LOCATOR_LENGTH + ZIP64_END_OF_CENTRAL_DIR_LENGTH;
 
+const DATA_DESCRIPTOR_RECORD_LENGTH = 12;
+const DATA_DESCRIPTOR_RECORD_ZIP_64_LENGTH = 20;
+const DATA_DESCRIPTOR_RECORD_SIGNATURE_LENGTH = 4;
+
 const EXTRAFIELD_TYPE_ZIP64 = 0x0001;
 const EXTRAFIELD_TYPE_AES = 0x9901;
 const EXTRAFIELD_TYPE_NTFS = 0x000a;
@@ -73,7 +77,7 @@ const VERSION_AES = 0x33;
 
 const DIRECTORY_SIGNATURE = "/";
 
-const HEADER_SIZE = 26;
+const HEADER_SIZE = 30;
 const HEADER_OFFSET_SIGNATURE = 10;
 const HEADER_OFFSET_COMPRESSED_SIZE = 14;
 const HEADER_OFFSET_UNCOMPRESSED_SIZE = 18;
@@ -99,6 +103,9 @@ export {
 	END_OF_CENTRAL_DIR_SIGNATURE,
 	ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIGNATURE,
 	ZIP64_END_OF_CENTRAL_DIR_SIGNATURE,
+	DATA_DESCRIPTOR_RECORD_LENGTH,
+	DATA_DESCRIPTOR_RECORD_ZIP_64_LENGTH,
+	DATA_DESCRIPTOR_RECORD_SIGNATURE_LENGTH,
 	EXTRAFIELD_TYPE_ZIP64,
 	EXTRAFIELD_TYPE_AES,
 	EXTRAFIELD_TYPE_NTFS,

package/lib/core/io.js

@@ -176,10 +176,12 @@ class Data64URIWriter extends Writer {
 		for (; indexArray < array.length; indexArray++) {
 			writer.pending += String.fromCharCode(array[indexArray]);
 		}
-		if (dataString.length > 2) {
-			writer.data += btoa(dataString);
-		} else {
-			writer.pending = dataString;
+		if (dataString.length) {
+			if (dataString.length > 2) {
+				writer.data += btoa(dataString);
+			} else {
+				writer.pending += dataString;
+			}
 		}
 	}
 

package/lib/core/options.js

@@ -0,0 +1,89 @@
+/*
+ Copyright (c) 2022 Gildas Lormeau. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright 
+ notice, this list of conditions and the following disclaimer in 
+ the documentation and/or other materials provided with the distribution.
+
+ 3. The names of the authors may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+ INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+const OPTION_FILENAME_ENCODING = "filenameEncoding";
+const OPTION_COMMENT_ENCODING = "commentEncoding";
+const OPTION_DECODE_TEXT = "decodeText";
+const OPTION_EXTRACT_PREPENDED_DATA = "extractPrependedData";
+const OPTION_EXTRACT_APPENDED_DATA = "extractAppendedData";
+const OPTION_PASSWORD = "password";
+const OPTION_RAW_PASSWORD = "rawPassword";
+const OPTION_PASS_THROUGH = "passThrough";
+const OPTION_SIGNAL = "signal";
+const OPTION_CHECK_PASSWORD_ONLY = "checkPasswordOnly";
+const OPTION_CHECK_OVERLAPPING_ENTRY_ONLY = "checkOverlappingEntryOnly";
+const OPTION_CHECK_OVERLAPPING_ENTRY = "checkOverlappingEntry";
+const OPTION_CHECK_SIGNATURE = "checkSignature";
+const OPTION_USE_WEB_WORKERS = "useWebWorkers";
+const OPTION_USE_COMPRESSION_STREAM = "useCompressionStream";
+const OPTION_TRANSFER_STREAMS = "transferStreams";
+const OPTION_PREVENT_CLOSE = "preventClose";
+const OPTION_ENCRYPTION_STRENGTH = "encryptionStrength";
+const OPTION_EXTENDED_TIMESTAMP = "extendedTimestamp";
+const OPTION_KEEP_ORDER = "keepOrder";
+const OPTION_LEVEL = "level";
+const OPTION_BUFFERED_WRITE = "bufferedWrite";
+const OPTION_DATA_DESCRIPTOR_SIGNATURE = "dataDescriptorSignature";
+const OPTION_USE_UNICODE_FILE_NAMES = "useUnicodeFileNames";
+const OPTION_DATA_DESCRIPTOR = "dataDescriptor";
+const OPTION_SUPPORT_ZIP64_SPLIT_FILE = "supportZip64SplitFile";
+const OPTION_ENCODE_TEXT = "encodeText";
+const OPTION_OFFSET = "offset";
+const OPTION_USDZ = "usdz";
+
+export {
+	OPTION_FILENAME_ENCODING,
+	OPTION_COMMENT_ENCODING,
+	OPTION_DECODE_TEXT,
+	OPTION_EXTRACT_PREPENDED_DATA,
+	OPTION_EXTRACT_APPENDED_DATA,
+	OPTION_PASSWORD,
+	OPTION_RAW_PASSWORD,
+	OPTION_PASS_THROUGH,
+	OPTION_SIGNAL,
+	OPTION_CHECK_PASSWORD_ONLY,
+	OPTION_CHECK_OVERLAPPING_ENTRY_ONLY,
+	OPTION_CHECK_OVERLAPPING_ENTRY,
+	OPTION_CHECK_SIGNATURE,
+	OPTION_USE_WEB_WORKERS,
+	OPTION_USE_COMPRESSION_STREAM,
+	OPTION_TRANSFER_STREAMS,
+	OPTION_PREVENT_CLOSE,
+	OPTION_ENCRYPTION_STRENGTH,
+	OPTION_EXTENDED_TIMESTAMP,
+	OPTION_KEEP_ORDER,
+	OPTION_LEVEL,
+	OPTION_BUFFERED_WRITE,
+	OPTION_DATA_DESCRIPTOR_SIGNATURE,
+	OPTION_USE_UNICODE_FILE_NAMES,
+	OPTION_DATA_DESCRIPTOR,
+	OPTION_SUPPORT_ZIP64_SPLIT_FILE,
+	OPTION_ENCODE_TEXT,
+	OPTION_OFFSET,
+	OPTION_USDZ
+};

package/lib/core/streams/codec-stream.js

@@ -39,6 +39,7 @@
 import {
 	ERR_INVALID_PASSWORD,
 	ERR_INVALID_SIGNATURE,
+	ERR_INVALID_UNCOMPRESSED_SIZE,
 	ERR_ABORT_CHECK_PASSWORD,
 	InflateStream,
 	DeflateStream
@@ -64,6 +65,7 @@ export {
 	MESSAGE_CLOSE,
 	ERR_INVALID_PASSWORD,
 	ERR_INVALID_SIGNATURE,
+	ERR_INVALID_UNCOMPRESSED_SIZE,
 	ERR_ABORT_CHECK_PASSWORD,
 	CodecStream,
 	ChunkStream
@@ -103,6 +105,9 @@ class CodecStream extends TransformStream {
 				if (chunk && chunk.length) {
 					controller.enqueue(chunk);
 					codec.outputSize += chunk.length;
+					if (options.outputSize && codec.outputSize > options.outputSize) {
+						throw new Error(ERR_INVALID_UNCOMPRESSED_SIZE);
+					}
 				}
 			},
 			flush() {

package/lib/core/streams/zip-crypto-stream.js

@@ -131,7 +131,7 @@ function createKeys(target, password) {
 	Object.assign(target, {
 		keys,
 		crcKey0: new Crc32(keys[0]),
-		crcKey2: new Crc32(keys[2]),
+		crcKey2: new Crc32(keys[2])
 	});
 	for (let index = 0; index < password.length; index++) {
 		updateKeys(target, password.charCodeAt(index));

package/lib/core/streams/zip-entry-stream.js

@@ -44,6 +44,7 @@ import {
 	ERR_ABORT_CHECK_PASSWORD
 } from "./common-crypto.js";
 
+const ERR_INVALID_UNCOMPRESSED_SIZE = "Invalid uncompressed size";
 const COMPRESSION_FORMAT = "deflate-raw";
 
 class DeflateStream extends TransformStream {
@@ -53,7 +54,7 @@ class DeflateStream extends TransformStream {
 		const { compressed, encrypted, useCompressionStream, zipCrypto, signed, level } = options;
 		const stream = this;
 		let crc32Stream, encryptionStream;
-		let readable = filterEmptyChunks(super.readable);
+		let readable = super.readable;
 		if ((!encrypted || zipCrypto) && signed) {
 			crc32Stream = new Crc32Stream();
 			readable = pipeThrough(readable, crc32Stream);
@@ -88,7 +89,7 @@ class InflateStream extends TransformStream {
 		super({});
 		const { zipCrypto, encrypted, signed, signature, compressed, useCompressionStream } = options;
 		let crc32Stream, decryptionStream;
-		let readable = filterEmptyChunks(super.readable);
+		let readable = super.readable;
 		if (encrypted) {
 			if (zipCrypto) {
 				readable = pipeThrough(readable, new ZipCryptoDecryptionStream(options));
@@ -120,19 +121,10 @@ export {
 	InflateStream,
 	ERR_INVALID_PASSWORD,
 	ERR_INVALID_SIGNATURE,
+	ERR_INVALID_UNCOMPRESSED_SIZE,
 	ERR_ABORT_CHECK_PASSWORD
 };
 
-function filterEmptyChunks(readable) {
-	return pipeThrough(readable, new TransformStream({
-		transform(chunk, controller) {
-			if (chunk && chunk.length) {
-				controller.enqueue(chunk);
-			}
-		}
-	}));
-}
-
 function setReadable(stream, readable, flush) {
 	readable = pipeThrough(readable, new TransformStream({ flush }));
 	Object.defineProperty(stream, "readable", {
@@ -142,24 +134,9 @@ function setReadable(stream, readable, flush) {
 	});
 }
 
-function pipeThroughCommpressionStream(readable, useCompressionStream, options, CodecStreamNative, CodecStream) {
-	try {
-		const CompressionStream = useCompressionStream && CodecStreamNative ? CodecStreamNative : CodecStream;
-		readable = pipeThrough(readable, new CompressionStream(COMPRESSION_FORMAT, options));
-		// eslint-disable-next-line no-unused-vars
-	} catch (_) {
-		if (useCompressionStream) {
-			try {
-				readable = pipeThrough(readable, new CodecStream(COMPRESSION_FORMAT, options));
-				// eslint-disable-next-line no-unused-vars
-			} catch (_) {
-				return readable;
-			}
-		} else {
-			return readable;
-		}
-	}
-	return readable;
+function pipeThroughCommpressionStream(readable, useCompressionStream, options, CompressionStreamNative, CompressionStreamJS) {
+	const CompressionStream = useCompressionStream && CompressionStreamNative ? CompressionStreamNative : CompressionStreamJS;
+	return pipeThrough(readable, new CompressionStream(COMPRESSION_FORMAT, options));
 }
 
 function pipeThrough(readable, transformStream) {

package/lib/core/zip-entry.js

@@ -30,8 +30,8 @@ const PROPERTY_NAME_FILENAME = "filename";
 const PROPERTY_NAME_RAW_FILENAME = "rawFilename";
 const PROPERTY_NAME_COMMENT = "comment";
 const PROPERTY_NAME_RAW_COMMENT = "rawComment";
-const PROPERTY_NAME_UNCOMPPRESSED_SIZE = "uncompressedSize";
-const PROPERTY_NAME_COMPPRESSED_SIZE = "compressedSize";
+const PROPERTY_NAME_UNCOMPRESSED_SIZE = "uncompressedSize";
+const PROPERTY_NAME_COMPRESSED_SIZE = "compressedSize";
 const PROPERTY_NAME_OFFSET = "offset";
 const PROPERTY_NAME_DISK_NUMBER_START = "diskNumberStart";
 const PROPERTY_NAME_LAST_MODIFICATION_DATE = "lastModDate";
@@ -52,12 +52,20 @@ const PROPERTY_NAME_VERSION_MADE_BY = "versionMadeBy";
 const PROPERTY_NAME_ZIPCRYPTO = "zipCrypto";
 const PROPERTY_NAME_DIRECTORY = "directory";
 const PROPERTY_NAME_EXECUTABLE = "executable";
+const PROPERTY_NAME_COMPRESSION_METHOD = "compressionMethod";
+const PROPERTY_NAME_SIGNATURE = "signature";
+const PROPERTY_NAME_EXTRA_FIELD = "extraField";
 
 const PROPERTY_NAMES = [
-	PROPERTY_NAME_FILENAME, PROPERTY_NAME_RAW_FILENAME, PROPERTY_NAME_COMPPRESSED_SIZE, PROPERTY_NAME_UNCOMPPRESSED_SIZE,
+	PROPERTY_NAME_FILENAME, PROPERTY_NAME_RAW_FILENAME, PROPERTY_NAME_COMPRESSED_SIZE, PROPERTY_NAME_UNCOMPRESSED_SIZE,
 	PROPERTY_NAME_LAST_MODIFICATION_DATE, PROPERTY_NAME_RAW_LAST_MODIFICATION_DATE, PROPERTY_NAME_COMMENT, PROPERTY_NAME_RAW_COMMENT,
 	PROPERTY_NAME_LAST_ACCESS_DATE, PROPERTY_NAME_CREATION_DATE, PROPERTY_NAME_OFFSET, PROPERTY_NAME_DISK_NUMBER_START,
-	PROPERTY_NAME_DISK_NUMBER_START, PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTE, PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTES, PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTE, PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTES, PROPERTY_NAME_MS_DOS_COMPATIBLE, PROPERTY_NAME_ZIP64, PROPERTY_NAME_ENCRYPTED, PROPERTY_NAME_VERSION, PROPERTY_NAME_VERSION_MADE_BY, PROPERTY_NAME_ZIPCRYPTO, PROPERTY_NAME_DIRECTORY, PROPERTY_NAME_EXECUTABLE, "bitFlag", "signature", "filenameUTF8", "commentUTF8", "compressionMethod", "extraField", "rawExtraField", "extraFieldZip64", "extraFieldUnicodePath", "extraFieldUnicodeComment", "extraFieldAES", "extraFieldNTFS", "extraFieldExtendedTimestamp"];
+	PROPERTY_NAME_DISK_NUMBER_START, PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTE, PROPERTY_NAME_INTERNAL_FILE_ATTRIBUTES,
+	PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTE, PROPERTY_NAME_EXTERNAL_FILE_ATTRIBUTES, PROPERTY_NAME_MS_DOS_COMPATIBLE, PROPERTY_NAME_ZIP64,
+	PROPERTY_NAME_ENCRYPTED, PROPERTY_NAME_VERSION, PROPERTY_NAME_VERSION_MADE_BY, PROPERTY_NAME_ZIPCRYPTO, PROPERTY_NAME_DIRECTORY,
+	PROPERTY_NAME_EXECUTABLE, PROPERTY_NAME_COMPRESSION_METHOD, PROPERTY_NAME_SIGNATURE, PROPERTY_NAME_EXTRA_FIELD,
+	"bitFlag", "filenameUTF8", "commentUTF8", "rawExtraField", "extraFieldZip64", "extraFieldUnicodePath", "extraFieldUnicodeComment",
+	"extraFieldAES", "extraFieldNTFS", "extraFieldExtendedTimestamp"];
 
 class Entry {
 
@@ -72,8 +80,8 @@ export {
 	PROPERTY_NAME_RAW_FILENAME,
 	PROPERTY_NAME_COMMENT,
 	PROPERTY_NAME_RAW_COMMENT,
-	PROPERTY_NAME_UNCOMPPRESSED_SIZE,
-	PROPERTY_NAME_COMPPRESSED_SIZE,
+	PROPERTY_NAME_UNCOMPRESSED_SIZE,
+	PROPERTY_NAME_COMPRESSED_SIZE,
 	PROPERTY_NAME_OFFSET,
 	PROPERTY_NAME_DISK_NUMBER_START,
 	PROPERTY_NAME_LAST_MODIFICATION_DATE,
@@ -94,5 +102,8 @@ export {
 	PROPERTY_NAME_ZIPCRYPTO,
 	PROPERTY_NAME_DIRECTORY,
 	PROPERTY_NAME_EXECUTABLE,
+	PROPERTY_NAME_COMPRESSION_METHOD,
+	PROPERTY_NAME_SIGNATURE,
+	PROPERTY_NAME_EXTRA_FIELD,
 	Entry
 };

package/lib/core/zip-fs-core.js

@@ -874,7 +874,7 @@ async function transformToFileSystemhandles(entry) {
 				next() {
 					const result = {
 						value: entries[entryIndex],
-						done: entryIndex === entries.length
+						done: entryIndex == entries.length
 					};
 					entryIndex++;
 					return result;