librex 0.0.65 → 0.0.66

data/lib/rex/ui/text/input/readline.rb

@@ -1,10 +1,11 @@
+# -*- coding: binary -*-
 require 'rex/ui'
 
 module Rex
 module Ui
 module Text
 
-begin 
+begin
 
 	###
 	#
@@ -13,21 +14,21 @@ begin
 	#
 	###
 	class Input::Readline < Rex::Ui::Text::Input
-		
+
 		#
 		# Initializes the readline-aware Input instance for text.
 		#
 		def initialize(tab_complete_proc = nil)
 			if(not Object.const_defined?('Readline'))
-				begin 
+				begin
 					require 'readline'
 				rescue ::LoadError
 					require 'readline_compatible'
 				end
 			end
-			
+
 			self.extend(::Readline)
-			
+
 			if (tab_complete_proc)
 				::Readline.basic_word_break_characters = "\x00"
 				::Readline.completion_proc = tab_complete_proc
@@ -42,14 +43,14 @@ begin
 			::Readline.basic_word_break_characters = "\x00"
 			::Readline.completion_proc = tab_complete_proc || @rl_saved_proc
 		end
-		
+
 		#
 		# Whether or not the input medium supports readline.
 		#
 		def supports_readline
 			true
 		end
-		
+
 		#
 		# Calls sysread on the standard input handle.
 		#
@@ -60,7 +61,7 @@ begin
 				retry
 			end
 		end
-		
+
 		#
 		# Read a line from stdin
 		#
@@ -78,10 +79,10 @@ begin
 		# background jobs, such as when the user is running Karmetasploit
 		#
 		def pgets()
-		
+
 			line = nil
 			orig = Thread.current.priority
-			
+
 			begin
 				Thread.current.priority = -20
 
@@ -91,7 +92,7 @@ begin
 			ensure
 				Thread.current.priority = orig || 0
 			end
-			
+
 			line
 		end
 
@@ -101,9 +102,9 @@ begin
 		def fd
 			$stdin
 		end
-		
+
 		#
-		# Indicates that this input medium as a shell builtin, no need 
+		# Indicates that this input medium as a shell builtin, no need
 		# to extend.
 		#
 		def intrinsic_shell?

data/lib/rex/ui/text/input/socket.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/ui'
 
 module Rex

data/lib/rex/ui/text/input/stdio.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/ui'
 
 module Rex
@@ -42,4 +43,4 @@ end
 
 end
 end
-end
+end

data/lib/rex/ui/text/irb_shell.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Ui
 module Text

data/lib/rex/ui/text/output.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/ui'
 
 module Rex

data/lib/rex/ui/text/output/buffer.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/ui'
 
 module Rex

data/lib/rex/ui/text/output/file.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/ui'
 
 module Rex

data/lib/rex/ui/text/output/socket.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/ui'
 
 module Rex

data/lib/rex/ui/text/output/stdio.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/ui'
 
 begin

data/lib/rex/ui/text/output/tee.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/ui'
 
 module Rex

data/lib/rex/ui/text/progress_tracker.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/ui/progress_tracker'
 
 module Rex
@@ -53,4 +54,4 @@ end
 
 end
 end
-end
+end

data/lib/rex/ui/text/progress_tracker.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -31,4 +32,4 @@ class Rex::Ui::Text::ProgressTracker::UnitTest < Test::Unit::TestCase
 		assert_equal("[-] fatal: bad\n", pt.abort("bad"))
 	end
 
-end
+end

data/lib/rex/ui/text/shell.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/ui'
 
 module Rex

data/lib/rex/ui/text/table.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/ui'
 require 'rex/socket'
 
@@ -7,7 +8,7 @@ module Text
 
 ###
 #
-# Prints text in a tablized format.  Pretty lame at the moment, but 
+# Prints text in a tablized format.  Pretty lame at the moment, but
 # whatever.
 #
 ###
@@ -17,7 +18,7 @@ class Table
 	# Initializes a text table instance using the supplied properties.  The
 	# Table class supports the following hash attributes:
 	#
-	# Header 
+	# Header
 	#
 	#	The string to display as a heading above the table.  If none is
 	#	specified, no header will be displayed.
@@ -68,6 +69,8 @@ class Table
 		self.postfix  = opts['Postfix'] || ''
 		self.colprops = []
 
