Land rapid7#7200, Rex::Ui::Text cleanup

Author: pbarry-r7

Gemfile.lock

@@ -51,27 +51,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.2.7)
-      actionview (= 4.2.7)
-      activesupport (= 4.2.7)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7)
-      activesupport (= 4.2.7)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activemodel (4.2.7)
-      activesupport (= 4.2.7)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
-    activerecord (4.2.7)
-      activemodel (= 4.2.7)
-      activesupport (= 4.2.7)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       arel (~> 6.0)
-    activesupport (4.2.7)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -112,12 +112,12 @@ GEM
       multi_test (>= 0.1.2)
     cucumber-core (1.5.0)
       gherkin (~> 4.0)
-    cucumber-rails (1.4.3)
+    cucumber-rails (1.4.4)
       capybara (>= 1.1.2, < 3)
       cucumber (>= 1.3.8, < 3)
       mime-types (>= 1.16, < 4)
       nokogiri (~> 1.5)
-      railties (>= 3, < 5)
+      railties (>= 3, < 5.1)
     cucumber-wire (0.0.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
@@ -213,17 +213,17 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.7)
-      actionpack (= 4.2.7)
-      activesupport (= 4.2.7)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (11.2.2)
     rb-readline-r7 (0.5.2.0)
     recog (2.0.21)
       nokogiri
     redcarpet (3.3.4)
-    rex-arch (0.1.0)
+    rex-arch (0.1.1)
       rex-text
     rex-java (0.1.2)
     rex-ole (0.1.2)
@@ -235,12 +235,12 @@ GEM
       rex-text
     rex-registry (0.1.0)
     rex-struct2 (0.1.0)
-    rex-text (0.1.1)
+    rex-text (0.2.1)
     rex-zip (0.1.0)
       rex-text
     rkelly-remix (0.0.6)
     robots (0.10.1)
