@zip.js/zip.js 2.8.44 → 2.8.45

package/dist/zip-fs-core.js

@@ -70,6 +70,8 @@
 	const EXTRAFIELD_TYPE_USDZ = 0x1986;
 	const EXTRAFIELD_TYPE_INFOZIP = 0x7875;
 	const EXTRAFIELD_TYPE_UNIX = 0x7855;
+	const EXTRAFIELD_TYPE_UNIX_TYPE1 = 0x5855;
+	const EXTRAFIELD_TYPE_PKWARE_UNIX = 0x000d;
 
 	const BITFLAG_ENCRYPTED = 0b1;
 	const BITFLAG_LEVEL = 0b0110;
@@ -2366,7 +2368,7 @@
 	const DERIVED_BITS_USAGE = ["deriveBits"];
 	const SALT_LENGTH = [8, 12, 16];
 	const KEY_LENGTH = [16, 24, 32];
-	const SIGNATURE_LENGTH = 10;
+	const AUTHENTICATION_CODE_LENGTH = 10;
 	const COUNTER_DEFAULT_VALUE = [0, 0, 0, 0];
 	// deno-lint-ignore valid-typeof
 	const CRYPTO_API_SUPPORTED = typeof crypto != UNDEFINED_TYPE;
@@ -2406,8 +2408,8 @@
 					} else {
 						await ready;
 					}
-					const output = new Uint8Array(chunk.length - SIGNATURE_LENGTH - ((chunk.length - SIGNATURE_LENGTH) % BLOCK_LENGTH));
-					controller.enqueue(append(aesCrypto, chunk, output, 0, SIGNATURE_LENGTH, true));
+					const output = new Uint8Array(chunk.length - AUTHENTICATION_CODE_LENGTH - ((chunk.length - AUTHENTICATION_CODE_LENGTH) % BLOCK_LENGTH));
+					controller.enqueue(append(aesCrypto, chunk, output, 0, AUTHENTICATION_CODE_LENGTH, true));
 				},
 				async flush(controller) {
 					const {
@@ -2418,8 +2420,8 @@
 					} = this;
 					if (hmac && ctr) {
 						await ready;
-						const chunkToDecrypt = subarray(pending, 0, pending.length - SIGNATURE_LENGTH);
-						const originalSignature = subarray(pending, pending.length - SIGNATURE_LENGTH);
+						const chunkToDecrypt = subarray(pending, 0, pending.length - AUTHENTICATION_CODE_LENGTH);
+						const originalAuthenticationCode = subarray(pending, pending.length - AUTHENTICATION_CODE_LENGTH);
 						let decryptedChunkArray = EMPTY_UINT8_ARRAY;
 						if (chunkToDecrypt.length) {
 							const encryptedChunk = toBits(codecBytes, chunkToDecrypt);
@@ -2427,12 +2429,12 @@
 							const decryptedChunk = ctr.update(encryptedChunk);
 							decryptedChunkArray = fromBits(codecBytes, decryptedChunk);
 						}
-						const signature = subarray(fromBits(codecBytes, hmac.digest()), 0, SIGNATURE_LENGTH);
-						let invalidSignature = pending.length < SIGNATURE_LENGTH ? 1 : 0;
-						for (let indexSignature = 0; indexSignature < SIGNATURE_LENGTH; indexSignature++) {
-							invalidSignature |= signature[indexSignature] ^ originalSignature[indexSignature];
+						const authenticationCode = subarray(fromBits(codecBytes, hmac.digest()), 0, AUTHENTICATION_CODE_LENGTH);
+						let invalidAuthenticationCode = pending.length < AUTHENTICATION_CODE_LENGTH ? 1 : 0;
+						for (let indexByte = 0; indexByte < AUTHENTICATION_CODE_LENGTH; indexByte++) {
+							invalidAuthenticationCode |= authenticationCode[indexByte] ^ originalAuthenticationCode[indexByte];
 						}
-						if (invalidSignature && checkAuthenticationCode) {
+						if (invalidAuthenticationCode && checkAuthenticationCode) {
 							throw new Error(ERR_INVALID_AUTHENTICATION_CODE);
 						}
 						controller.enqueue(decryptedChunkArray);
@@ -2445,8 +2447,6 @@
 	class AESEncryptionStream extends TransformStream {
 
 		constructor({ password, rawPassword, encryptionStrength }) {
-			// deno-lint-ignore prefer-const
-			let stream;
 			super({
 				start() {
 					initAesCrypto(this, password, rawPassword, encryptionStrength);
@@ -2485,12 +2485,11 @@
 							hmac.update(encryptedChunk);
 							encryptedChunkArray = fromBits(codecBytes, encryptedChunk);
 						}
-						stream.signature = fromBits(codecBytes, hmac.digest()).slice(0, SIGNATURE_LENGTH);
-						controller.enqueue(concat(encryptedChunkArray, stream.signature));
+						const authenticationCode = fromBits(codecBytes, hmac.digest()).slice(0, AUTHENTICATION_CODE_LENGTH);
+						controller.enqueue(concat(encryptedChunkArray, authenticationCode));
 					}
 				}
 			});
-			stream = this;
 		}
 	}
 
@@ -2503,7 +2502,7 @@
 		});
 	}
 