+		self.sort_index  = opts['SortIndex'] || 0
+
 		# Default column properties
 		self.columns.length.times { |idx|
 			self.colprops[idx] = {}
@@ -93,14 +96,14 @@ class Table
 
 	#
 	# Converts table contents to a string.
-	# 
+	#
 	def to_s
 		str  = prefix.dup
 		str << header_to_s || ''
 		str << columns_to_s || ''
 		str << hr_to_s || ''
 
-		sort_rows(0)
+		sort_rows
 		rows.each { |row|
 			if (is_hr(row))
 				str << hr_to_s
@@ -113,7 +116,7 @@ class Table
 
 		return str
 	end
-	
+
 	#
 	# Converts table contents to a csv
 	#
@@ -122,7 +125,7 @@ class Table
 		str << ( columns.join(",") + "\n" )
 		rows.each { |row|
 			next if is_hr(row)
-			str << ( row.map{|x| 
+			str << ( row.map{|x|
 				x = x.to_s
 
 				x.gsub(/[\r\n]/, ' ').gsub(/\s+/, ' ').gsub('"', '""')
@@ -172,23 +175,25 @@ class Table
 			end
 		}
 
-		rows << fields	
+		rows << fields
 	end
 
 	#
 	# Sorts the rows based on the supplied index of sub-arrays
 	# If the supplied index is an IPv4 address, handle it differently, but
 	# avoid actually resolving domain names.
-	#	
-	def sort_rows(index=0)
+	#
+	def sort_rows(index=sort_index)
 		return unless rows
-		rows.sort! do |a,b| 
-			if a[index].nil? 
+		rows.sort! do |a,b|
+			if a[index].nil?
 				-1
 			elsif b[index].nil?
-				1 
+				1
 			elsif Rex::Socket.dotted_ip?(a[index]) and Rex::Socket.dotted_ip?(b[index])
 				Rex::Socket::addr_atoi(a[index]) <=> Rex::Socket::addr_atoi(b[index])
+			elsif a[index] =~ /^[0-9]+$/ and b[index] =~ /^[0-9]+$/
+				a[index].to_i <=> b[index].to_i
 			else
 				a[index] <=> b[index] # assumes otherwise comparable.
 			end
@@ -208,6 +213,7 @@ class Table
 	attr_accessor :columns, :rows, :colprops # :nodoc:
 	attr_accessor :width, :indent, :cellpad # :nodoc:
 	attr_accessor :prefix, :postfix # :nodoc:
+	attr_accessor :sort_index # :nodoc:
 
 protected
 
@@ -246,7 +252,7 @@ protected
 			end
 			nameline << col
 			barline << ('-' * col.length)
-				
+
 			last_col = col
 			last_idx = idx
 		}
@@ -296,7 +302,7 @@ protected
 		return val
 	end
 
-	
+
 end
 
 end

data/lib/rex/ui/text/table.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -9,7 +10,7 @@ class Rex::Ui::Text::Table::UnitTest < Test::Unit::TestCase
 
 	def new_table(opts = {})
 		if (opts['Columns'] == nil)
-			opts['Columns'] = 
+			opts['Columns'] =
 				[
 					'col1',
 					'col2',
@@ -52,4 +53,4 @@ End
 		assert_equal(tbl.to_s, dstr)
 	end
 
-end
+end

data/lib/rex/zip.rb

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

data/lib/rex/zip/archive.rb

@@ -1,5 +1,6 @@
+# -*- coding: binary -*-
 ##
-# $Id: archive.rb 12718 2011-05-25 16:45:20Z egypt $
+# $Id: archive.rb 15549 2012-06-29 06:09:05Z rapid7 $
 ##
 
 module Rex

data/lib/rex/zip/blocks.rb

@@ -1,5 +1,6 @@
+# -*- coding: binary -*-
 ##
-# $Id: blocks.rb 8439 2010-02-10 17:27:40Z jduck $
+# $Id: blocks.rb 15548 2012-06-29 06:08:20Z rapid7 $
 ##
 
 module Rex
@@ -179,4 +180,4 @@ class CentralDirEnd
 end
 
 end
-end
+end

data/lib/rex/zip/entry.rb

@@ -1,5 +1,6 @@
+# -*- coding: binary -*-
 ##
-# $Id: entry.rb 12718 2011-05-25 16:45:20Z egypt $
+# $Id: entry.rb 15548 2012-06-29 06:08:20Z rapid7 $
 ##
 
 module Rex
@@ -14,8 +15,8 @@ class Entry
 	attr_reader :data
 
 	def initialize(fname, data, compmeth, timestamp=nil, attrs=nil, xtra=nil, comment=nil)
-		@name = fname
-		@data = data
+		@name = fname.unpack("C*").pack("C*")
+		@data = data.unpack("C*").pack("C*")
 		@xtra = xtra
 		@xtra ||= ''
 		@comment = comment
@@ -37,7 +38,7 @@ class Entry
 	end
 
 	def data=(val)
-		@data = val
+		@data = val.unpack("C*").pack("C*")
 		compress
 	end
 
@@ -84,11 +85,9 @@ class Entry
 	# Return the compressed data in a format suitable for adding to an Archive
 	#
 	def pack
-		ret = ''
-
 		#  - lfh 1
 		lfh = LocalFileHdr.new(self)
-		ret << lfh.pack
+		ret = lfh.pack
 
 		#  - data 1
 		if (@compdata)

data/lib/rex/zip/jar.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 
 require 'rex/zip/archive'
 
@@ -8,7 +9,7 @@ module Zip
 # A Jar is a zip archive containing Java class files and a MANIFEST.MF listing
 # those classes.  Several variations exist based on the same idea of class
 # files inside a zip, most notably:
-# - WAR files store XML files, Java classes, JSPs and other stuff for 
+# - WAR files store XML files, Java classes, JSPs and other stuff for
 #   servlet-based webservers (e.g.: Tomcat and Glassfish)
 # - APK files are Android Package files
 #
@@ -42,7 +43,7 @@ class Jar < Archive
 		@manifest << "\r\n"
 		@entries.each { |e|
 			next if e.name =~ %r|/$|
-			if e.name == "META-INF/MANIFEST.MF" 
+			if e.name == "META-INF/MANIFEST.MF"
 				existing_manifest = e
 				next
 			end
@@ -189,7 +190,7 @@ class Jar < Archive
 			end
 		end
 
-		# Now overwrite with the new manifest 
+		# Now overwrite with the new manifest
 		m.data = new_manifest
 
 		flags = 0

data/lib/rex/zip/samples/comment.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 #
 # Create a zip file with comments!

data/lib/rex/zip/samples/mkwar.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 #
 # Create a WAR archive!

data/lib/rex/zip/samples/mkzip.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 #
 # Add a file from memory and save it.