librex 0.0.68 → 0.0.70

data/lib/rex/zip.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # -*- coding: binary -*-
 #
 # Zip library

data/lib/rex/zip/archive.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id: archive.rb 15549 2012-06-29 06:09:05Z rapid7 $
-##
 
 module Rex
 module Zip
@@ -11,97 +8,121 @@ module Zip
 #
 class Archive
 
-	# An array of the Entry objects stored in this Archive.
-	attr_reader :entries
-
-
-	def initialize(compmeth=CM_DEFLATE)
-		@compmeth = compmeth
-		@entries = []
-	end
-
-
-	#
-	# Create a new Entry and add it to the archive.
-	#
-	def add_file(fname, fdata=nil, xtra=nil, comment=nil)
-		if (not fdata)
-			begin
-				st = File.stat(fname)
-			rescue
-				return nil
-			end
-
-			ts = st.mtime
-			if (st.directory?)
-				attrs = EFA_ISDIR
-				fname += '/'
-			else
-				f = File.open(fname, 'rb')
-				fdata = f.read(f.stat.size)
-				f.close
-			end
-		end
-
-		@entries << Entry.new(fname, fdata, @compmeth, ts, attrs, xtra, comment)
-	end
-
-
-	def set_comment(comment)
-		@comment = comment
-	end
-
-
-	#
-	# Write the compressed file to +fname+.
-	#
-	def save_to(fname)
-		f = File.open(fname, 'wb')
-		f.write(pack)
-		f.close
-	end
-
-
-	#
-	# Compress this archive and return the resulting zip file as a String.
-	#
-	def pack
-		ret = ''
-
-		# save the offests
-		offsets = []
-
-		# file 1 .. file n
-		@entries.each { |ent|
-			offsets << ret.length
-			ret << ent.pack
-		}
-
-		# archive decryption header (unsupported)
-		# archive extra data record (unsupported)
-
-		# central directory
-		cfd_offset = ret.length
-		idx = 0
-		@entries.each { |ent|
-			cfd = CentralDir.new(ent, offsets[idx])
-			ret << cfd.pack
-			idx += 1
-		}
-
-		# zip64 end of central dir record (unsupported)
-		# zip64 end of central dir locator (unsupported)
-
-		# end of central directory record
-		cur_offset = ret.length - cfd_offset
-		ret << CentralDirEnd.new(@entries.length, cur_offset, cfd_offset, @comment).pack
-
-		ret
-	end
-
-	def inspect
-		"#<#{self.class} entries = [#{@entries.map{|e| e.name}.join(",")}]>"
-	end
+  # An array of the Entry objects stored in this Archive.
+  attr_reader :entries
+
+
+  def initialize(compmeth=CM_DEFLATE)
+    @compmeth = compmeth
+    @entries = []
+  end
+
+  #
+  # Recursively adds a directory of files into the archive.
+  #
+  def add_r(dir)
+    path = File.dirname(dir)
+    Dir[File.join(dir, "**", "**")].each do |file|
+      relative = file.sub(/^#{path.chomp('/')}\//, '')
+      if File.directory?(file)
+        @entries << Entry.new(relative.chomp('/') + '/', '', @compmeth, nil, EFA_ISDIR, nil, nil)
+      else
+        contents = File.read(file, :mode => 'rb')
+        @entries << Entry.new(relative, contents, @compmeth, nil, nil, nil, nil)
+      end
+    end
+  end
+
+  #
+  # Create a new Entry and add it to the archive.
+  #
+  # If fdata is set, the file is populated with that data
+  # from the calling method. If fdata is nil, then the
+  # fs is checked for the file. If central_dir_name is set
+  # it will be used to spoof the name at the Central Directory
+  # at packing time.
+  #
+  def add_file(fname, fdata=nil, xtra=nil, comment=nil, central_dir_name=nil)
+    if (not fdata)
+      begin
+        st = File.stat(fname)
+      rescue
+        return nil
+      end
+
+      ts = st.mtime
+      if (st.directory?)
+        attrs = EFA_ISDIR
+        fdata = ''
+        unless fname[-1,1] == '/'
+          fname += '/'
+        end
+      else
+        f = File.open(fname, 'rb')
+        fdata = f.read(f.stat.size)
+        f.close
+      end
+    end
+
+    @entries << Entry.new(fname, fdata, @compmeth, ts, attrs, xtra, comment, central_dir_name)
+  end
+
+
+  def set_comment(comment)
+    @comment = comment
+  end
+
+
+  #
+  # Write the compressed file to +fname+.
+  #
+  def save_to(fname)
+    f = File.open(fname, 'wb')
+    f.write(pack)
+    f.close
+  end
+
+
+  #
+  # Compress this archive and return the resulting zip file as a String.
+  #
+  def pack
+    ret = ''
+
+    # save the offests
+    offsets = []
+
+    # file 1 .. file n
+    @entries.each { |ent|
+      offsets << ret.length
+      ret << ent.pack
+    }
+
+    # archive decryption header (unsupported)
+    # archive extra data record (unsupported)
+
+    # central directory
+    cfd_offset = ret.length
+    idx = 0
+    @entries.each { |ent|
+      cfd = CentralDir.new(ent, offsets[idx])
+      ret << cfd.pack
+      idx += 1
+    }
+
+    # zip64 end of central dir record (unsupported)
+    # zip64 end of central dir locator (unsupported)
+
+    # end of central directory record
+    cur_offset = ret.length - cfd_offset
+    ret << CentralDirEnd.new(@entries.length, cur_offset, cfd_offset, @comment).pack
+
+    ret
+  end
+
+  def inspect
+    "#<#{self.class} entries = [#{@entries.map{|e| e.name}.join(",")}]>"
+  end
 
 end
 

data/lib/rex/zip/blocks.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id: blocks.rb 15548 2012-06-29 06:08:20Z rapid7 $
-##
 
 module Rex
 module Zip
@@ -16,13 +13,13 @@ module Zip
 #
 class CompInfo
 
-	def initialize(crc, compsz, uncompsz)
-		@crc, @compsz, @uncompsz = crc, compsz, uncompsz
-	end
+  def initialize(crc, compsz, uncompsz)
+    @crc, @compsz, @uncompsz = crc, compsz, uncompsz
+  end
 
-	def pack
-		[ @crc, @compsz, @uncompsz ].pack('VVV')
-	end
+  def pack
+    [ @crc, @compsz, @uncompsz ].pack('VVV')
+  end
 
 end
 
@@ -37,18 +34,18 @@ end
 #
 class CompFlags
 
-	attr_accessor :compmeth
+  attr_accessor :compmeth
 
-	def initialize(gpbf, compmeth, timestamp)
-		@gpbf = gpbf
-		@compmeth = compmeth
-		@mod_time = ((timestamp.hour << 11) | (timestamp.min << 5) | (timestamp.sec))
-		@mod_date = (((timestamp.year - 1980) << 9) | (timestamp.mon << 5) | (timestamp.day))
-	end
+  def initialize(gpbf, compmeth, timestamp)
+    @gpbf = gpbf
+    @compmeth = compmeth
+    @mod_time = ((timestamp.hour << 11) | (timestamp.min << 5) | (timestamp.sec))
+    @mod_date = (((timestamp.year - 1980) << 9) | (timestamp.mon << 5) | (timestamp.day))
+  end
 
-	def pack
-		[ @gpbf, @compmeth, @mod_time, @mod_date ].pack('vvvv')
-	end
+  def pack
+    [ @gpbf, @compmeth, @mod_time, @mod_date ].pack('vvvv')
+  end
 
 end
 
@@ -60,17 +57,17 @@ end
 #
 class DataDesc
 
-	SIGNATURE = 0x8074b50
+  SIGNATURE = 0x8074b50
 
-	def initialize(compinfo)
-		@compinfo = compinfo
-	end
+  def initialize(compinfo)
+    @compinfo = compinfo
+  end
 
-	def pack
-		ret = [ SIGNATURE ].pack('V')
-		ret << @compinfo.pack
-		ret
-	end
+  def pack
+    ret = [ SIGNATURE ].pack('V')
+    ret << @compinfo.pack
+    ret
+  end
 
 end
 
@@ -81,23 +78,23 @@ end
 #
 class LocalFileHdr
 
-	SIGNATURE = 0x4034b50
+  SIGNATURE = 0x4034b50
 
-	def initialize(entry)
-		@entry = entry
-	end
+  def initialize(entry)
+    @entry = entry
+  end
 
-	def pack
-		path = @entry.relative_path
+  def pack
+    path = @entry.relative_path
 
-		ret = [ SIGNATURE, ZIP_VERSION ].pack('Vv')
-		ret << @entry.flags.pack
-		ret << @entry.info.pack
-		ret << [ path.length, @entry.xtra.length ].pack('vv')
-		ret << path
-		ret << @entry.xtra
-		ret
-	end
+    ret = [ SIGNATURE, ZIP_VERSION ].pack('Vv')
+    ret << @entry.flags.pack
+    ret << @entry.info.pack
+    ret << [ path.length, @entry.xtra.length ].pack('vv')
+    ret << path
+    ret << @entry.xtra
+    ret
+  end
 
 end
 
@@ -108,38 +105,42 @@ end
 #
 class CentralDir
 
-	SIGNATURE = 0x2014b50
-
-	def initialize(entry, offset)
-		@entry = entry
-		@disknum_start = 0
-		@attr_int = 0
-		@attr_ext = 0x20
-		@hdr_offset = offset
-	end
-
-	def pack
-		path = @entry.relative_path
-
-		ret = [ SIGNATURE, ZIP_VERSION ].pack('Vv')
-		ret << [ ZIP_VERSION ].pack('v')
-		ret << @entry.flags.pack
-		ret << @entry.info.pack
-		arr = []
-		arr << path.length
-		arr << @entry.xtra.length
-		arr << @entry.comment.length
-		arr << @disknum_start
-		arr << @attr_int
-		arr << @entry.attrs
-		arr << @hdr_offset
-		ret << arr.pack('vvvvvVV')
-		ret << path
-		ret << @entry.xtra
-		ret << @entry.comment
-		# digital signature not supported
-		ret
-	end
+  SIGNATURE = 0x2014b50
+
+  def initialize(entry, offset)
+    @entry = entry
+    @disknum_start = 0
+    @attr_int = 0
+    @attr_ext = 0x20
+    @hdr_offset = offset
+  end
+
+  def pack
+    if @entry.central_dir_name.blank?
+      path = @entry.relative_path
+    else
+      path = @entry.central_dir_path
+    end
+
+    ret = [ SIGNATURE, ZIP_VERSION ].pack('Vv')
+    ret << [ ZIP_VERSION ].pack('v')
+    ret << @entry.flags.pack
+    ret << @entry.info.pack
+    arr = []
+    arr << path.length
+    arr << @entry.xtra.length
+    arr << @entry.comment.length
+    arr << @disknum_start
+    arr << @attr_int
+    arr << @entry.attrs
+    arr << @hdr_offset
+    ret << arr.pack('vvvvvVV')
+    ret << path
+    ret << @entry.xtra
+    ret << @entry.comment
+    # digital signature not supported
+    ret
+  end
 
 end
 
@@ -150,32 +151,32 @@ end
 #
 class CentralDirEnd
 
-	SIGNATURE = 0x6054b50
-
-	def initialize(ncfd, cfdsz, offset, comment=nil)
-		@disk_no = 0
-		@disk_dir_start = 0
-		@ncfd_this_disk = ncfd
-		@ncfd_total = ncfd
-		@cfd_size = cfdsz
-		@start_offset = offset
-		@comment = comment
-		@comment ||= ''
-	end
-
-
-	def pack
-		arr = []
-		arr << SIGNATURE
-		arr << @disk_no
-		arr << @disk_dir_start
-		arr << @ncfd_this_disk
-		arr << @ncfd_total
-		arr << @cfd_size
-		arr << @start_offset
-		arr << @comment.length
-		(arr.pack('VvvvvVVv') + @comment)
-	end
+  SIGNATURE = 0x6054b50
+
+  def initialize(ncfd, cfdsz, offset, comment=nil)
+    @disk_no = 0
+    @disk_dir_start = 0
+    @ncfd_this_disk = ncfd
+    @ncfd_total = ncfd
+    @cfd_size = cfdsz
+    @start_offset = offset
+    @comment = comment
+    @comment ||= ''
+  end
+
+
+  def pack
+    arr = []
+    arr << SIGNATURE
+    arr << @disk_no
+    arr << @disk_dir_start
+    arr << @ncfd_this_disk
+    arr << @ncfd_total
+    arr << @cfd_size
+    arr << @start_offset
+    arr << @comment.length
+    (arr.pack('VvvvvVVv') + @comment)
+  end
 
 end