-	function append(aesCrypto, input, output, paddingStart, paddingEnd, verifySignature) {
+	function append(aesCrypto, input, output, paddingStart, paddingEnd, verifyAuthenticationCode) {
 		const {
 			ctr,
 			hmac,
@@ -2517,11 +2516,11 @@
 		let offset;
 		for (offset = 0; offset <= inputLength - BLOCK_LENGTH; offset += BLOCK_LENGTH) {
 			const inputChunk = toBits(codecBytes, subarray(input, offset, offset + BLOCK_LENGTH));
-			if (verifySignature) {
+			if (verifyAuthenticationCode) {
 				hmac.update(inputChunk);
 			}
 			const outputChunk = ctr.update(inputChunk);
-			if (!verifySignature) {
+			if (!verifyAuthenticationCode) {
 				hmac.update(outputChunk);
 			}
 			output.set(fromBits(codecBytes, outputChunk), offset + paddingStart);
@@ -2860,14 +2859,9 @@
 				}
 			}
 			setReadable(stream, readable, () => {
-				let signature;
-				if (encrypted && !zipCrypto) {
-					signature = encryptionStream.signature;
-				}
 				if ((!encrypted || zipCrypto) && computeCrc32) {
-					signature = useGzipCrc32 ? gzipCrc32Stream.signature : new DataView(crc32Stream.value.buffer).getUint32(0);
+					stream.crc32 = useGzipCrc32 ? gzipCrc32Stream.crc32 : new DataView(crc32Stream.value.buffer).getUint32(0);
 				}
-				stream.signature = signature;
 			});
 		}
 	}
@@ -2905,7 +2899,7 @@
 				},
 				flush() {
 					const dataView = getDataView(trailerCandidate);
-					stream.signature = dataView.getUint32(0, true);
+					stream.crc32 = dataView.getUint32(0, true);
 					stream.uncompressedSize = dataView.getUint32(4, true);
 				}
 			});
