Land rapid7#7067, bcook's rex tools fix

this pr fixes rex requires in the various tools that were
disrupted by the new gemification of rex

Author: David Maloney

lib/rex.rb

@@ -38,6 +38,22 @@ module Rex
   LogSource = "rex"
 end
 
+#
+# REX Gems
+#
+# Text manipulation library for things like generating random string
+require 'rex/text'
+# Library for Generating Randomized strings valid as Identifiers such as variable names
+require 'rex/random_identifier'
+# library for creating Powershell scripts for exploitation purposes
+require 'rex/powershell'
+# Library for processing and creating Zip compatbile archives
+require 'rex/zip'
+# Library for parsing offline Windows Registry files
+require 'rex/registry'
+# Library for parsing Java serialized streams
+require 'rex/java'
+
 # Generic classes
 require 'rex/constants'
 require 'rex/exceptions'

tools/exploit/find_badchars.rb

@@ -13,6 +13,8 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
+gem 'rex-text'
+
 $:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
@@ -112,7 +114,7 @@ def debug_buffer(name, buf)
       translated << ln.chomp[10,47].gsub!(/(-| )/, '')
     end
     from_dbg = Rex::Text.hex_to_raw(translated)
-    
+
   when "gdb"
     translated = ''
     from_dbg.each_line do |ln|

tools/exploit/metasm_shell.rb

@@ -20,6 +20,8 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
+gem 'rex-text'
+
 $:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
@@ -40,7 +42,7 @@ def usage
   $stderr.puts("\nUsage: #{$0} <options>\n" + $args.usage)
   exit
 end
-    
+
 $args = Rex::Parser::Arguments.new(
   "-a" => [ true, "The architecture to encode as (#{@Arch.sort.collect{|a| a + ', ' }.join.gsub(/\, $/,'')})"],
   "-e" => [ true, "The endianess to encode as (#{@Endian.sort.collect{|a| a + ', ' }.join.gsub(/\, $/,'')})" ],

tools/exploit/pattern_create.rb

@@ -8,6 +8,8 @@
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 $LOAD_PATH.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
+gem 'rex-text'
+
 require 'optparse'
 
 module PatternCreate
@@ -72,7 +74,6 @@ def run
   begin
     driver.run
   rescue ::StandardError => e
-    elog("#{e.class}: #{e.message}\n#{e.backtrace * "\n"}")
     $stderr.puts "[x] #{e.class}: #{e.message}"
     $stderr.puts "[*] If necessary, please refer to framework.log for more details."
   end

tools/exploit/pattern_offset.rb

@@ -8,6 +8,8 @@
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 $LOAD_PATH.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
+gem 'rex-text'
+
 require 'optparse'
 
 module PatternOffset
@@ -140,7 +142,6 @@ def run
   begin
     driver.run
   rescue ::StandardError => e
-    elog("#{e.class}: #{e.message}\n#{e.backtrace * "\n"}")
     $stderr.puts "[x] #{e.class}: #{e.message}"
     $stderr.puts "[*] If necessary, please refer to framework.log for more details."
 

tools/exploit/psexec.rb

@@ -9,6 +9,8 @@
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
+gem 'rex-text'
+
 $:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
 require 'msfenv'
 
@@ -67,7 +69,7 @@ def dcerpc_bind(handle, csocket, csimple, cuser, cpass)
     opts['smb_pass'] = cpass
     opts['frag_size'] = 512
     opts['smb_client'] = csimple
-    
+
     Rex::Proto::DCERPC::Client.new(handle, csocket, opts)
   end
 
@@ -131,7 +133,7 @@ def dcerpc_call(function, stub = '', timeout=nil, do_recv=true)
   exit(1)
 end
 
-    
+
 
 fname = Rex::Text.rand_text_alpha(8) + ".exe"
 sname = Rex::Text.rand_text_alpha(8)

tools/modules/update_payload_cached_sizes.rb

@@ -13,6 +13,8 @@
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
+gem 'rex-text'
+
 require 'rex'
 require 'msf/ui'
 require 'msf/base'

tools/password/cpassword_decrypt.rb

@@ -38,10 +38,12 @@
 end
 
 $:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
+
+gem 'rex-text'
+
 require 'msfenv'
 require 'rex'
 
-
 class CPassword
 
   #
@@ -128,4 +130,4 @@ def print_good(msg='')
   else
     print_good("The decrypted AES password is: #{pass}")
   end
-end
+end