rubyzip 0.9.9 → 1.3.0

data/lib/zip/constants.rb

@@ -1,11 +1,63 @@
 module Zip
-  VERSION = '0.9.7'
-  RUBY_MINOR_VERSION = RUBY_VERSION.split(".")[1].to_i
   RUNNING_ON_WINDOWS = RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/i
 
-  # Ruby 1.7.x compatibility
-  # In ruby 1.6.x and 1.8.0 reading from an empty stream returns 
-  # an empty string the first time and then nil.
-  #  not so in 1.7.x
-  EMPTY_FILE_RETURNS_EMPTY_STRING_FIRST = RUBY_MINOR_VERSION != 7
+  CENTRAL_DIRECTORY_ENTRY_SIGNATURE = 0x02014b50
+  CDIR_ENTRY_STATIC_HEADER_LENGTH   = 46
+
+  LOCAL_ENTRY_SIGNATURE                  = 0x04034b50
+  LOCAL_ENTRY_STATIC_HEADER_LENGTH       = 30
+  LOCAL_ENTRY_TRAILING_DESCRIPTOR_LENGTH = 4 + 4 + 4
+  VERSION_MADE_BY                        = 52 # this library's version
+  VERSION_NEEDED_TO_EXTRACT              = 20
+  VERSION_NEEDED_TO_EXTRACT_ZIP64        = 45
+
+  FILE_TYPE_FILE    = 0o10
+  FILE_TYPE_DIR     = 0o04
+  FILE_TYPE_SYMLINK = 0o12
+
+  FSTYPE_FAT      = 0
+  FSTYPE_AMIGA    = 1
+  FSTYPE_VMS      = 2
+  FSTYPE_UNIX     = 3
+  FSTYPE_VM_CMS   = 4
+  FSTYPE_ATARI    = 5
+  FSTYPE_HPFS     = 6
+  FSTYPE_MAC      = 7
+  FSTYPE_Z_SYSTEM = 8
+  FSTYPE_CPM      = 9
+  FSTYPE_TOPS20   = 10
+  FSTYPE_NTFS     = 11
+  FSTYPE_QDOS     = 12
+  FSTYPE_ACORN    = 13
+  FSTYPE_VFAT     = 14
+  FSTYPE_MVS      = 15
+  FSTYPE_BEOS     = 16
+  FSTYPE_TANDEM   = 17
+  FSTYPE_THEOS    = 18
+  FSTYPE_MAC_OSX  = 19
+  FSTYPE_ATHEOS   = 30
+
+  FSTYPES = {
+    FSTYPE_FAT      => 'FAT'.freeze,
+    FSTYPE_AMIGA    => 'Amiga'.freeze,
+    FSTYPE_VMS      => 'VMS (Vax or Alpha AXP)'.freeze,
+    FSTYPE_UNIX     => 'Unix'.freeze,
+    FSTYPE_VM_CMS   => 'VM/CMS'.freeze,
+    FSTYPE_ATARI    => 'Atari ST'.freeze,
+    FSTYPE_HPFS     => 'OS/2 or NT HPFS'.freeze,
+    FSTYPE_MAC      => 'Macintosh'.freeze,
+    FSTYPE_Z_SYSTEM => 'Z-System'.freeze,
+    FSTYPE_CPM      => 'CP/M'.freeze,
+    FSTYPE_TOPS20   => 'TOPS-20'.freeze,
+    FSTYPE_NTFS     => 'NTFS'.freeze,
+    FSTYPE_QDOS     => 'SMS/QDOS'.freeze,
+    FSTYPE_ACORN    => 'Acorn RISC OS'.freeze,
+    FSTYPE_VFAT     => 'Win32 VFAT'.freeze,
+    FSTYPE_MVS      => 'MVS'.freeze,
+    FSTYPE_BEOS     => 'BeOS'.freeze,
+    FSTYPE_TANDEM   => 'Tandem NSK'.freeze,
+    FSTYPE_THEOS    => 'Theos'.freeze,
+    FSTYPE_MAC_OSX  => 'Mac OS/X (Darwin)'.freeze,
+    FSTYPE_ATHEOS   => 'AtheOS'.freeze
+  }.freeze
 end