@@ -2987,7 +2981,7 @@
 
 		constructor(options, { chunkSize, DecompressionStreamZlib, DecompressionStream }) {
 			super({});
-			const { zipCrypto, encrypted, checkCrc32, signature, compressed, useCompressionStream, deflate64, format, compressionMethod, rawBitFlag, outputSize } = options;
+			const { zipCrypto, encrypted, checkCrc32, crc32, compressed, useCompressionStream, deflate64, format, compressionMethod, rawBitFlag, outputSize } = options;
 			let crc32Stream, decryptionStream;
 			let readable = super.readable;
 			if (encrypted) {
@@ -3026,8 +3020,8 @@
 			}
 			setReadable(this, readable, () => {
 				if (checkCrc32) {
-					const dataViewSignature = new DataView(crc32Stream.value.buffer);
-					if (signature != dataViewSignature.getUint32(0, false)) {
+					const computedCrc32View = new DataView(crc32Stream.value.buffer);
+					if (crc32 != computedCrc32View.getUint32(0, false)) {
 						throw new Error(ERR_INVALID_CRC32);
 					}
 				}
@@ -3252,9 +3246,9 @@
 					}
 				},
 				flush() {
-					const { signature } = stream;
+					const { crc32 } = stream;
 					Object.assign(codec, {
-						signature,
+						crc32,
 						inputSize
 					});
 				}
@@ -3549,12 +3543,12 @@
 				.pipeThrough(new ChunkStream(getChunkSize(config)))
 				.pipeTo(writable, { preventClose: true, preventAbort: true });
 			const {
-				signature,
+				crc32,
 				inputSize,
 				outputSize
 			} = codecStream;
 			return {
-				signature,
+				crc32,
 				inputSize,
 				outputSize
 			};
@@ -4171,6 +4165,8 @@
 	const PROPERTY_NAME_EXTRA_FIELD = "extraField";
 	const PROPERTY_NAME_EXTRA_FIELD_INFOZIP = "extraFieldInfoZip";
 	const PROPERTY_NAME_EXTRA_FIELD_UNIX = "extraFieldUnix";
+	const PROPERTY_NAME_EXTRA_FIELD_UNIX_TYPE1 = "extraFieldUnixType1";
+	const PROPERTY_NAME_EXTRA_FIELD_PKWARE_UNIX = "extraFieldPkwareUnix";
 	const PROPERTY_NAME_UID = "uid";
 	const PROPERTY_NAME_GID = "gid";
 	const PROPERTY_NAME_UNIX_MODE = "unixMode";
@@ -4187,6 +4183,7 @@
 	const PROPERTY_NAME_EXTRA_FIELD_AES = "extraFieldAES";
 	const PROPERTY_NAME_EXTRA_FIELD_NTFS = "extraFieldNTFS";
 	const PROPERTY_NAME_EXTRA_FIELD_EXTENDED_TIMESTAMP = "extraFieldExtendedTimestamp";
+	const PROPERTY_NAME_EXTRA_FIELD_USDZ = "extraFieldUSDZ";
 
 	const PROPERTY_NAMES = [
 		PROPERTY_NAME_FILENAME,
@@ -4198,6 +4195,7 @@
 		PROPERTY_NAME_COMMENT,
 		PROPERTY_NAME_RAW_COMMENT,
 		PROPERTY_NAME_LAST_ACCESS_DATE,
+		PROPERTY_NAME_RAW_LAST_ACCESS_DATE,
 		PROPERTY_NAME_CREATION_DATE,
 		PROPERTY_NAME_RAW_CREATION_DATE,
 		PROPERTY_NAME_OFFSET,
@@ -4220,6 +4218,8 @@
 		PROPERTY_NAME_EXTRA_FIELD,
 		PROPERTY_NAME_EXTRA_FIELD_UNIX,
 		PROPERTY_NAME_EXTRA_FIELD_INFOZIP,
+		PROPERTY_NAME_EXTRA_FIELD_UNIX_TYPE1,
+		PROPERTY_NAME_EXTRA_FIELD_PKWARE_UNIX,
 		PROPERTY_NAME_UID,
 		PROPERTY_NAME_GID,
 		PROPERTY_NAME_UNIX_MODE,
@@ -4235,7 +4235,8 @@
 		PROPERTY_NAME_EXTRA_FIELD_UNICODE_COMMENT,
 		PROPERTY_NAME_EXTRA_FIELD_AES,
 		PROPERTY_NAME_EXTRA_FIELD_NTFS,
-		PROPERTY_NAME_EXTRA_FIELD_EXTENDED_TIMESTAMP
+		PROPERTY_NAME_EXTRA_FIELD_EXTENDED_TIMESTAMP,
+		PROPERTY_NAME_EXTRA_FIELD_USDZ
 	];
 
 	class Entry {
@@ -4309,6 +4310,7 @@
 	const OPTION_OFFSET = "offset";
 	const OPTION_USDZ = "usdz";
 	const OPTION_UNIX_EXTRA_FIELD_TYPE = "unixExtraFieldType";
+	const OPTION_LOCAL_EXTRA_FIELD = "localExtraField";
 	const OPTION_STRICTNESS = "strictness";
 	const OPTION_MAX_APPENDED_DATA_SIZE = "maxAppendedDataSize";
 	const STRICTNESS_STRICT = "strict";
@@ -4361,7 +4363,7 @@
 	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 VENDOR_VERSION_AE_1$1 = 1;
 	const ZIP64_PROPERTIES = [
 		[PROPERTY_NAME_UNCOMPRESSED_SIZE, MAX_32_BITS],
 		[PROPERTY_NAME_COMPRESSED_SIZE, MAX_32_BITS],
@@ -4714,7 +4716,7 @@
 				config,
 				bitFlag,
 				rawBitFlag,
-				signature,
+				crc32,
 				rawLastModDate,
 				uncompressedSize,
 				compressedSize
@@ -4805,7 +4807,7 @@
 			const checkCrc32 = (checkCrc32Option === UNDEFINED_VALUE ?
 				getOptionValue$1(zipEntry, options, OPTION_CHECK_SIGNATURE) :
 				checkCrc32Option) && !passThrough &&
-				(!encrypted || zipCrypto || (extraFieldAES && extraFieldAES.vendorVersion == VENDOR_VERSION_AE_1));
+				(!encrypted || zipCrypto || (extraFieldAES && extraFieldAES.vendorVersion == VENDOR_VERSION_AE_1$1));
 			const workerOptions = {
 				options: {
 					codecType: CODEC_INFLATE,
@@ -4815,9 +4817,9 @@
 					encryptionStrength: extraFieldAES && extraFieldAES.strength,
 					checkCrc32,
 					checkAuthenticationCode: getOptionValue$1(zipEntry, options, OPTION_CHECK_AUTHENTICATION_CODE),
-					passwordVerification: zipCrypto && (dataDescriptor ? ((rawLastModDate >>> 8) & MAX_8_BITS) : ((signature >>> 24) & MAX_8_BITS)),
+					passwordVerification: zipCrypto && (dataDescriptor ? ((rawLastModDate >>> 8) & MAX_8_BITS) : ((crc32 >>> 24) & MAX_8_BITS)),
 					outputSize: passThrough ? compressedSize : uncompressedSize,
-					signature,
+					crc32,
 					compressed: compressionMethod != 0 && !passThrough,
 					encrypted,
 					useWebWorkers: getOptionValue$1(zipEntry, options, OPTION_USE_WEB_WORKERS),
@@ -4839,7 +4841,7 @@
 					fileEntry,
 					index,
 					offset: localHeaderOffset,
-					signature,
+					crc32,
 					compressedSize,
 					uncompressedSize,
 					dataOffset,
@@ -4956,6 +4958,16 @@
 		} else {
 			directory.compressionMethod = compressionMethod;
 		}
+		const extraFieldPkwareUnix = extraField.get(EXTRAFIELD_TYPE_PKWARE_UNIX);
+		if (extraFieldPkwareUnix) {
+			readExtraFieldUnixDates(extraFieldPkwareUnix, directory);
+			directory.extraFieldPkwareUnix = extraFieldPkwareUnix;
+		}
+		const extraFieldUnixType1 = extraField.get(EXTRAFIELD_TYPE_UNIX_TYPE1);
+		if (extraFieldUnixType1) {
+			readExtraFieldUnixDates(extraFieldUnixType1, directory);
+			directory.extraFieldUnixType1 = extraFieldUnixType1;
+		}
 		const extraFieldNTFS = extraField.get(EXTRAFIELD_TYPE_NTFS);
 		if (extraFieldNTFS) {
 			readExtraFieldNTFS(extraFieldNTFS, directory);
@@ -5005,15 +5017,15 @@
 			return;
 		}
 		const extraFieldView = getDataView(extraFieldUnicode.data);
-		const crc32 = new Crc32();
-		crc32.append(fileEntry[rawPropertyName]);
-		const dataViewSignature = getDataView(new Uint8Array(4));
-		dataViewSignature.setUint32(0, crc32.get(), true);
-		const signature = getUint32(extraFieldView, 1);
+		const computedCrc32 = new Crc32();
+		computedCrc32.append(fileEntry[rawPropertyName]);
+		const computedCrc32View = getDataView(new Uint8Array(4));
+		computedCrc32View.setUint32(0, computedCrc32.get(), true);
+		const nameCrc32 = getUint32(extraFieldView, 1);
 		Object.assign(extraFieldUnicode, {
 			version: getUint8(extraFieldView, 0),
 			[propertyName]: decodeText(extraFieldUnicode.data.subarray(5)),
-			valid: !fileEntry.bitFlag.languageEncodingFlag && signature == getUint32(dataViewSignature, 0)
+			valid: !fileEntry.bitFlag.languageEncodingFlag && nameCrc32 == getUint32(computedCrc32View, 0)
 		});
 		if (extraFieldUnicode.valid) {
 			directory[propertyName] = extraFieldUnicode[propertyName];
@@ -5032,7 +5044,7 @@
 			compressionMethod: getUint16(extraFieldView, 5)
 		});
 		directory.compressionMethod = extraFieldAES.compressionMethod;
-		if (extraFieldAES.vendorVersion != VENDOR_VERSION_AE_1) {
+		if (extraFieldAES.vendorVersion != VENDOR_VERSION_AE_1$1) {
 			directory.crc32 = UNDEFINED_VALUE;
 		}
 	}
@@ -5072,6 +5084,22 @@
 		}
 	}
 
+	function readExtraFieldUnixDates(extraField, directory) {
+		if (extraField.data.length < 8) {
+			return;
+		}
+		const extraFieldView = getDataView(extraField.data);
+		const lastAccessDate = new Date(getUint32(extraFieldView, 0) * 1000);
+		const lastModDate = new Date(getUint32(extraFieldView, 4) * 1000);
+		const extraFieldData = { lastAccessDate, lastModDate };
+		if (extraField.data.length >= 12) {
+			extraFieldData.uid = getUint16(extraFieldView, 8);
+			extraFieldData.gid = getUint16(extraFieldView, 10);
+		}
+		Object.assign(extraField, extraFieldData);
+		Object.assign(directory, extraFieldData);
+	}
+
 	function readExtraFieldUnix(extraField, directory, isInfoZip) {
 		try {
 			const view = getDataView(extraField.data);
@@ -5150,7 +5178,7 @@
 		fileEntry,
 		index,
 		offset,
-		signature,
+		crc32,
 		compressedSize,
 		uncompressedSize,
 		dataOffset,
@@ -5171,7 +5199,7 @@
 			const dataDescriptorSignature = dataDescriptorArray.length == dataDescriptorLength + DATA_DESCRIPTOR_RECORD_SIGNATURE_LENGTH &&
 				getUint32(getDataView(dataDescriptorArray), 0) == DATA_DESCRIPTOR_RECORD_SIGNATURE;
 			if (dataDescriptorSignature) {
-				const readSignature = getUint32(getDataView(dataDescriptorArray), 4);
+				const readCrc32 = getUint32(getDataView(dataDescriptorArray), 4);
 				let readCompressedSize;
 				let readUncompressedSize;
 				if (extraFieldZip64) {
@@ -5181,8 +5209,8 @@
 					readCompressedSize = getUint32(getDataView(dataDescriptorArray), 8);
 					readUncompressedSize = getUint32(getDataView(dataDescriptorArray), 12);
 				}
-				const matchSignature = (fileEntry.encrypted && !fileEntry.zipCrypto) || readSignature == signature;
-				if (matchSignature &&
+				const matchCrc32 = (fileEntry.encrypted && !fileEntry.zipCrypto) || readCrc32 == crc32;
+				if (matchCrc32 &&
 					readCompressedSize == compressedSize &&
 					readUncompressedSize == uncompressedSize) {
 					dataDescriptorLength += DATA_DESCRIPTOR_RECORD_SIGNATURE_LENGTH;
@@ -5351,11 +5379,11 @@
 			throwAmbiguousArchive("mismatched local file header (compression method)");
 		}
 		if (!localDirectory.bitFlag.dataDescriptor &&
-			(localDirectory.signature || localDirectory.compressedSize || localDirectory.uncompressedSize) &&
-			(localDirectory.signature != zipEntry.signature ||
+			(localDirectory.crc32 || localDirectory.compressedSize || localDirectory.uncompressedSize) &&
+			(localDirectory.crc32 != zipEntry.crc32 ||
 				localDirectory.compressedSize != zipEntry.compressedSize ||
 				localDirectory.uncompressedSize != zipEntry.uncompressedSize)) {
-			throwAmbiguousArchive("mismatched local file header (signature or sizes)");
+			throwAmbiguousArchive("mismatched local file header (crc32 or sizes)");
 		}
 	}
 
@@ -5474,7 +5502,9 @@
 	const ERR_INVALID_MSDOS_DATA = "Invalid msdosAttributes (must be an object with boolean flags)";
 
 	const EXTRAFIELD_DATA_AES = new Uint8Array([0x07, 0x00, 0x02, 0x00, 0x41, 0x45, 0x03, 0x00, 0x00]);
-	const INFOZIP_EXTRA_FIELD_TYPE = "infozip";
+	const EXTRAFIELD_OFFSET_AES_VENDOR_VERSION = 4;
+	const VENDOR_VERSION_AE_1 = 1;
+	const INFOZIP_EXTRA_FIELD_TYPE$1 = "infozip";
 	const UNIX_EXTRA_FIELD_TYPE = "unix";
 
 	let workers = 0;
@@ -5568,9 +5598,9 @@
 					zip64UncompressedSize,
 					extraFieldLength
 				});
-				const { signature } = entry;
-				if (signature !== UNDEFINED_VALUE) {
-					setUint32(headerView, HEADER_OFFSET_SIGNATURE, signature);
+				const { crc32 } = entry;
+				if (crc32 !== UNDEFINED_VALUE) {
+					setUint32(headerView, HEADER_OFFSET_SIGNATURE, crc32);
 				}
 				Object.assign(entry, {
 					zip64UncompressedSize,
@@ -5693,6 +5723,7 @@
 				internalFileAttribute: metadataInfo.resolvedOptions.internalFileAttributes,
 				externalFileAttribute: attributesInfo.resolvedOptions.externalFileAttributes,
 				signature: options[PROPERTY_NAME_SIGNATURE],
+				crc32: options.crc32 === UNDEFINED_VALUE ? options[PROPERTY_NAME_SIGNATURE] : options.crc32,
 				offset: zipWriter.offset - diskOffset,
 				diskNumberStart: diskNumber
 			});
@@ -5729,7 +5760,7 @@
 		if (unixMode !== UNDEFINED_VALUE && (unixMode < 0 || unixMode > MAX_16_BITS)) {
 			throw new Error(ERR_INVALID_UNIX_MODE);
 		}
-		if (unixExtraFieldType !== UNDEFINED_VALUE && unixExtraFieldType !== INFOZIP_EXTRA_FIELD_TYPE && unixExtraFieldType !== UNIX_EXTRA_FIELD_TYPE) {
+		if (unixExtraFieldType !== UNDEFINED_VALUE && unixExtraFieldType !== INFOZIP_EXTRA_FIELD_TYPE$1 && unixExtraFieldType !== UNIX_EXTRA_FIELD_TYPE) {
 			throw new Error(ERR_INVALID_UNIX_EXTRA_FIELD_TYPE);
 		}
 		if (unixExtraFieldType === UNIX_EXTRA_FIELD_TYPE &&
@@ -5737,7 +5768,7 @@
 			throw new Error(ERR_INVALID_UNIX_ID_SIZE);
 		}
 		if (unixExtraFieldType === UNDEFINED_VALUE && (uid !== UNDEFINED_VALUE || gid !== UNDEFINED_VALUE)) {
-			unixExtraFieldType = INFOZIP_EXTRA_FIELD_TYPE;
+			unixExtraFieldType = INFOZIP_EXTRA_FIELD_TYPE$1;
 		}
 		let msdosAttributesRaw = getOptionValue(zipWriter, options, PROPERTY_NAME_MSDOS_ATTRIBUTES_RAW);
 		let msdosAttributes = getOptionValue(zipWriter, options, PROPERTY_NAME_MSDOS_ATTRIBUTES);
@@ -5909,27 +5940,8 @@
 		if (!zipCrypto && (password !== UNDEFINED_VALUE || rawPassword !== UNDEFINED_VALUE) && !(encryptionStrength >= 1 && encryptionStrength <= 3)) {
 			throw new Error(ERR_INVALID_ENCRYPTION_STRENGTH);
 		}
-		let rawExtraField = EMPTY_UINT8_ARRAY;
-		const extraField = options[PROPERTY_NAME_EXTRA_FIELD];
-		if (extraField) {
-			let extraFieldSize = 0;
-			let offset = 0;
-			extraField.forEach(data => extraFieldSize += 4 + getLength(data));
-			rawExtraField = new Uint8Array(extraFieldSize);
-			const rawExtraFieldView = getDataView(rawExtraField);
-			extraField.forEach((data, type) => {
-				if (type > MAX_16_BITS) {
-					throw new Error(ERR_INVALID_EXTRAFIELD_TYPE);
-				}
-				if (getLength(data) > MAX_16_BITS) {
-					throw new Error(ERR_INVALID_EXTRAFIELD_DATA);
-				}
-				setUint16(rawExtraFieldView, offset, type);
-				setUint16(rawExtraFieldView, offset + 2, getLength(data));
-				arraySet(rawExtraField, data, offset + 4);
-				offset += 4 + getLength(data);
-			});
-		}
+		const rawExtraField = serializeExtraField(options[PROPERTY_NAME_EXTRA_FIELD]);
+		const rawLocalExtraField = serializeExtraField(options[OPTION_LOCAL_EXTRA_FIELD]);
 		return {
 			comment,
 			resolvedOptions: {
@@ -5963,11 +5975,36 @@
 				useCompressionStream,
 				dataDescriptor,
 				zip64,
-				rawExtraField
+				rawExtraField,
+				rawLocalExtraField
 			}
 		};
 	}
 
+	function serializeExtraField(extraField) {
+		if (!extraField) {
+			return EMPTY_UINT8_ARRAY;
+		}
+		let extraFieldSize = 0;
+		let offset = 0;
+		extraField.forEach(data => extraFieldSize += 4 + getLength(data));
+		const rawExtraField = new Uint8Array(extraFieldSize);
+		const rawExtraFieldView = getDataView(rawExtraField);
+		extraField.forEach((data, type) => {
+			if (type > MAX_16_BITS) {
+				throw new Error(ERR_INVALID_EXTRAFIELD_TYPE);
+			}
+			if (getLength(data) > MAX_16_BITS) {
+				throw new Error(ERR_INVALID_EXTRAFIELD_DATA);
+			}
+			setUint16(rawExtraFieldView, offset, type);
+			setUint16(rawExtraFieldView, offset + 2, getLength(data));
+			arraySet(rawExtraField, data, offset + 4);
+			offset += 4 + getLength(data);
+		});
+		return rawExtraField;
+	}
+
 	async function resolveSizes(zipWriter, reader, { resolvedOptions: metadata }, options) {
 		const { passThrough, zipCrypto, password, rawPassword, encryptionStrength } = metadata;
 		let { dataDescriptor, zip64, level, compressionMethod } = metadata;
@@ -6292,12 +6329,9 @@
 			msdosAttributes
 		};
 		let {
-			crc32: signature,
+			crc32,
 			uncompressedSize
 		} = options;
-		if (signature === UNDEFINED_VALUE) {
-			({ signature } = options);
-		}
 		let compressedSize = 0;
 		if (!passThrough) {
 			uncompressedSize = 0;
@@ -6335,7 +6369,7 @@
 				if (!passThrough) {
 					uncompressedSize = result.inputSize;
 					if (!encrypted || zipCrypto) {
-						signature = result.signature;
+						crc32 = result.crc32;
 					}
 				}
 				if ((!zip64CompressedSize && compressedSize >= MAX_32_BITS) ||
@@ -6351,7 +6385,7 @@
 
 		}
 		setEntryInfo({
-			signature,
+			crc32,
 			compressedSize,
 			uncompressedSize,
 			headerInfo,
@@ -6374,8 +6408,8 @@
 			version,
 			headerArray,
 			headerView,
-			signature,
-			crc32: encrypted && !zipCrypto ? UNDEFINED_VALUE : signature,
+			signature: crc32,
+			crc32: encrypted && !zipCrypto && !passThrough ? UNDEFINED_VALUE : crc32,
 			extraFieldExtendedTimestampFlag,
 			zip64UncompressedSize,
 			zip64CompressedSize
@@ -6396,6 +6430,7 @@
 			dataDescriptor,
 			directory,
 			rawExtraField,
+			rawLocalExtraField,
 			encryptionStrength,
 			extendedTimestamp,
 			ntfsTimestamp,
@@ -6403,7 +6438,8 @@
 			encrypted,
 			zip64UncompressedSize,
 			zip64CompressedSize,
-			uncompressedSize
+			uncompressedSize,
+			crc32
 		} = options;
 		let { version, compressionMethod } = options;
 		const compressed = !directory && (compressionMethod === UNDEFINED_VALUE
@@ -6491,7 +6527,7 @@
 		let rawExtraFieldUnix;
 		try {
 			const { uid, gid, unixExtraFieldType } = options;
-			if (unixExtraFieldType == INFOZIP_EXTRA_FIELD_TYPE && (uid !== UNDEFINED_VALUE || gid !== UNDEFINED_VALUE)) {
+			if (unixExtraFieldType == INFOZIP_EXTRA_FIELD_TYPE$1 && (uid !== UNDEFINED_VALUE || gid !== UNDEFINED_VALUE)) {
 				const uidBytes = packUnixId(uid);
 				const gidBytes = packUnixId(gid);
 				const payloadLength = 3 + uidBytes.length + gidBytes.length;
@@ -6529,11 +6565,14 @@
 		}
 		if (encrypted && !zipCrypto) {
 			version = version > VERSION_AES ? version : VERSION_AES;
+			if (passThrough && crc32 !== UNDEFINED_VALUE) {
+				rawExtraFieldAES[EXTRAFIELD_OFFSET_AES_VENDOR_VERSION] = VENDOR_VERSION_AE_1;
+			}
 			rawExtraFieldAES[9] = compressionMethod;
 			compressionMethod = COMPRESSION_METHOD_AES;
 		}
 		const localExtraFieldZip64Length = writeLocalExtraFieldZip64 ? getLength(rawLocalExtraFieldZip64) : 0;
-		const extraFieldLength = localExtraFieldZip64Length + getLength(rawExtraFieldAES, rawExtraFieldExtendedTimestamp, rawExtraFieldNTFS, rawExtraFieldUnix, rawExtraField);
+		const extraFieldLength = localExtraFieldZip64Length + getLength(rawExtraFieldAES, rawExtraFieldExtendedTimestamp, rawExtraFieldNTFS, rawExtraFieldUnix, rawExtraField, rawLocalExtraField);
 		if (extraFieldLength > MAX_16_BITS) {
 			throw new Error(ERR_INVALID_EXTRAFIELD_DATA);
 		}
@@ -6567,6 +6606,7 @@
 		localHeader.bytes(rawExtraFieldNTFS);
 		localHeader.bytes(rawExtraFieldUnix);
 		localHeader.bytes(rawExtraField);
+		localHeader.bytes(rawLocalExtraField);
 		if (dataDescriptor) {
 			if (!zip64CompressedSize) {
 				setUint32(localHeaderView, HEADER_OFFSET_COMPRESSED_SIZE + LOCAL_HEADER_COMMON_OFFSET, 0);
@@ -6685,7 +6725,7 @@
 	}
 
 	function setEntryInfo({
-		signature,
+		crc32,
 		compressedSize,
 		uncompressedSize,
 		headerInfo,
@@ -6693,6 +6733,7 @@
 	}, {
 		zip64,
 		zipCrypto,
+		passThrough,
 		dataDescriptor
 	}) {
 		const {
@@ -6703,10 +6744,10 @@
 			dataDescriptorView,
 			dataDescriptorOffset
 		} = dataDescriptorInfo;
-		if ((!encrypted || zipCrypto) && signature !== UNDEFINED_VALUE) {
-			setUint32(headerView, HEADER_OFFSET_SIGNATURE, signature);
+		if ((!encrypted || zipCrypto || passThrough) && crc32 !== UNDEFINED_VALUE) {
+			setUint32(headerView, HEADER_OFFSET_SIGNATURE, crc32);
 			if (dataDescriptor) {
-				setUint32(dataDescriptorView, dataDescriptorOffset, signature);
+				setUint32(dataDescriptorView, dataDescriptorOffset, crc32);
 			}
 		}
 		if (zip64) {
@@ -6729,15 +6770,15 @@
 		encrypted,
 		zip64,
 		localExtraFieldZip64Length,
-		signature,
+		crc32,
 		compressedSize,
 		uncompressedSize,
 		zip64UncompressedSize,
 		zip64CompressedSize
-	}, localHeaderView, { dataDescriptor }) {
+	}, localHeaderView, { dataDescriptor, passThrough }) {
 		if (!dataDescriptor) {
-			if (!encrypted) {
-				setUint32(localHeaderView, HEADER_OFFSET_SIGNATURE + LOCAL_HEADER_COMMON_OFFSET, signature);
+			if (!encrypted || (passThrough && crc32 !== UNDEFINED_VALUE)) {
+				setUint32(localHeaderView, HEADER_OFFSET_SIGNATURE + LOCAL_HEADER_COMMON_OFFSET, crc32);
 			}
 			if (!zip64CompressedSize) {
 				setUint32(localHeaderView, HEADER_OFFSET_COMPRESSED_SIZE + LOCAL_HEADER_COMMON_OFFSET, compressedSize);
@@ -7202,6 +7243,20 @@
 
 	const ERR_ENTRY_EXISTS = "Entry filename already exists";
 	const ERR_READABLE_CONSUMED = "Readable stream already consumed";
+	const INFOZIP_EXTRA_FIELD_TYPE = "infozip";
+	const INTERPRETED_EXTRA_FIELD_TYPES = new Set([
+		EXTRAFIELD_TYPE_ZIP64,
+		EXTRAFIELD_TYPE_AES,
+		EXTRAFIELD_TYPE_NTFS,
+		EXTRAFIELD_TYPE_EXTENDED_TIMESTAMP,
+		EXTRAFIELD_TYPE_UNICODE_PATH,
+		EXTRAFIELD_TYPE_UNICODE_COMMENT,
+		EXTRAFIELD_TYPE_USDZ,
+		EXTRAFIELD_TYPE_INFOZIP,
+		EXTRAFIELD_TYPE_UNIX,
+		EXTRAFIELD_TYPE_UNIX_TYPE1,
+		EXTRAFIELD_TYPE_PKWARE_UNIX
+	]);
 
 	class ZipEntry {
 
@@ -7939,6 +7994,20 @@
 		}
 	}
 
+	function getUserExtraField(extraField) {
+		if (extraField) {
+			const userExtraField = new Map();
+			extraField.forEach((field, type) => {
+				if (!INTERPRETED_EXTRA_FIELD_TYPES.has(type)) {
+					userExtraField.set(type, field.data);
+				}
+			});
+			if (userExtraField.size) {
+				return userExtraField;
+			}
+		}
+	}
+
 	async function exportZip(zipWriter, entry, totalSize, options, readers) {
 		const selectedEntry = entry;
 		const entryOffsets = new Map();
@@ -7976,9 +8045,13 @@
 						uncompressedSize,
 						encrypted,
 						zipCrypto,
-						signature,
+						crc32,
 						compressionMethod,
-						extraFieldAES
+						extraFieldAES,
+						internalFileAttributes,
+						extraField,
+						uid,
+						gid
 					} = child.data;
 					zipEntryOptions = {
 						externalFileAttributes,
@@ -7986,8 +8059,20 @@
 						comment,
 						lastModDate,
 						creationDate,
-						lastAccessDate
+						lastAccessDate,
+						internalFileAttributes
 					};
+					const userExtraField = getUserExtraField(extraField);
+					if (userExtraField) {
+						zipEntryOptions.extraField = userExtraField;
+					}
+					if (uid !== UNDEFINED_VALUE || gid !== UNDEFINED_VALUE) {
+						Object.assign(zipEntryOptions, {
+							uid,
+							gid,
+							unixExtraFieldType: options.unixExtraFieldType || INFOZIP_EXTRA_FIELD_TYPE
+						});
+					}
 					if (child.passThrough) {
 						let level, encryptionStrength;
 						if (compressionMethod === 0) {
@@ -8000,7 +8085,7 @@
 							passThrough: true,
 							encrypted,
 							zipCrypto,
-							signature,
+							crc32,
 							uncompressedSize,
 							level,
 							encryptionStrength,