librex 0.0.68 → 0.0.70

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTE3MDlmNTgwOWY2ZjUyYjVlZTY4Y2I2ZjM2YTQ0OTAwNjIwNWYyMQ==
+  data.tar.gz: !binary |-
+    YmQyNDM3OTQzNjY5OGE5ZGY1MTIxNGIwZDE4NTU3MGRmYmM3NDg0OA==
+SHA512:
+  metadata.gz: !binary |-
+    ODk4OTk1ODQwODRiZTMyMDRhZjAyM2U5MWNhNzdjNDBjM2M4OTBhNjM5MDJm
+    YjhkZDAxNTAzZmZlOTg3OTA1YmNkOGQwYjAxMzE4MGZiOWZkZTQ0ZTY4YTBm
+    OWFjOWZmZTA4NWJmNjlmMzE1OWY2OTE0NDEwOWI5YTU1MTJhMWI=
+  data.tar.gz: !binary |-
+    ZWRkMmZkMjJlZDkxMDgxZGMzYThlZjVhNmFlZWI2N2Q1YWYwNzNlYjBhOTFl
+    YzQ4MjNlYjQwZDk1NmVhYjQxNTcxOGE1NDMwYzM2YmRiN2VjNjVjZGFjMTMy
+    MDRhOTFiNzUyNmRmM2ZiZTcyMzEzMThjMWM3MWFjODQ1ZDM4NzM=

data/README.markdown

@@ -4,7 +4,7 @@ An re-packaging of the Rex library included in the Metasploit Framework for use
 made official by the Rapid7 development team. The upstream of this package is the rex subdirectory of https://github.com/rapid7/metasploit-framework
 
 Currently based on:
-SVN Revision: 15602
+SVN Revision: 15951
 
 # Notes
 

data/Rakefile

@@ -25,27 +25,29 @@ task :update do
 	::FileUtils.mkdir("lib")
 
 	
-	tdir = "tmp" + rand(0x100000000).to_s + rand(0x100000000).to_s 
+	tdir  = "src" + rand(0x100000000).to_s + rand(0x100000000).to_s 
+	tdir2 = "dst" + rand(0x100000000).to_s + rand(0x100000000).to_s 
 
 	begin
 	
 	puts "[*] Checking out Metasploit trunk..."
-	results = `svn export https://www.metasploit.com/svn/framework3/trunk/lib/ #{tdir}`
-	rev = results.match(/^Exported revision (.*)\.$/)
-	puts "[*] Checkout Revision: #{rev[1]}"
+	results = `git clone git://github.com/rapid7/metasploit-framework.git #{tdir2}; mkdir -p #{tdir}/lib; cp #{tdir2}/lib/rex.rb #{tdir}/lib/rex.rb; mv #{tdir2}/lib/rex #{tdir}/lib/rex`
+
 
 	puts "[*] Copying new files..."
-	::FileUtils.cp( ::File.join(tdir, "rex.rb"), "lib")
-	::FileUtils.cp_r( ::File.join(tdir, "rex"), ::File.join("lib", "rex") )
+	::FileUtils.cp( ::File.join(tdir, "lib", "rex.rb"), "lib")
+	::FileUtils.cp_r( ::File.join(tdir, "lib", "rex"), ::File.join("lib", "rex") )
 	
-	system "git add lib/ &> /dev/null"
+
+	system "git add lib/ --force"
 
 	puts "[*] Cleaning up tmp files..."	
 	::FileUtils.rm_rf(tdir)
+	::FileUtils.rm_rf(tdir2)
 	
 	version = ""
 	
-	print "[*] Updating librex.gemspec with new Version and Revision Number v"
+	print "[*] Updating librex.gemspec"
 	File.open("librex.gemspec.1", "w+") do |output|
 		File.open("librex.gemspec", "r") do |input|
 			while (line = input.gets)
@@ -59,7 +61,7 @@ task :update do
 						
 					line = "VERSION = \"#{version}\"\n"
 				elsif line =~ /^REVISION = (.*)$/
-					line = "REVISION = \"#{rev[1]}\"\n"
+					line = "REVISION = \"#{Time.now.strftime("%Y%m%d%H%M%S")}\"\n"
 				else
 					line = line
 				end
@@ -71,12 +73,12 @@ task :update do
 	
 	system "mv librex.gemspec.1 librex.gemspec"
 	
-	puts "[*] Updating README.markdown with new Revision Number"
+	puts "[*] Updating README.markdown with new updated date"
 	File.open("README.markdown.1", "w+") do |output|
 		File.open("README.markdown", "r") do |input|
 			while (line = input.gets)						
