LibArchive/Zip+Utilities: Support unix permissions

Implements reading and writing unix permissions for LibArchive/Zip and
the zip,unzip utilities.

Author: educasadei

Userland/Libraries/LibArchive/Zip.cpp

@@ -94,7 +94,10 @@ ErrorOr<bool> Zip::for_each_member(Function<ErrorOr<IterationDecision>(ZipMember
         member.crc32 = central_directory_record.crc32;
         member.modification_time = central_directory_record.modification_time;
         member.modification_date = central_directory_record.modification_date;
-        member.is_directory = central_directory_record.external_attributes & zip_directory_external_attribute || member.name.bytes_as_string_view().ends_with('/'); // FIXME: better directory detection
+        member.is_directory = central_directory_record.msdos_attributes & zip_directory_msdos_attribute || member.name.bytes_as_string_view().ends_with('/'); // FIXME: better directory detection
+        if (central_directory_record.made_by == ZipMadeBy::Unix) {
+            member.mode = static_cast<mode_t>(central_directory_record.external_attributes);
+        }
 
         if (TRY(callback(member)) == IterationDecision::Break)
             return false;
@@ -158,7 +161,7 @@ ErrorOr<void> ZipOutputStream::add_member(ZipMember const& member)
     return local_file_header.write(*m_stream);
 }
 
-ErrorOr<ZipOutputStream::MemberInformation> ZipOutputStream::add_member_from_stream(StringView path, Stream& stream, Optional<Core::DateTime> const& modification_time)
+ErrorOr<ZipOutputStream::MemberInformation> ZipOutputStream::add_member_from_stream(StringView path, Stream& stream, Optional<Core::DateTime> const& modification_time, Optional<mode_t> mode)
 {
     auto buffer = TRY(stream.read_until_eof());
 
@@ -190,13 +193,14 @@ ErrorOr<ZipOutputStream::MemberInformation> ZipOutputStream::add_member_from_str
     Crypto::Checksum::CRC32 checksum { buffer.bytes() };
     member.crc32 = checksum.digest();
     member.is_directory = false;
+    member.mode = mode;
 
     TRY(add_member(member));
 
     return MemberInformation { compression_ratio, compressed_size };
 }
 
-ErrorOr<void> ZipOutputStream::add_directory(StringView name, Optional<Core::DateTime> const& modification_time)
+ErrorOr<void> ZipOutputStream::add_directory(StringView name, Optional<Core::DateTime> const& modification_time, Optional<mode_t> mode)
 {
     Archive::ZipMember member {};
     member.name = TRY(String::from_utf8(name));
@@ -205,6 +209,7 @@ ErrorOr<void> ZipOutputStream::add_directory(StringView name, Optional<Core::Dat
     member.uncompressed_size = 0;
     member.crc32 = 0;
     member.is_directory = true;
+    member.mode = mode;
 
     if (modification_time.has_value()) {
         member.modification_date = to_packed_dos_date(modification_time->year(), modification_time->month(), modification_time->day());
@@ -224,7 +229,8 @@ ErrorOr<void> ZipOutputStream::finish()
     for (ZipMember const& member : m_members) {
         auto zip_version = minimum_version_needed(member.compression_method);
         CentralDirectoryRecord central_directory_record {
-            .made_by_version = zip_version,
+            .supported_version = static_cast<u8>(zip_version),
+            .made_by = ZipMadeBy::Unix,
             .minimum_version = zip_version,
             .general_purpose_flags = { .flags = 0 },
             .compression_method = member.compression_method,
@@ -238,7 +244,8 @@ ErrorOr<void> ZipOutputStream::finish()
             .comment_length = 0,
             .start_disk = 0,
             .internal_attributes = 0,
-            .external_attributes = member.is_directory ? zip_directory_external_attribute : 0,
+            .msdos_attributes = static_cast<u16>(member.is_directory ? zip_directory_msdos_attribute : 0),
+            .external_attributes = static_cast<u16>(member.mode.has_value() ? member.mode.value() : 0),
             .local_file_header_offset = file_header_offset, // FIXME: we assume the wrapped output stream was never written to before us
             .name = reinterpret_cast<u8 const*>(member.name.bytes_as_string_view().characters_without_null_termination()),
             .extra_data = nullptr,

Userland/Libraries/LibArchive/Zip.h

@@ -33,6 +33,7 @@ static bool read_helper(ReadonlyBytes buffer, T* self)
 }
 
 // NOTE: Due to the format of zip files compression is streamed and decompression is random access.
+// Zip format specification: https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT
 
 static constexpr auto signature_length = 4;
 
@@ -109,10 +110,16 @@ union ZipGeneralPurposeFlags {
 };
 static_assert(sizeof(ZipGeneralPurposeFlags) == sizeof(u16));
 
+enum class ZipMadeBy : u8 {
+    MSDOS = 0,
+    Unix = 3,
+};
+
 struct [[gnu::packed]] CentralDirectoryRecord {
     static constexpr Array<u8, signature_length> signature = { 0x50, 0x4b, 0x01, 0x02 }; // 'PK\x01\x02'
 
-    u16 made_by_version;
+    u8 supported_version; // lower byte of version made by
+    ZipMadeBy made_by;    // upper byte of version made by
     u16 minimum_version;
     ZipGeneralPurposeFlags general_purpose_flags;
     ZipCompressionMethod compression_method;
@@ -126,7 +133,8 @@ struct [[gnu::packed]] CentralDirectoryRecord {
     u16 comment_length;
     u16 start_disk;
     u16 internal_attributes;
-    u32 external_attributes;
+    u16 msdos_attributes;    // lower bytes of external file attributes
+    u16 external_attributes; // upper bytes of external file attributes
     u32 local_file_header_offset;
     u8 const* name;
     u8 const* extra_data;
@@ -152,7 +160,8 @@ struct [[gnu::packed]] CentralDirectoryRecord {
         };
 
         TRY(stream.write_until_depleted(signature));
-        TRY(write_value(made_by_version));
+        TRY(write_value(supported_version));
+        TRY(write_value(made_by));
         TRY(write_value(minimum_version));
         TRY(write_value(general_purpose_flags.flags));
         TRY(write_value(compression_method));
@@ -166,6 +175,7 @@ struct [[gnu::packed]] CentralDirectoryRecord {
         TRY(write_value(comment_length));
         TRY(write_value(start_disk));
         TRY(write_value(internal_attributes));
+        TRY(write_value(msdos_attributes));
         TRY(write_value(external_attributes));
         TRY(write_value(local_file_header_offset));
         if (name_length > 0)
@@ -182,7 +192,7 @@ struct [[gnu::packed]] CentralDirectoryRecord {
         return signature.size() + (sizeof(CentralDirectoryRecord) - (sizeof(u8*) * 3)) + name_length + extra_data_length + comment_length;
     }
 };
-static constexpr u32 zip_directory_external_attribute = 1 << 4;
+static constexpr u16 zip_directory_msdos_attribute = 1 << 4;
 
 struct [[gnu::packed]] LocalFileHeader {
     static constexpr Array<u8, signature_length> signature = { 0x50, 0x4b, 0x03, 0x04 }; // 'PK\x03\x04'
@@ -250,6 +260,7 @@ struct ZipMember {
     bool is_directory;
     DOSPackedTime modification_time;
     DOSPackedDate modification_date;
+    Optional<mode_t> mode;
 };
 
 class Zip {
@@ -282,11 +293,11 @@ class ZipOutputStream {
     ZipOutputStream(NonnullOwnPtr<Stream>);
 
     ErrorOr<void> add_member(ZipMember const&);
-    ErrorOr<MemberInformation> add_member_from_stream(StringView, Stream&, Optional<Core::DateTime> const& = {});
+    ErrorOr<MemberInformation> add_member_from_stream(StringView, Stream&, Optional<Core::DateTime> const& = {}, Optional<mode_t> mode = {});
 
     // NOTE: This does not add any of the files within the directory,
     //       it just adds an entry for it.
-    ErrorOr<void> add_directory(StringView, Optional<Core::DateTime> const& = {});
+    ErrorOr<void> add_directory(StringView, Optional<Core::DateTime> const& = {}, Optional<mode_t> mode = {});
 
     ErrorOr<void> finish();
 

Userland/Utilities/unzip.cpp

@@ -32,6 +32,14 @@ static ErrorOr<void> adjust_modification_time(Archive::ZipMember const& zip_memb
     return Core::System::utime(zip_member.name, buf);
 }
 
+static ErrorOr<void> adjust_permissions(Archive::ZipMember const& zip_member)
+{
+    if (zip_member.mode.has_value())
+        return Core::System::chmod(zip_member.name, zip_member.mode.value() & 0777);
+
+    return {};
+}
+
 static bool unpack_zip_member(Archive::ZipMember zip_member, bool quiet)
 {
     if (zip_member.is_directory) {
@@ -90,6 +98,11 @@ static bool unpack_zip_member(Archive::ZipMember zip_member, bool quiet)
         return false;
     }
 
+    if (adjust_permissions(zip_member).is_error()) {
+        warnln("Failed setting permissions for file {}", zip_member.name);
+        return false;
+    }
+
     new_file->close();
 
     if (checksum.digest() != zip_member.crc32) {
@@ -197,6 +210,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
             warnln("Failed setting modification time for directory {}", directory.name);
             return 1;
         }
+
+        if (adjust_permissions(directory).is_error()) {
+            warnln("Failed setting permissions for directory {}", directory.name);
+            return 1;
+        }
     }
 
     return success ? 0 : 1;

Userland/Utilities/zip.cpp

@@ -56,7 +56,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
         auto stat = TRY(Core::System::fstat(file->fd()));
         auto date = Core::DateTime::from_timestamp(stat.st_mtim.tv_sec);
 
-        auto information = TRY(zip_stream.add_member_from_stream(canonicalized_path, *file, date));
+        auto information = TRY(zip_stream.add_member_from_stream(canonicalized_path, *file, date, stat.st_mode));
         if (information.compression_ratio < 1.f) {
             outln("  adding: {} (deflated {}%)", canonicalized_path, (int)(information.compression_ratio * 100));
         } else {
@@ -71,7 +71,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
 
         auto stat = TRY(Core::System::stat(path));
         auto date = Core::DateTime::from_timestamp(stat.st_mtim.tv_sec);
-        TRY(zip_stream.add_directory(canonicalized_path, date));
+        TRY(zip_stream.add_directory(canonicalized_path, date, stat.st_mode));
 
         if (!recurse)
             return {};