rubyzip 1.0.0 → 2.4.1

data/lib/zip/crypto/decrypted_io.rb

@@ -0,0 +1,40 @@
+module Zip
+  class DecryptedIo #:nodoc:all
+    CHUNK_SIZE = 32_768
+
+    def initialize(io, decrypter)
+      @io = io
+      @decrypter = decrypter
+    end
+
+    def read(length = nil, outbuf = +'')
+      return (length.nil? || length.zero? ? '' : nil) if eof
+
+      while length.nil? || (buffer.bytesize < length)
+        break if input_finished?
+
+        buffer << produce_input
+      end
+
+      outbuf.replace(buffer.slice!(0...(length || output_buffer.bytesize)))
+    end
+
+    private
+
+    def eof
+      buffer.empty? && input_finished?
+    end
+
+    def buffer
+      @buffer ||= +''
+    end
+
+    def input_finished?
+      @io.eof
+    end
+
+    def produce_input
+      @decrypter.decrypt(@io.read(CHUNK_SIZE))
+    end
+  end
+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(num)
+      @key0 = ~Zlib.crc32(num, ~@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(num)
+      t = decrypt_byte
+      update_keys(num.chr)
+      t ^ num
+    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(num)
+      num ^= decrypt_byte
+      update_keys(num.chr)
+      num
+    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,27 @@
 module Zip
-  class Decompressor  #:nodoc:all
-    CHUNK_SIZE = 32768
-    def initialize(input_stream)
+  class Decompressor #:nodoc:all
+    CHUNK_SIZE = 32_768
+
+    def self.decompressor_classes
+      @decompressor_classes ||= {}
+    end
+
+    def self.register(compression_method, decompressor_class)
+      decompressor_classes[compression_method] = decompressor_class
+    end
+
+    def self.find_by_compression_method(compression_method)
+      decompressor_classes[compression_method]
+    end
+
+    attr_reader :input_stream
+    attr_reader :decompressed_size
+
+    def initialize(input_stream, decompressed_size = nil)
       super()
-      @input_stream=input_stream
+
+      @input_stream = input_stream
+      @decompressed_size = decompressed_size
     end
   end
 end

data/lib/zip/deflater.rb

@@ -1,23 +1,28 @@
 module Zip
   class Deflater < Compressor #:nodoc:all
-
-    def initialize(output_stream, level = ::Zlib::DEFAULT_COMPRESSION)
+    def initialize(output_stream, level = Zip.default_compression, encrypter = NullEncrypter.new)
       super()
       @output_stream = output_stream
       @zlib_deflater = ::Zlib::Deflate.new(level, -::Zlib::MAX_WBITS)
       @size          = 0
       @crc           = ::Zlib.crc32
+      @encrypter     = encrypter
     end
 
-    def << (data)
+    def <<(data)
       val   = data.to_s
-      @crc  = Zlib::crc32(val, @crc)
+      @crc  = Zlib.crc32(val, @crc)
       @size += val.bytesize
-      @output_stream << @zlib_deflater.deflate(data)
+      buffer = @zlib_deflater.deflate(data)
+      if buffer.empty?
+        @output_stream
+      else
+        @output_stream << @encrypter.encrypt(buffer)
+      end
     end
 
     def finish
-      @output_stream << @zlib_deflater.finish until @zlib_deflater.finished?
+      @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,32 +13,44 @@ module Zip
     # bits 9-15 year (four digit year minus 1980)
 
     def to_binary_dos_time
-      (sec/2) +
+      (sec / 2) +
         (min << 5) +
         (hour << 11)
     end
 
     def to_binary_dos_date
-      (day) +
+      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
+      Zip.warn_about_v3_api('DOSTime#dos_equals')
+
+      self == other
+    end
+
+    # Dos time is only stored with two seconds accuracy.
+    def <=>(other)
+      return unless other.kind_of?(Time)
+
+      (to_i / 2) <=> (other.to_i / 2)
+    end
+
+    # Create a DOSTime instance from a vanilla Time instance.
+    def self.from_time(time)
+      local(time.year, time.month, time.day, time.hour, time.min, time.sec)
     end
 
-    def self.parse_binary_dos_format(binaryDosDate, binaryDosTime)
-      second = 2 * (0b11111 & binaryDosTime)
-      minute = (0b11111100000 & binaryDosTime) >> 5
-      hour   = (0b1111100000000000 & binaryDosTime) >> 11
-      day    = (0b11111 & binaryDosDate)
-      month  = (0b111100000 & binaryDosDate) >> 5
-      year   = ((0b1111111000000000 & binaryDosDate) >> 9) + 1980
-      begin
-        self.local(year, month, day, hour, minute, second)
-      end
+    def self.parse_binary_dos_format(bin_dos_date, bin_dos_time)
+      second = 2 * (0b11111 & bin_dos_time)
+      minute = (0b11111100000 & bin_dos_time) >> 5
+      hour   = (0b1111100000000000 & bin_dos_time) >> 11
+      day    = (0b11111 & bin_dos_date)
+      month  = (0b111100000 & bin_dos_date) >> 5
+      year   = ((0b1111111000000000 & bin_dos_date) >> 9) + 1980
+
+      local(year, month, day, hour, minute, second)
     end
   end
 end