Land rapid7#7005, rm the crap out of lib/rex

And stuff the code into gems!

Author: wvu

Gemfile.lock

@@ -28,6 +28,11 @@ PATH
       rb-readline-r7
       recog
       redcarpet
+      rex-powershell
+      rex-random_identifier
+      rex-registry
+      rex-text
+      rex-zip
       robots
       rubyzip
       sqlite3
@@ -204,6 +209,15 @@ GEM
     recog (2.0.21)
       nokogiri
     redcarpet (3.3.4)
+    rex-powershell (0.1.0)
+      rex-random_identifier
+      rex-text
+    rex-random_identifier (0.1.0)
+      rex-text
+    rex-registry (0.1.0)
+    rex-text (0.1.1)
+    rex-zip (0.1.0)
+      rex-text
     rkelly-remix (0.0.6)
     robots (0.10.1)
     rspec-core (3.4.4)
@@ -242,7 +256,7 @@ GEM
     timecop (0.8.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2016.4)
+    tzinfo-data (1.2016.5)
       tzinfo (>= 1.0.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)

lib/msf/base/simple/buffer.rb

@@ -48,7 +48,7 @@ def self.transform(buf, fmt = "ruby", var_name = 'buf')
       when 'java'
         buf = Rex::Text.to_java(buf, var_name)
       when 'powershell', 'ps1'
-        buf = Rex::Text.to_powershell(buf, var_name)
+        buf = Rex::Powershell.to_powershell(buf, var_name)
       when 'vbscript'
         buf = Rex::Text.to_vbscript(buf, var_name)
       when 'vbapplication'

lib/msf/util/exe.rb

@@ -13,7 +13,7 @@ class EXE
 require 'rex'
 require 'rex/peparsey'
 require 'rex/pescan'
-require 'rex/random_identifier_generator'
+require 'rex/random_identifier'
 require 'rex/zip'
 require 'rex/powershell'
 require 'metasm'
@@ -1239,7 +1239,7 @@ def self.to_powershell_vba(framework, arch, code)
                     method: 'reflection')
 
     # Intialize rig and value names
-    rig = Rex::RandomIdentifierGenerator.new()
+    rig = Rex::RandomIdentifier::Generator.new()
     rig.init_var(:sub_auto_open)
     rig.init_var(:var_powershell)
 
@@ -1330,7 +1330,7 @@ def self.to_exe_aspx(exes = '', opts = {})
 
   def self.to_mem_aspx(framework, code, exeopts = {})
     # Intialize rig and value names
-    rig = Rex::RandomIdentifierGenerator.new()
+    rig = Rex::RandomIdentifier::Generator.new()
     rig.init_var(:var_funcAddr)
     rig.init_var(:var_hThread)
     rig.init_var(:var_pInfo)
@@ -1393,7 +1393,7 @@ def self.to_powershell_hta(framework, arch, code)
                     method: 'reflection')
 
     # Intialize rig and value names
-    rig = Rex::RandomIdentifierGenerator.new()
+    rig = Rex::RandomIdentifier::Generator.new()
     rig.init_var(:var_shell)
     rig.init_var(:var_fso)
 

lib/rex.rb

@@ -42,7 +42,7 @@ module Rex
 require 'rex/constants'
 require 'rex/exceptions'
 require 'rex/transformer'
-require 'rex/random_identifier_generator'
+require 'rex/random_identifier'
 require 'rex/text'
 require 'rex/time'
 require 'rex/job_container'