-    rspec-core (3.5.1)
+    rspec-core (3.5.2)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -282,7 +282,7 @@ GEM
     windows_error (0.0.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yard (0.9.0)
+    yard (0.9.5)
 
 PLATFORMS
   ruby

lib/msf/base/serializer/readable_text.rb

@@ -46,7 +46,7 @@ def self.dump_module(mod, indent = "  ")
   # @param h [String] the string to display as the table heading.
   # @return [String] the string form of the table.
   def self.dump_exploit_targets(mod, indent = '', h = nil)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent.length,
       'Header'  => h,
       'Columns' =>
@@ -70,7 +70,7 @@ def self.dump_exploit_targets(mod, indent = '', h = nil)
   # @param h [String] the string to display as the table heading.
   # @return [String] the string form of the table.
   def self.dump_exploit_target(mod, indent = '', h = nil)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent.length,
       'Header'  => h,
       'Columns' =>
@@ -92,7 +92,7 @@ def self.dump_exploit_target(mod, indent = '', h = nil)
   # @param h [String] the string to display as the table heading.
   # @return [String] the string form of the table.
   def self.dump_module_actions(mod, indent = '', h = nil)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent.length,
       'Header'  => h,
       'Columns' =>
@@ -116,7 +116,7 @@ def self.dump_module_actions(mod, indent = '', h = nil)
   # @param h [String] the string to display as the table heading.
   # @return [String] the string form of the table.
   def self.dump_module_action(mod, indent = '', h = nil)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent.length,
       'Header'  => h,
       'Columns' =>
@@ -139,7 +139,7 @@ def self.dump_module_action(mod, indent = '', h = nil)
   # @param h [String] the string to display as the table heading.
   # @return [String] the string form of the table.
   def self.dump_compatible_payloads(exploit, indent = '', h = nil)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent.length,
       'Header'  => h,
       'Columns' =>
@@ -390,7 +390,7 @@ def self.dump_generic_module(mod, indent = '')
   # @param missing [Boolean] dump only empty required options.
   # @return [String] the string form of the information.
   def self.dump_options(mod, indent = '', missing = false)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent.length,
       'Columns' =>
         [
@@ -419,7 +419,7 @@ def self.dump_options(mod, indent = '', missing = false)
   # @param indent [String] the indentation to use.
   # @return [String] the string form of the information.
   def self.dump_advanced_options(mod, indent = '')
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent.length,
       'Columns' =>
         [
@@ -444,7 +444,7 @@ def self.dump_advanced_options(mod, indent = '')
   # @param indent [String] the indentation to use.
   # @return [String] the string form of the information.
   def self.dump_evasion_options(mod, indent = '')
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent.length,
       'Columns' =>
         [
@@ -490,7 +490,7 @@ def self.dump_references(mod, indent = '')
   # @param col [Integer] the column width.
   # @return [String] the formatted DataStore contents.
   def self.dump_datastore(name, ds, indent = DefaultIndent, col = DefaultColumnWrap)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent,
       'Header'  => name,
       'Columns' =>
@@ -529,7 +529,7 @@ def self.dump_sessions(framework, opts={})
     columns << 'Information'
     columns << 'Connection'
 
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent,
       'Header'  => "Active sessions",
       'Columns' => columns)
@@ -653,7 +653,7 @@ def self.dump_jobs(framework, verbose = false, indent = DefaultIndent, col = Def
       columns += [ "URIPATH", "Start Time", "Handler opts" ]
     end
 
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent,
       'Header'  => "Jobs",
       'Columns' => columns

lib/msf/core/exploit/browser_autopwn2.rb

@@ -517,7 +517,7 @@ def show_ready_exploits
       # As an user, you shouldn't be using any of these paths anyway.
       columns.delete('Path') if !datastore['VERBOSE']
 
-      table = Rex::Ui::Text::Table.new(
+      table = Rex::Text::Table.new(
         'Header'  => 'Exploits',
         'Indent'  => 1,
         'Columns' => columns
@@ -625,7 +625,7 @@ def log_click(ip, data='')
     # @return [void]
     def show_exploit_list(ip, tag, current_exploit_list)
       order = 1
-      table = Rex::Ui::Text::Table.new(
+      table = Rex::Text::Table.new(
         'Header'  => '',
         'Indent'  => 1,
         'Columns' => ['Order', 'IP', 'Exploit']

lib/msf/core/exploit/mssql.rb

@@ -702,7 +702,7 @@ def mssql_print_reply(info)
 
     if(info[:rows] and not info[:rows].empty?)
 
-      tbl = Rex::Ui::Text::Table.new(
+      tbl = Rex::Text::Table.new(
         'Indent'    => 1,
         'Header'    => "",
         'Columns'   => info[:colnames],

lib/msf/core/exploit/postgres.rb

@@ -184,7 +184,7 @@ def postgres_query(sql=nil,doprint=false)
 
   # If resp is not actually a Connection::Result object, then return
   # :error (but not an actual Exception, that's up to the caller.
-  # Otherwise, create a rowset using Rex::Ui::Text::Table (if there's
+  # Otherwise, create a rowset using Rex::Text::Table (if there's
   # more than 0 rows) and return :complete.
   def postgres_print_reply(resp=nil,sql=nil)
     ip = datastore['RHOST']
@@ -194,7 +194,7 @@ def postgres_print_reply(resp=nil,sql=nil)
     if resp.rows and resp.fields
       print_status "#{ip}:#{port} Rows Returned: #{resp.rows.size}" if verbose
       if resp.rows.size > 0
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'Indent' => 4,
           'Header' => "Query Text: '#{sql}'",
           'Columns' => resp.fields.map {|x| x.name}

lib/msf/core/exploit/winrm.rb

@@ -164,7 +164,7 @@ def parse_wql_response(response)
       rows << row_data
     end
     columns.uniq!
-    response_data = Rex::Ui::Text::Table.new(
+    response_data = Rex::Text::Table.new(
       'Header'    => "#{datastore['WQL']} (#{rhost})",
       'Indent'    => 1,
       'Columns'   => columns

lib/msf/ui/console/command_dispatcher/db.rb

@@ -423,7 +423,7 @@ def cmd_hosts(*args)
     end
 
     # If we got here, we're searching.  Delete implies search
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       {
         'Header'  => "Hosts",
         'Columns' => col_names,
@@ -650,7 +650,7 @@ def cmd_services(*args)
     if col_search
       col_names = col_search
     end
-    tbl = Rex::Ui::Text::Table.new({
+    tbl = Rex::Text::Table.new({
         'Header'  => "Services",
         'Columns' => ['host'] + col_names,
       })
@@ -1029,7 +1029,7 @@ def creds_search(*args)
       'Columns' => cred_table_columns
     }
 
-    tbl = Rex::Ui::Text::Table.new(tbl_opts)
+    tbl = Rex::Text::Table.new(tbl_opts)
 
     ::ActiveRecord::Base.connection_pool.with_connection {
       query = Metasploit::Credential::Core.where( workspace_id: framework.db.workspace )
@@ -1341,7 +1341,7 @@ def cmd_notes(*args)
     end
 
     # Now display them
-    csv_table = Rex::Ui::Text::Table.new(
+    csv_table = Rex::Text::Table.new(
       'Header'  => 'Notes',
       'Indent'  => 1,
       'Columns' => ['Time', 'Host', 'Service', 'Port', 'Protocol', 'Type', 'Data']
@@ -1501,7 +1501,7 @@ def cmd_loot(*args)
       end
     end
 
-    tbl = Rex::Ui::Text::Table.new({
+    tbl = Rex::Text::Table.new({
         'Header'  => "Loot",
         'Columns' => [ 'host', 'service', 'type', 'name', 'content', 'info', 'path' ],
       })

lib/msf/ui/console/table.rb

@@ -9,7 +9,7 @@ module Console
 # Console table display wrapper that allows for stylized tables
 #
 ###
-class Table < Rex::Ui::Text::Table
+class Table < Rex::Text::Table
 
   #
   # Default table styles.