-				if line =~ /^SVN Revision: (.*)$/
-					line = "SVN Revision: #{rev[1]}\n"
+				if line =~ /^BUILD_DATE=(.*)$/
+					line = "BUILD_DATE='#{Time.now.strftime("%Y-%m-%d")}'\n"
 				else
 					line = line
 				end
@@ -88,9 +90,9 @@ task :update do
 	
 	system "mv README.markdown.1 README.markdown &> /dev/null"
 	
-	system "git commit -a -m \"Updated for Revision #{rev[1]}\" &> /dev/null"
-	puts "[*] Commiting and Pushing Updates for Revision #{rev[1]}"
-	system "git push &> /dev/null"
+	system "git commit -a -m \"Updated at #{Time.now.strftime("%Y-%m-%d")}\" &> /dev/null"
+	puts "[*] Commiting and pushing updates"
+	system "git push origin mnaster"
 
 	rescue ::Exception
 		$stderr.puts "[-] Error: #{$!.class} #{$!} #{$!.backtrace}"
@@ -99,5 +101,5 @@ task :update do
 	end
 	
 	# Twitter tweet for the update, I am that lazy yes
-	puts "[*] Updated librex to v#{version} based on SVN Revision: #{rev[1]} of the #metasploit rex library. Available in rubygems."
+	puts "[*] Updated librex to v#{version} based on the latest Metasploit rex library. Available in rubygems."
 end

data/lib/rex.rb

@@ -2,7 +2,7 @@
 
 The Metasploit Rex library is provided under the 3-clause BSD license.
 
-Copyright (c) 2005-2010, Rapid7 LLC
+Copyright (c) 2005-2010, Rapid7, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -15,7 +15,7 @@ are permitted provided that the following conditions are met:
    this list of conditions and the following disclaimer in the documentation 
    and/or other materials provided with the distribution.
    
- * Neither the name of Rapid7 LLC nor the names of its contributors may be 
+ * Neither the name of Rapid7, Inc. nor the names of its contributors may be 
    used to endorse or promote products derived from this software without 
    specific prior written permission.
 
@@ -33,8 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 =end
 
 module Rex
-	Root = File.join(File.expand_path(File.dirname(__FILE__)), 'rex')
-	LogSource = "rex"
+  Root = File.join(File.expand_path(File.dirname(__FILE__)), 'rex')
+  LogSource = "rex"
 end
 
 # Generic classes
@@ -88,17 +88,21 @@ require 'rex/compat'
 # Platforms
 require 'rex/platforms'
 
