Merge pull request #569 from lephilousophe/fix-unix-perms

Fix UNIX permissions

Author: gildas-lormeau

lib/core/constants.js

@@ -58,7 +58,8 @@ const BITFLAG_LEVEL = 0x06;
 const BITFLAG_DATA_DESCRIPTOR = 0x0008;
 const BITFLAG_LANG_ENCODING_FLAG = 0x0800;
 const FILE_ATTR_MSDOS_DIR_MASK = 0x10;
-const FILE_ATTR_UNIX_DIR_MASK =  0x4000;
+const FILE_ATTR_UNIX_TYPE_MASK =  0o170000;
+const FILE_ATTR_UNIX_TYPE_DIR =   0o040000;
 const FILE_ATTR_UNIX_EXECUTABLE_MASK = 0o111;
 const FILE_ATTR_UNIX_DEFAULT_MASK = 0o644;
 
@@ -105,7 +106,8 @@ export {
 	BITFLAG_DATA_DESCRIPTOR,
 	BITFLAG_LANG_ENCODING_FLAG,
 	FILE_ATTR_MSDOS_DIR_MASK,
-	FILE_ATTR_UNIX_DIR_MASK,
+	FILE_ATTR_UNIX_TYPE_MASK,
+	FILE_ATTR_UNIX_TYPE_DIR,
 	FILE_ATTR_UNIX_EXECUTABLE_MASK,
 	FILE_ATTR_UNIX_DEFAULT_MASK,
 	VERSION_DEFLATE,

lib/core/zip-reader.js

@@ -57,7 +57,8 @@ import {
 	BITFLAG_DATA_DESCRIPTOR,
 	BITFLAG_LANG_ENCODING_FLAG,
 	FILE_ATTR_MSDOS_DIR_MASK,
-	FILE_ATTR_UNIX_DIR_MASK,
+	FILE_ATTR_UNIX_TYPE_MASK,
+	FILE_ATTR_UNIX_TYPE_DIR,
 	FILE_ATTR_UNIX_EXECUTABLE_MASK,
 	DIRECTORY_SIGNATURE,
 	UNDEFINED_VALUE
@@ -263,9 +264,9 @@ class ZipReader {
 			const externalFileAttributes = getUint32(directoryView, offset + 38);
 			const directory =
 				(msDosCompatible && ((getUint8(directoryView, offset + 38) & FILE_ATTR_MSDOS_DIR_MASK) == FILE_ATTR_MSDOS_DIR_MASK)) ||
-				(unixCompatible && (((externalFileAttributes >> 16) & FILE_ATTR_UNIX_DIR_MASK) == FILE_ATTR_UNIX_DIR_MASK)) ||
+				(unixCompatible && (((externalFileAttributes >> 16) & FILE_ATTR_UNIX_TYPE_MASK) == FILE_ATTR_UNIX_TYPE_DIR)) ||
 				(rawFilename.length && rawFilename[rawFilename.length - 1] == DIRECTORY_SIGNATURE.charCodeAt(0));
-			const executable = (unixCompatible && (((externalFileAttributes >> 16) & FILE_ATTR_UNIX_EXECUTABLE_MASK) == FILE_ATTR_UNIX_EXECUTABLE_MASK));
+			const executable = (unixCompatible && (((externalFileAttributes >> 16) & FILE_ATTR_UNIX_EXECUTABLE_MASK) != 0));
 			const offsetFileEntry = getUint32(directoryView, offset + 42) + prependedDataLength;
 			Object.assign(fileEntry, {
 				versionMadeBy,

lib/core/zip-writer.js

@@ -56,6 +56,7 @@ import {
 	BITFLAG_DATA_DESCRIPTOR,
 	BITFLAG_LANG_ENCODING_FLAG,
 	FILE_ATTR_MSDOS_DIR_MASK,
+	FILE_ATTR_UNIX_TYPE_DIR,
 	FILE_ATTR_UNIX_EXECUTABLE_MASK,
 	FILE_ATTR_UNIX_DEFAULT_MASK,
 	VERSION_DEFLATE,
@@ -250,10 +251,9 @@ async function addFile(zipWriter, name, reader, options) {
 			name += DIRECTORY_SIGNATURE;
 		}
 		if (externalFileAttributes === 0) {
-			if (msDosCompatible) {
-				externalFileAttributes = FILE_ATTR_MSDOS_DIR_MASK;
-			} else {
-				externalFileAttributes = (FILE_ATTR_UNIX_EXECUTABLE_MASK | FILE_ATTR_UNIX_DEFAULT_MASK) << 16;
+			externalFileAttributes = FILE_ATTR_MSDOS_DIR_MASK;
+			if (!msDosCompatible) {
+				externalFileAttributes |= (FILE_ATTR_UNIX_TYPE_DIR | FILE_ATTR_UNIX_EXECUTABLE_MASK | FILE_ATTR_UNIX_DEFAULT_MASK) << 16;
 			}
 		}
 	} else if (!msDosCompatible && externalFileAttributes === 0) {

tests/all/test-directory.js

@@ -18,7 +18,9 @@ async function test() {
 	await zipWriter.close();
 	const zipReader = new zip.ZipReader(new zip.BlobReader(await blobWriter.getData()));
 	const entries = await zipReader.getEntries();
-	if (entries[0].directory && entries[0].filename == FOLDER_NAME && entries[0].externalFileAttributes >> 16 == 0o755) {
+	if (entries[0].directory && entries[0].filename == FOLDER_NAME &&
+		(entries[0].externalFileAttributes & 0xffff) == 0x10 &&
+		entries[0].externalFileAttributes >> 16 == 0o40755) {
 		if (!entries[1].directory && entries[1].filename == FILENAME) {
 			const text = await entries[1].getData(new zip.TextWriter());
 			await zipReader.close();