data/lib/zip/crypto/encryption.rb

@@ -0,0 +1,11 @@
+module Zip
+  class Encrypter #:nodoc:all
+  end
+
+  class Decrypter
+  end
+end
+
+# Copyright (C) 2002, 2003 Thomas Sondergaard
+# rubyzip is free software; you can redistribute it and/or
+# modify it under the terms of the ruby license.

data/lib/zip/crypto/null_encryption.rb

@@ -0,0 +1,43 @@
+module Zip
+  module NullEncryption
+    def header_bytesize
+      0
+    end
+
+    def gp_flags
+      0
+    end
+  end
+
+  class NullEncrypter < Encrypter
+    include NullEncryption
+
+    def header(_mtime)
+      ''
+    end
+
+    def encrypt(data)
+      data
+    end
+
+    def data_descriptor(_crc32, _compressed_size, _uncomprssed_size)
+      ''
+    end
+
+    def reset!; end
+  end
+
+  class NullDecrypter < Decrypter
+    include NullEncryption
+
+    def decrypt(data)
+      data
+    end
+
+    def reset!(_header); end
+  end
+end
+
+# Copyright (C) 2002, 2003 Thomas Sondergaard
+# rubyzip is free software; you can redistribute it and/or
+# modify it under the terms of the ruby license.

data/lib/zip/crypto/traditional_encryption.rb

@@ -0,0 +1,99 @@
+module Zip
+  module TraditionalEncryption
+    def initialize(password)
+      @password = password
+      reset_keys!
+    end
+
+    def header_bytesize
+      12
+    end
+
+    def gp_flags
+      0x0001 | 0x0008
+    end
+
+    protected
+
+    def reset_keys!
+      @key0 = 0x12345678
+      @key1 = 0x23456789
+      @key2 = 0x34567890
+      @password.each_byte do |byte|
+        update_keys(byte.chr)
+      end
+    end
+
+    def update_keys(n)
+      @key0 = ~Zlib.crc32(n, ~@key0)
+      @key1 = ((@key1 + (@key0 & 0xff)) * 134_775_813 + 1) & 0xffffffff
+      @key2 = ~Zlib.crc32((@key1 >> 24).chr, ~@key2)
+    end
+
+    def decrypt_byte
+      temp = (@key2 & 0xffff) | 2
+      ((temp * (temp ^ 1)) >> 8) & 0xff
+    end
+  end
+
+  class TraditionalEncrypter < Encrypter
+    include TraditionalEncryption
+
+    def header(mtime)
+      [].tap do |header|
+        (header_bytesize - 2).times do
+          header << Random.rand(0..255)
+        end
+        header << (mtime.to_binary_dos_time & 0xff)
+        header << (mtime.to_binary_dos_time >> 8)
+      end.map { |x| encode x }.pack('C*')
+    end
+
+    def encrypt(data)
+      data.unpack('C*').map { |x| encode x }.pack('C*')
+    end
+
+    def data_descriptor(crc32, compressed_size, uncomprssed_size)
+      [0x08074b50, crc32, compressed_size, uncomprssed_size].pack('VVVV')
+    end
+
+    def reset!
+      reset_keys!
+    end
+
+    private
+
+    def encode(n)
+      t = decrypt_byte
+      update_keys(n.chr)
+      t ^ n
+    end
+  end
+
+  class TraditionalDecrypter < Decrypter
+    include TraditionalEncryption
+
+    def decrypt(data)
+      data.unpack('C*').map { |x| decode x }.pack('C*')
+    end
+
+    def reset!(header)
+      reset_keys!
+      header.each_byte do |x|
+        decode x
+      end
+    end
+
+    private
+
+    def decode(n)
+      n ^= decrypt_byte
+      update_keys(n.chr)
+      n
+    end
+  end
+end
+
+# Copyright (C) 2002, 2003 Thomas Sondergaard
+# rubyzip is free software; you can redistribute it and/or
+# modify it under the terms of the ruby license.