+# SSLScan 
+require 'rex/sslscan/scanner'
+require 'rex/sslscan/result'
+
 
 # Overload the Kernel.sleep() function to be thread-safe
 Kernel.class_eval("
-	def sleep(seconds)
-		Rex::ThreadSafe.sleep(seconds)
-	end
+  def sleep(seconds=nil)
+    Rex::ThreadSafe.sleep(seconds)
+  end
 ")
 
 # Overload the Kernel.select function to be thread-safe
 Kernel.class_eval("
-	def select(rfd = nil, wfd = nil, efd = nil, to = nil)
-		Rex::ThreadSafe.select(rfd, wfd, efd, to)
-	end
+  def select(rfd = nil, wfd = nil, efd = nil, to = nil)
+    Rex::ThreadSafe.select(rfd, wfd, efd, to)
+  end
 ")

data/lib/rex/LICENSE

@@ -1,6 +1,6 @@
 The Metasploit Rex library is provided under the 3-clause BSD license.
 
-Copyright (c) 2005-2006, Rapid7 LLC
+Copyright (c) 2005-2006, Rapid7, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -13,7 +13,7 @@ are permitted provided that the following conditions are met:
    this list of conditions and the following disclaimer in the documentation 
    and/or other materials provided with the distribution.
    
- * Neither the name of Rapid7 LLC nor the names of its contributors may be 
+ * Neither the name of Rapid7, Inc. nor the names of its contributors may be 
    used to endorse or promote products derived from this software without 
    specific prior written permission.
 

data/lib/rex/arch.rb

@@ -13,92 +13,92 @@ module Rex
 ###
 module Arch
 
-	#
-	# Architecture classes
-	#
-	require 'rex/arch/x86'
-	require 'rex/arch/sparc'
+  #
+  # Architecture classes
+  #
+  require 'rex/arch/x86'
+  require 'rex/arch/sparc'
 
-	#
-	# This routine adjusts the stack pointer for a given architecture.
-	#
-	def self.adjust_stack_pointer(arch, adjustment)
+  #
+  # This routine adjusts the stack pointer for a given architecture.
+  #
+  def self.adjust_stack_pointer(arch, adjustment)
 
-		if ( arch.is_a?(::Array))
-			arch = arch[0]
-		end
+    if ( arch.is_a?(::Array))
+      arch = arch[0]
+    end
 
-		case arch
-			when /x86/
-				Rex::Arch::X86.adjust_reg(Rex::Arch::X86::ESP, adjustment)
-			else
-				nil
-		end
-	end
+    case arch
+      when /x86/
+        Rex::Arch::X86.adjust_reg(Rex::Arch::X86::ESP, adjustment)
+      else
+        nil
+    end
+  end
 
-	#
-	# This route provides address packing for the specified arch
-	#
-	def self.pack_addr(arch, addr)
+  #
+  # This route provides address packing for the specified arch
+  #
+  def self.pack_addr(arch, addr)
 
-		if ( arch.is_a?(::Array))
-			arch = arch[0]
-		end
+    if ( arch.is_a?(::Array))
+      arch = arch[0]
+    end
 
-		case arch
-			when ARCH_X86
-				[addr].pack('V')
-			when ARCH_X86_64
-				[addr].pack('Q')
-			when ARCH_MIPS # ambiguous
-				[addr].pack('N')
-			when ARCH_MIPSBE
-				[addr].pack('N')
-			when ARCH_MIPSLE
-				[addr].pack('V')
-			when ARCH_PPC  # ambiguous
-				[addr].pack('N')
-			when ARCH_SPARC
-				[addr].pack('N')
-			when ARCH_ARMLE
-				[addr].pack('V')
-			when ARCH_ARMBE
-				[addr].pack('N')
-		end
-	end
+    case arch
+      when ARCH_X86
+        [addr].pack('V')
+      when ARCH_X86_64
+        [addr].pack('Q')
+      when ARCH_MIPS # ambiguous
+        [addr].pack('N')
+      when ARCH_MIPSBE
+        [addr].pack('N')
+      when ARCH_MIPSLE
+        [addr].pack('V')
+      when ARCH_PPC  # ambiguous
+        [addr].pack('N')
+      when ARCH_SPARC
+        [addr].pack('N')
+      when ARCH_ARMLE
+        [addr].pack('V')
+      when ARCH_ARMBE
+        [addr].pack('N')
+    end
+  end
 
-	#
-	# This routine reports the endianess of a given architecture
-	#
-	def self.endian(arch)
+  #
+  # This routine reports the endianess of a given architecture
+  #
+  def self.endian(arch)
 
-		if ( arch.is_a?(::Array))
-			arch = arch[0]
-		end
+    if ( arch.is_a?(::Array))
+      arch = arch[0]
+    end
 
-		case arch
-			when ARCH_X86
-				return ENDIAN_LITTLE
-			when ARCH_X86_64
-				return ENDIAN_LITTLE
-			when ARCH_MIPS # ambiguous
-				return ENDIAN_BIG
-			when ARCH_MIPSLE
-				return ENDIAN_LITTLE
-			when ARCH_MIPSBE
-				return ENDIAN_BIG
-			when ARCH_PPC  # ambiguous
-				return ENDIAN_BIG
-			when ARCH_SPARC
-				return ENDIAN_BIG
-			when ARCH_ARMLE
-				return ENDIAN_LITTLE
-			when ARCH_ARMBE
-				return ENDIAN_BIG
-		end
+    case arch
+      when ARCH_X86
+        return ENDIAN_LITTLE
+      when ARCH_X86_64
+        return ENDIAN_LITTLE
+      when ARCH_MIPS # ambiguous
+        return ENDIAN_BIG
+      when ARCH_MIPSLE
+        return ENDIAN_LITTLE
+      when ARCH_MIPSBE
+        return ENDIAN_BIG
+      when ARCH_PPC  # ambiguous
+        return ENDIAN_BIG
+      when ARCH_SPARC
+        return ENDIAN_BIG
+      when ARCH_ARMLE
+        return ENDIAN_LITTLE
+      when ARCH_ARMBE
+        return ENDIAN_BIG
+    end
 
-		return ENDIAN_LITTLE
-	end
+    return ENDIAN_LITTLE
+  end
 
 end
 end

data/lib/rex/arch/sparc.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # -*- coding: binary -*-
 
 module Rex
@@ -9,67 +8,67 @@ module Arch
 #
 module Sparc
 
-	#
-	# Register number constants
-	#
-	RegisterNumber =
-		{
-			'g0' =>  0, 'g1' =>  1, 'g2' =>  2, 'g3' =>  3,
-			'g4' =>  4, 'g5' =>  5, 'g6' =>  6, 'g7' =>  7,
-			'o0' =>  8, 'o1' =>  9, 'o2' => 10, 'o3' => 11,
-			'o4' => 12, 'o5' => 13, 'o6' => 14, 'o7' => 15,
-			'l0' => 16, 'l1' => 17, 'l2' => 18, 'l3' => 19,
-			'l4' => 20, 'l5' => 21, 'l6' => 22, 'l7' => 23,
-			'i0' => 24, 'i1' => 25, 'i2' => 26, 'i3' => 27,
-			'i4' => 28, 'i5' => 29, 'i6' => 30, 'i7' => 31,
-			'sp' => 14, 'fp' => 30,
-		} # :nodoc:
+  #
+  # Register number constants
+  #
+  RegisterNumber =
+    {
+      'g0' =>  0, 'g1' =>  1, 'g2' =>  2, 'g3' =>  3,
+      'g4' =>  4, 'g5' =>  5, 'g6' =>  6, 'g7' =>  7,
+      'o0' =>  8, 'o1' =>  9, 'o2' => 10, 'o3' => 11,
+      'o4' => 12, 'o5' => 13, 'o6' => 14, 'o7' => 15,
+      'l0' => 16, 'l1' => 17, 'l2' => 18, 'l3' => 19,
+      'l4' => 20, 'l5' => 21, 'l6' => 22, 'l7' => 23,
+      'i0' => 24, 'i1' => 25, 'i2' => 26, 'i3' => 27,
+      'i4' => 28, 'i5' => 29, 'i6' => 30, 'i7' => 31,
+      'sp' => 14, 'fp' => 30,
+    } # :nodoc:
 
-	#
-	# Encodes a SETHI instruction with the value 'constant' being put into 'dst' register
-	#
-	def self.sethi(constant, dst)
-		[
-			(RegisterNumber[dst] << 25) |
-			(4 << 22) |
-			(constant >> 10)
-		].pack('N')
-	end
+  #
+  # Encodes a SETHI instruction with the value 'constant' being put into 'dst' register
+  #
+  def self.sethi(constant, dst)
+    [
+      (RegisterNumber[dst] << 25) |
+      (4 << 22) |
+      (constant >> 10)
+    ].pack('N')
+  end
 
-	#
-	# Encodes an OR instruction with the value 'constant' being OR'ed with the 'src' register into the 'dst' register
-	#
-	def self.ori(src, constant, dst)
-		[
-			(2 << 30) |
-			(RegisterNumber[dst] << 25) |
-			(2 << 19) |
-			(RegisterNumber[src] << 14) |
-			(1 << 13) |
-			(constant & 0x1fff)
-		].pack('N')
-	end
+  #
+  # Encodes an OR instruction with the value 'constant' being OR'ed with the 'src' register into the 'dst' register
+  #
+  def self.ori(src, constant, dst)
+    [
+      (2 << 30) |
+      (RegisterNumber[dst] << 25) |
+      (2 << 19) |
+      (RegisterNumber[src] << 14) |
+      (1 << 13) |
+      (constant & 0x1fff)
+    ].pack('N')
+  end
 
-	#
-	# Puts 'constant' into the 'dst' register using as few instructions as possible by checking the size of the value.
-	# XXX: signedness support
-	#
-	def self.set(constant, dst)
-		if (constant <= 4095 and constant >= 0)
-			ori('g0', constant, dst)
-		elsif (constant & 0x3ff != 0)
-			set_dword(constant, dst)
-		else
-			sethi(constant, dst)
-		end
-	end
+  #
+  # Puts 'constant' into the 'dst' register using as few instructions as possible by checking the size of the value.
+  # XXX: signedness support
+  #
+  def self.set(constant, dst)
+    if (constant <= 4095 and constant >= 0)
+      ori('g0', constant, dst)
+    elsif (constant & 0x3ff != 0)
+      set_dword(constant, dst)
+    else
+      sethi(constant, dst)
+    end
+  end
 
-	#
-	# Puts 'constant' into the 'dst' register using both sethi and ori (necessary to use both uncessarily in some cases with encoders)
-	#
-	def self.set_dword(constant, dst)
-		sethi(constant, dst) + ori(dst, constant & 0x3ff, dst)
-	end
+  #
+  # Puts 'constant' into the 'dst' register using both sethi and ori (necessary to use both uncessarily in some cases with encoders)
+  #
+  def self.set_dword(constant, dst)
+    sethi(constant, dst) + ori(dst, constant & 0x3ff, dst)
+  end
 
 end