data/lib/zip/decompressor.rb

@@ -1,9 +1,9 @@
 module Zip
-  class Decompressor  #:nodoc:all
-    CHUNK_SIZE=32768
-    def initialize(inputStream)
+  class Decompressor #:nodoc:all
+    CHUNK_SIZE = 32_768
+    def initialize(input_stream)
       super()
-      @inputStream=inputStream
+      @input_stream = input_stream
     end
   end
 end

data/lib/zip/deflater.rb

@@ -1,24 +1,28 @@
 module Zip
   class Deflater < Compressor #:nodoc:all
-    def initialize(outputStream, level = Zlib::DEFAULT_COMPRESSION)
+    def initialize(output_stream, level = Zip.default_compression, encrypter = NullEncrypter.new)
       super()
-      @outputStream = outputStream
-      @zlibDeflater = Zlib::Deflate.new(level, -Zlib::MAX_WBITS)
-      @size = 0
-      @crc = Zlib::crc32
+      @output_stream = output_stream
+      @zlib_deflater = ::Zlib::Deflate.new(level, -::Zlib::MAX_WBITS)
+      @size          = 0
+      @crc           = ::Zlib.crc32
+      @encrypter     = encrypter
     end
-    
-    def << (data)
-      val = data.to_s
-      @crc = Zlib::crc32(val, @crc)
+
+    def <<(data)
+      val   = data.to_s
+      @crc  = Zlib.crc32(val, @crc)
       @size += val.bytesize
-      @outputStream << @zlibDeflater.deflate(data)
+      buffer = @zlib_deflater.deflate(data)
+      if buffer.empty?
+        @output_stream
+      else
+        @output_stream << @encrypter.encrypt(buffer)
+      end
     end
 
     def finish
-      until @zlibDeflater.finished?
-        @outputStream << @zlibDeflater.finish
-      end
+      @output_stream << @encrypter.encrypt(@zlib_deflater.finish) until @zlib_deflater.finished?
     end
 
     attr_reader :size, :crc

data/lib/zip/dos_time.rb

@@ -1,7 +1,6 @@
 module Zip
   class DOSTime < Time #:nodoc:all
-
-    #MS-DOS File Date and Time format as used in Interrupt 21H Function 57H:
+    # MS-DOS File Date and Time format as used in Interrupt 21H Function 57H:
 
     # Register CX, the Time:
     # Bits 0-4  2 second increments (0-29)
@@ -14,31 +13,31 @@ module Zip
     # bits 9-15 year (four digit year minus 1980)
 
     def to_binary_dos_time
-      (sec/2) +
-      (min  << 5) +
-      (hour << 11)
+      (sec / 2) +
+        (min << 5) +
+        (hour << 11)
     end
 
     def to_binary_dos_date
-      (day) +
-      (month << 5) +
-      ((year - 1980) << 9)
+      day +
+        (month << 5) +
+        ((year - 1980) << 9)
     end
 
     # Dos time is only stored with two seconds accuracy
     def dos_equals(other)
-      to_i/2 == other.to_i/2
+      to_i / 2 == other.to_i / 2
     end
 
     def self.parse_binary_dos_format(binaryDosDate, binaryDosTime)
-      second = 2 * (       0b11111 & binaryDosTime)
-      minute = (     0b11111100000 & binaryDosTime) >> 5 
+      second = 2 * (0b11111 & binaryDosTime)
+      minute = (0b11111100000 & binaryDosTime) >> 5
       hour   = (0b1111100000000000 & binaryDosTime) >> 11
-      day    = (           0b11111 & binaryDosDate) 
-      month  = (       0b111100000 & binaryDosDate) >> 5
+      day    = (0b11111 & binaryDosDate)
+      month  = (0b111100000 & binaryDosDate) >> 5
       year   = ((0b1111111000000000 & binaryDosDate) >> 9) + 1980
       begin
-        return self.local(year, month, day, hour, minute, second)
+        local(year, month, day, hour, minute, second)
       end
     end
   end