Browse Source

replace old rex::ui::text::table refs

everywhere we called the class we have now rewritten it
to use the new namespace

MS-1875
David Maloney 3 years ago
parent
commit
eb73a6914d
No account linked to committer's email address
100 changed files with 145 additions and 145 deletions
  1. 11
    11
      lib/msf/base/serializer/readable_text.rb
  2. 2
    2
      lib/msf/core/exploit/browser_autopwn2.rb
  3. 1
    1
      lib/msf/core/exploit/mssql.rb
  4. 2
    2
      lib/msf/core/exploit/postgres.rb
  5. 1
    1
      lib/msf/core/exploit/winrm.rb
  6. 5
    5
      lib/msf/ui/console/command_dispatcher/db.rb
  7. 1
    1
      lib/msf/ui/console/table.rb
  8. 1
    1
      lib/rex/parser/group_policy_preferences.rb
  9. 1
    1
      lib/rex/parser/unattend.rb
  10. 1
    1
      lib/rex/pescan/analyze.rb
  11. 4
    4
      lib/rex/post/meterpreter/extensions/stdapi/sys/process.rb
  12. 2
    2
      lib/rex/post/meterpreter/ui/console/command_dispatcher/android.rb
  13. 2
    2
      lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb
  14. 1
    1
      lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/adsi.rb
  15. 1
    1
      lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/service.rb
  16. 1
    1
      lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/window.rb
  17. 1
    1
      lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/wmi.rb
  18. 3
    3
      lib/rex/post/meterpreter/ui/console/command_dispatcher/kiwi.rb
  19. 1
    1
      lib/rex/post/meterpreter/ui/console/command_dispatcher/lanattacks/dhcp.rb
  20. 1
    1
      lib/rex/post/meterpreter/ui/console/command_dispatcher/mimikatz.rb
  21. 2
    2
      lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/fs.rb
  22. 6
    6
      lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/net.rb
  23. 1
    1
      lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/sys.rb
  24. 1
    1
      lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/ui.rb
  25. 1
    1
      lib/rex/ropbuilder/rop.rb
  26. 1
    1
      lib/rex/sslscan/result.rb
  27. 1
    1
      modules/auxiliary/admin/http/webnms_cred_disclosure.rb
  28. 1
    1
      modules/auxiliary/admin/mssql/mssql_enum_domain_accounts.rb
  29. 1
    1
      modules/auxiliary/admin/mssql/mssql_enum_domain_accounts_sqli.rb
  30. 1
    1
      modules/auxiliary/admin/mssql/mssql_findandsampledata.rb
  31. 1
    1
      modules/auxiliary/admin/scada/advantech_webaccess_dbvisitor_sqli.rb
  32. 1
    1
      modules/auxiliary/admin/scada/modicon_password_recovery.rb
  33. 1
    1
      modules/auxiliary/admin/smb/list_directory.rb
  34. 1
    1
      modules/auxiliary/gather/chromecast_wifi.rb
  35. 1
    1
      modules/auxiliary/gather/d20pass.rb
  36. 1
    1
      modules/auxiliary/gather/doliwamp_traversal_creds.rb
  37. 1
    1
      modules/auxiliary/gather/eaton_nsm_creds.rb
  38. 1
    1
      modules/auxiliary/gather/eventlog_cred_disclosure.rb
  39. 1
    1
      modules/auxiliary/gather/hp_snac_domain_creds.rb
  40. 1
    1
      modules/auxiliary/gather/memcached_extractor.rb
  41. 1
    1
      modules/auxiliary/gather/shodan_search.rb
  42. 1
    1
      modules/auxiliary/gather/vbulletin_vote_sqli.rb
  43. 1
    1
      modules/auxiliary/scanner/dcerpc/windows_deployment_services.rb
  44. 1
    1
      modules/auxiliary/scanner/http/jboss_status.rb
  45. 1
    1
      modules/auxiliary/scanner/http/manageengine_deviceexpert_user_creds.rb
  46. 4
    4
      modules/auxiliary/scanner/misc/dahua_dvr_auth_bypass.rb
  47. 1
    1
      modules/auxiliary/scanner/misc/sunrpc_portmapper.rb
  48. 1
    1
      modules/auxiliary/scanner/mssql/mssql_hashdump.rb
  49. 1
    1
      modules/auxiliary/scanner/mysql/mysql_authbypass_hashdump.rb
  50. 1
    1
      modules/auxiliary/scanner/oracle/oracle_hashdump.rb
  51. 1
    1
      modules/auxiliary/scanner/postgres/postgres_hashdump.rb
  52. 2
    2
      modules/auxiliary/scanner/smb/smb_enumshares.rb
  53. 1
    1
      modules/auxiliary/scanner/vmware/vmware_enum_permissions.rb
  54. 4
    4
      modules/auxiliary/scanner/vmware/vmware_enum_users.rb
  55. 1
    1
      modules/exploits/windows/mssql/mssql_linkcrawler.rb
  56. 1
    1
      modules/post/linux/gather/enum_psk.rb
  57. 1
    1
      modules/post/linux/gather/mount_cifs_creds.rb
  58. 1
    1
      modules/post/linux/gather/pptpd_chap_secrets.rb
  59. 1
    1
      modules/post/multi/gather/check_malware.rb
  60. 2
    2
      modules/post/multi/gather/dbvis_enum.rb
  61. 1
    1
      modules/post/multi/gather/fetchmailrc_creds.rb
  62. 1
    1
      modules/post/multi/gather/firefox_creds.rb
  63. 2
    2
      modules/post/multi/gather/lastpass_creds.rb
  64. 1
    1
      modules/post/multi/gather/netrc_creds.rb
  65. 1
    1
      modules/post/multi/gather/pgpass_creds.rb
  66. 2
    2
      modules/post/multi/gather/pidgin_cred.rb
  67. 1
    1
      modules/post/multi/gather/remmina_creds.rb
  68. 1
    1
      modules/post/multi/gather/resolve_hosts.rb
  69. 1
    1
      modules/post/multi/gather/rsyncd_creds.rb
  70. 1
    1
      modules/post/multi/gather/thunderbird_creds.rb
  71. 1
    1
      modules/post/osx/gather/safari_lastsession.rb
  72. 1
    1
      modules/post/windows/gather/cachedump.rb
  73. 1
    1
      modules/post/windows/gather/credentials/bulletproof_ftp.rb
  74. 2
    2
      modules/post/windows/gather/credentials/dyndns.rb
  75. 2
    2
      modules/post/windows/gather/credentials/enum_laps.rb
  76. 1
    1
      modules/post/windows/gather/credentials/enum_picasa_pwds.rb
  77. 4
    4
      modules/post/windows/gather/credentials/filezilla_server.rb
  78. 1
    1
      modules/post/windows/gather/credentials/idm.rb
  79. 1
    1
      modules/post/windows/gather/credentials/imail.rb
  80. 1
    1
      modules/post/windows/gather/credentials/imvu.rb
  81. 1
    1
      modules/post/windows/gather/credentials/meebo.rb
  82. 1
    1
      modules/post/windows/gather/credentials/nimbuzz.rb
  83. 1
    1
      modules/post/windows/gather/credentials/razorsql.rb
  84. 1
    1
      modules/post/windows/gather/credentials/sso.rb
  85. 1
    1
      modules/post/windows/gather/credentials/trillian.rb
  86. 1
    1
      modules/post/windows/gather/dnscache_dump.rb
  87. 1
    1
      modules/post/windows/gather/enum_ad_bitlocker.rb
  88. 1
    1
      modules/post/windows/gather/enum_ad_computers.rb
  89. 2
    2
      modules/post/windows/gather/enum_ad_groups.rb
  90. 1
    1
      modules/post/windows/gather/enum_ad_managedby_groups.rb
  91. 1
    1
      modules/post/windows/gather/enum_ad_service_principal_names.rb
  92. 1
    1
      modules/post/windows/gather/enum_ad_user_comments.rb
  93. 2
    2
      modules/post/windows/gather/enum_ad_users.rb
  94. 1
    1
      modules/post/windows/gather/enum_applications.rb
  95. 1
    1
      modules/post/windows/gather/enum_av_excluded.rb
  96. 1
    1
      modules/post/windows/gather/enum_chrome.rb
  97. 1
    1
      modules/post/windows/gather/enum_computers.rb
  98. 1
    1
      modules/post/windows/gather/enum_db.rb
  99. 1
    1
      modules/post/windows/gather/enum_devices.rb
  100. 0
    0
      modules/post/windows/gather/enum_domain_tokens.rb

+ 11
- 11
lib/msf/base/serializer/readable_text.rb View File

@@ -46,7 +46,7 @@ class ReadableText
46 46
   # @param h [String] the string to display as the table heading.
47 47
   # @return [String] the string form of the table.
48 48
   def self.dump_exploit_targets(mod, indent = '', h = nil)
49
-    tbl = Rex::Ui::Text::Table.new(
49
+    tbl = Rex::Text::Table.new(
50 50
       'Indent'  => indent.length,
51 51
       'Header'  => h,
52 52
       'Columns' =>
@@ -70,7 +70,7 @@ class ReadableText
70 70
   # @param h [String] the string to display as the table heading.
71 71
   # @return [String] the string form of the table.
72 72
   def self.dump_exploit_target(mod, indent = '', h = nil)
73
-    tbl = Rex::Ui::Text::Table.new(
73
+    tbl = Rex::Text::Table.new(
74 74
       'Indent'  => indent.length,
75 75
       'Header'  => h,
76 76
       'Columns' =>
@@ -92,7 +92,7 @@ class ReadableText
92 92
   # @param h [String] the string to display as the table heading.
93 93
   # @return [String] the string form of the table.
94 94
   def self.dump_module_actions(mod, indent = '', h = nil)
95
-    tbl = Rex::Ui::Text::Table.new(
95
+    tbl = Rex::Text::Table.new(
96 96
       'Indent'  => indent.length,
97 97
       'Header'  => h,
98 98
       'Columns' =>
@@ -116,7 +116,7 @@ class ReadableText
116 116
   # @param h [String] the string to display as the table heading.
117 117
   # @return [String] the string form of the table.
118 118
   def self.dump_module_action(mod, indent = '', h = nil)
119
-    tbl = Rex::Ui::Text::Table.new(
119
+    tbl = Rex::Text::Table.new(
120 120
       'Indent'  => indent.length,
121 121
       'Header'  => h,
122 122
       'Columns' =>
@@ -139,7 +139,7 @@ class ReadableText
139 139
   # @param h [String] the string to display as the table heading.
140 140
   # @return [String] the string form of the table.
141 141
   def self.dump_compatible_payloads(exploit, indent = '', h = nil)
142
-    tbl = Rex::Ui::Text::Table.new(
142
+    tbl = Rex::Text::Table.new(
143 143
       'Indent'  => indent.length,
144 144
       'Header'  => h,
145 145
       'Columns' =>
@@ -390,7 +390,7 @@ class ReadableText
390 390
   # @param missing [Boolean] dump only empty required options.
391 391
   # @return [String] the string form of the information.
392 392
   def self.dump_options(mod, indent = '', missing = false)
393
-    tbl = Rex::Ui::Text::Table.new(
393
+    tbl = Rex::Text::Table.new(
394 394
       'Indent'  => indent.length,
395 395
       'Columns' =>
396 396
         [
@@ -419,7 +419,7 @@ class ReadableText
419 419
   # @param indent [String] the indentation to use.
420 420
   # @return [String] the string form of the information.
421 421
   def self.dump_advanced_options(mod, indent = '')
422
-    tbl = Rex::Ui::Text::Table.new(
422
+    tbl = Rex::Text::Table.new(
423 423
       'Indent'  => indent.length,
424 424
       'Columns' =>
425 425
         [
@@ -444,7 +444,7 @@ class ReadableText
444 444
   # @param indent [String] the indentation to use.
445 445
   # @return [String] the string form of the information.
446 446
   def self.dump_evasion_options(mod, indent = '')
447
-    tbl = Rex::Ui::Text::Table.new(
447
+    tbl = Rex::Text::Table.new(
448 448
       'Indent'  => indent.length,
449 449
       'Columns' =>
450 450
         [
@@ -490,7 +490,7 @@ class ReadableText
490 490
   # @param col [Integer] the column width.
491 491
   # @return [String] the formatted DataStore contents.
492 492
   def self.dump_datastore(name, ds, indent = DefaultIndent, col = DefaultColumnWrap)
493
-    tbl = Rex::Ui::Text::Table.new(
493
+    tbl = Rex::Text::Table.new(
494 494
       'Indent'  => indent,
495 495
       'Header'  => name,
496 496
       'Columns' =>
@@ -529,7 +529,7 @@ class ReadableText
529 529
     columns << 'Information'
530 530
     columns << 'Connection'
531 531
 
532
-    tbl = Rex::Ui::Text::Table.new(
532
+    tbl = Rex::Text::Table.new(
533 533
       'Indent'  => indent,
534 534
       'Header'  => "Active sessions",
535 535
       'Columns' => columns)
@@ -653,7 +653,7 @@ class ReadableText
653 653
       columns += [ "URIPATH", "Start Time", "Handler opts" ]
654 654
     end
655 655
 
656
-    tbl = Rex::Ui::Text::Table.new(
656
+    tbl = Rex::Text::Table.new(
657 657
       'Indent'  => indent,
658 658
       'Header'  => "Jobs",
659 659
       'Columns' => columns

+ 2
- 2
lib/msf/core/exploit/browser_autopwn2.rb View File

@@ -517,7 +517,7 @@ module Msf
517 517
       # As an user, you shouldn't be using any of these paths anyway.
518 518
       columns.delete('Path') if !datastore['VERBOSE']
519 519
 
520
-      table = Rex::Ui::Text::Table.new(
520
+      table = Rex::Text::Table.new(
521 521
         'Header'  => 'Exploits',
522 522
         'Indent'  => 1,
523 523
         'Columns' => columns
@@ -625,7 +625,7 @@ module Msf
625 625
     # @return [void]
626 626
     def show_exploit_list(ip, tag, current_exploit_list)
627 627
       order = 1
628
-      table = Rex::Ui::Text::Table.new(
628
+      table = Rex::Text::Table.new(
629 629
         'Header'  => '',
630 630
         'Indent'  => 1,
631 631
         'Columns' => ['Order', 'IP', 'Exploit']

+ 1
- 1
lib/msf/core/exploit/mssql.rb View File

@@ -702,7 +702,7 @@ module Exploit::Remote::MSSQL
702 702
 
703 703
     if(info[:rows] and not info[:rows].empty?)
704 704
 
705
-      tbl = Rex::Ui::Text::Table.new(
705
+      tbl = Rex::Text::Table.new(
706 706
         'Indent'    => 1,
707 707
         'Header'    => "",
708 708
         'Columns'   => info[:colnames],

+ 2
- 2
lib/msf/core/exploit/postgres.rb View File

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

+ 1
- 1
lib/msf/core/exploit/winrm.rb View File

@@ -164,7 +164,7 @@ module Exploit::Remote::WinRM
164 164
       rows << row_data
165 165
     end
166 166
     columns.uniq!
167
-    response_data = Rex::Ui::Text::Table.new(
167
+    response_data = Rex::Text::Table.new(
168 168
       'Header'    => "#{datastore['WQL']} (#{rhost})",
169 169
       'Indent'    => 1,
170 170
       'Columns'   => columns

+ 5
- 5
lib/msf/ui/console/command_dispatcher/db.rb View File

@@ -423,7 +423,7 @@ class Db
423 423
     end
424 424
 
425 425
     # If we got here, we're searching.  Delete implies search
426
-    tbl = Rex::Ui::Text::Table.new(
426
+    tbl = Rex::Text::Table.new(
427 427
       {
428 428
         'Header'  => "Hosts",
429 429
         'Columns' => col_names,
@@ -650,7 +650,7 @@ class Db
650 650
     if col_search
651 651
       col_names = col_search
652 652
     end
653
-    tbl = Rex::Ui::Text::Table.new({
653
+    tbl = Rex::Text::Table.new({
654 654
         'Header'  => "Services",
655 655
         'Columns' => ['host'] + col_names,
656 656
       })
@@ -1029,7 +1029,7 @@ class Db
1029 1029
       'Columns' => cred_table_columns
1030 1030
     }
1031 1031
 
1032
-    tbl = Rex::Ui::Text::Table.new(tbl_opts)
1032
+    tbl = Rex::Text::Table.new(tbl_opts)
1033 1033
 
1034 1034
     ::ActiveRecord::Base.connection_pool.with_connection {
1035 1035
       query = Metasploit::Credential::Core.where( workspace_id: framework.db.workspace )
@@ -1341,7 +1341,7 @@ class Db
1341 1341
     end
1342 1342
 
1343 1343
     # Now display them
1344
-    csv_table = Rex::Ui::Text::Table.new(
1344
+    csv_table = Rex::Text::Table.new(
1345 1345
       'Header'  => 'Notes',
1346 1346
       'Indent'  => 1,
1347 1347
       'Columns' => ['Time', 'Host', 'Service', 'Port', 'Protocol', 'Type', 'Data']
@@ -1501,7 +1501,7 @@ class Db
1501 1501
       end
1502 1502
     end
1503 1503
 
1504
-    tbl = Rex::Ui::Text::Table.new({
1504
+    tbl = Rex::Text::Table.new({
1505 1505
         'Header'  => "Loot",
1506 1506
         'Columns' => [ 'host', 'service', 'type', 'name', 'content', 'info', 'path' ],
1507 1507
       })

+ 1
- 1
lib/msf/ui/console/table.rb View File

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

+ 1
- 1
lib/rex/parser/group_policy_preferences.rb View File

@@ -88,7 +88,7 @@ class GPP
88 88
   def self.create_tables(results, filetype, domain=nil, dc=nil)
89 89
     tables = []
90 90
     results.each do |result|
91
-      table = Rex::Ui::Text::Table.new(
91
+      table = Rex::Text::Table.new(
92 92
         'Header'     => 'Group Policy Credential Info',
93 93
         'Indent'     => 1,
94 94
         'SortIndex'  => -1,

+ 1
- 1
lib/rex/parser/unattend.rb View File

@@ -146,7 +146,7 @@ class Unattend
146 146
 
147 147
   def self.create_table(results)
148 148
     return nil if results.nil? or results.empty?
149
-    table = Rex::Ui::Text::Table.new({
149
+    table = Rex::Text::Table.new({
150 150
       'Header' => 'Unattend Credentials',
151 151
       'Indent' => 1,
152 152
       'Columns' => ['Type', 'Domain', 'Username', 'Password', 'Groups']

+ 1
- 1
lib/rex/pescan/analyze.rb View File

@@ -263,7 +263,7 @@ module Analyze
263 263
     end
264 264
 
265 265
     def table(name, cols)
266
-      Rex::Ui::Text::Table.new(
266
+      Rex::Text::Table.new(
267 267
         'Header'  => name,
268 268
         'Columns' => cols
269 269
       )

+ 4
- 4
lib/rex/post/meterpreter/extensions/stdapi/sys/process.rb View File

@@ -379,15 +379,15 @@ end
379 379
 class ProcessList < Array
380 380
 
381 381
   #
382
-  # Create a Rex::Ui::Text::Table out of the processes stored in this list
382
+  # Create a Rex::Text::Table out of the processes stored in this list
383 383
   #
384
-  # +opts+ is passed on to Rex::Ui::Text::Table.new, mostly unmolested
384
+  # +opts+ is passed on to Rex::Text::Table.new, mostly unmolested
385 385
   #
386 386
   # Note that this output is affected by Rex::Post::Meterpreter::Client#unicode_filter_encode
387 387
   #
388 388
   def to_table(opts={})
389 389
     if empty?
390
-      return Rex::Ui::Text::Table.new(opts)
390
+      return Rex::Text::Table.new(opts)
391 391
     end
392 392
 
393 393
     cols = [ "PID", "PPID", "Name", "Arch", "Session", "User", "Path" ]
@@ -403,7 +403,7 @@ class ProcessList < Array
403 403
       'Columns' => cols
404 404
     }.merge(opts)
405 405
 
406
-    tbl = Rex::Ui::Text::Table.new(opts)
406
+    tbl = Rex::Text::Table.new(opts)
407 407
     each { |process|
408 408
       tbl << cols.map { |c|
409 409
         col = c.downcase

+ 2
- 2
lib/rex/post/meterpreter/ui/console/command_dispatcher/android.rb View File

@@ -111,7 +111,7 @@ class Console::CommandDispatcher::Android
111 111
           header << " at #{time.strftime('%Y-%m-%d %H:%M:%S')}"
112 112
         end
113 113
 
114
-        table = Rex::Ui::Text::Table.new(
114
+        table = Rex::Text::Table.new(
115 115
           'Header'    => header,
116 116
           'SortIndex' => 0,
117 117
           'Columns'   => result[:headers],
@@ -616,7 +616,7 @@ class Console::CommandDispatcher::Android
616 616
     result = client.android.sqlite_query(database, query, writeable)
617 617
     unless writeable
618 618
       header = "#{query} on database file #{database}"
619
-      table = Rex::Ui::Text::Table.new(
619
+      table = Rex::Text::Table.new(
620 620
         'Header'    => header,
621 621
         'Columns'   => result[:columns],
622 622
         'Indent'    => 0

+ 2
- 2
lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb View File

@@ -182,7 +182,7 @@ class Console::CommandDispatcher::Core
182 182
 
183 183
     case mode
184 184
     when :list
185
-      tbl = Rex::Ui::Text::Table.new(
185
+      tbl = Rex::Text::Table.new(
186 186
         'Indent'  => 4,
187 187
         'Columns' =>
188 188
           [
@@ -732,7 +732,7 @@ class Console::CommandDispatcher::Core
732 732
       end
733 733
 
734 734
       # next draw up a table of transport entries
735
-      tbl = Rex::Ui::Text::Table.new(
735
+      tbl = Rex::Text::Table.new(
736 736
         'SortIndex' => 0, # sort by ID
737 737
         'Indent'    => 4,
738 738
         'Columns'   => columns)

+ 1
- 1
lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/adsi.rb View File

@@ -294,7 +294,7 @@ class Console::CommandDispatcher::Extapi::Adsi
294 294
 
295 295
     objects = client.extapi.adsi.domain_query(domain, filter, max_results, page_size, args)
296 296
 
297
-    table = Rex::Ui::Text::Table.new(
297
+    table = Rex::Text::Table.new(
298 298
       'Header'    => "#{domain} Objects",
299 299
       'Indent'    => 0,
300 300
       'SortIndex' => 0,

+ 1
- 1
lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/service.rb View File

@@ -86,7 +86,7 @@ class Console::CommandDispatcher::Extapi::Service
86 86
 
87 87
     services = client.extapi.service.enumerate
88 88
 
89
-    table = Rex::Ui::Text::Table.new(
89
+    table = Rex::Text::Table.new(
90 90
       'Header'    => 'Service List',
91 91
       'Indent'    => 0,
92 92
       'SortIndex' => 3,

+ 1
- 1
lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/window.rb View File

@@ -82,7 +82,7 @@ class Console::CommandDispatcher::Extapi::Window
82 82
 
83 83
     header = parent_window ? "Child windows of #{parent_window}" : "Top-level windows"
84 84
 
85
-    table = Rex::Ui::Text::Table.new(
85
+    table = Rex::Text::Table.new(
86 86
       'Header'    => header,
87 87
       'Indent'    => 0,
88 88
       'SortIndex' => 0,

+ 1
- 1
lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/wmi.rb View File

@@ -75,7 +75,7 @@ class Console::CommandDispatcher::Extapi::Wmi
75 75
     objects = client.extapi.wmi.query(query, root)
76 76
 
77 77
     if objects
78
-      table = Rex::Ui::Text::Table.new(
78
+      table = Rex::Text::Table.new(
79 79
         'Header'    => query,
80 80
         'Indent'    => 0,
81 81
         'SortIndex' => 0,

+ 3
- 3
lib/rex/post/meterpreter/ui/console/command_dispatcher/kiwi.rb View File

@@ -259,7 +259,7 @@ class Console::CommandDispatcher::Kiwi
259 259
     fields = ['Server', 'Client', 'Start', 'End', 'Max Renew', 'Flags']
260 260
     fields << 'Export Path' if export
261 261
 
262
-    table = Rex::Ui::Text::Table.new(
262
+    table = Rex::Text::Table.new(
263 263
       'Header'    => 'Kerberos Tickets',
264 264
       'Indent'    => 0,
265 265
       'SortIndex' => 0,
@@ -335,7 +335,7 @@ class Console::CommandDispatcher::Kiwi
335 335
 
336 336
     if results.length > 0
337 337
       results.each do |r|
338
-        table = Rex::Ui::Text::Table.new(
338
+        table = Rex::Text::Table.new(
339 339
           'Header'    => "#{r[:desc]} - #{r[:guid]}",
340 340
           'Indent'    => 0,
341 341
           'SortIndex' => 0,
@@ -471,7 +471,7 @@ protected
471 471
     print_status("Retrieving #{provider} credentials")
472 472
     accounts = method.call
473 473
 
474
-    table = Rex::Ui::Text::Table.new(
474
+    table = Rex::Text::Table.new(
475 475
       'Header'    => "#{provider} credentials",
476 476
       'Indent'    => 0,
477 477
       'SortIndex' => 0,

+ 1
- 1
lib/rex/post/meterpreter/ui/console/command_dispatcher/lanattacks/dhcp.rb View File

@@ -228,7 +228,7 @@ class Console::CommandDispatcher::Lanattacks::Dhcp
228 228
 
229 229
     log = client.lanattacks.dhcp.log
230 230
 
231
-    table = Rex::Ui::Text::Table.new(
231
+    table = Rex::Text::Table.new(
232 232
       'Header'    => 'DHCP Server Log',
233 233
       'Indent'    => 0,
234 234
       'SortIndex' => 0,

+ 1
- 1
lib/rex/post/meterpreter/ui/console/command_dispatcher/mimikatz.rb View File

@@ -95,7 +95,7 @@ class Console::CommandDispatcher::Mimikatz
95 95
     print_status("Retrieving #{provider} credentials")
96 96
     accounts = method.call
97 97
 
98
-    table = Rex::Ui::Text::Table.new(
98
+    table = Rex::Text::Table.new(
99 99
       'Header' => "#{provider} credentials",
100 100
       'Indent' => 0,
101 101
       'SortIndex' => 4,

+ 2
- 2
lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/fs.rb View File

@@ -184,7 +184,7 @@ class Console::CommandDispatcher::Stdapi::Fs
184 184
 
185 185
     mounts = client.fs.mount.show_mount
186 186
 
187
-    table = Rex::Ui::Text::Table.new(
187
+    table = Rex::Text::Table.new(
188 188
       'Header'    => 'Mounts / Drives',
189 189
       'Indent'    => 0,
190 190
       'SortIndex' => 0,
@@ -482,7 +482,7 @@ class Console::CommandDispatcher::Stdapi::Fs
482 482
       return
483 483
     end
484 484
 
485
-    tbl = Rex::Ui::Text::Table.new(
485
+    tbl = Rex::Text::Table.new(
486 486
       'Header'  => "Listing: #{path}",
487 487
       'SortIndex' => columns.index(sort),
488 488
       'SortOrder' => order,

+ 6
- 6
lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/net.rb View File

@@ -155,7 +155,7 @@ class Console::CommandDispatcher::Stdapi::Net
155 155
       end
156 156
     }
157 157
 
158
-    tbl = Rex::Ui::Text::Table.new(
158
+    tbl = Rex::Text::Table.new(
159 159
     'Header'  => 'Connection list',
160 160
     'Indent'  => 4,
161 161
     'Columns' => [
@@ -206,7 +206,7 @@ class Console::CommandDispatcher::Stdapi::Net
206 206
       end
207 207
     }
208 208
 
209
-    tbl = Rex::Ui::Text::Table.new(
209
+    tbl = Rex::Text::Table.new(
210 210
     'Header'  => 'ARP cache',
211 211
     'Indent'  => 4,
212 212
     'Columns' => [
@@ -280,7 +280,7 @@ class Console::CommandDispatcher::Stdapi::Net
280 280
         routes = client.net.config.routes
281 281
 
282 282
         # IPv4
283
-        tbl = Rex::Ui::Text::Table.new(
283
+        tbl = Rex::Text::Table.new(
284 284
           'Header'  => 'IPv4 network routes',
285 285
           'Indent'  => 4,
286 286
           'Columns' => [
@@ -304,7 +304,7 @@ class Console::CommandDispatcher::Stdapi::Net
304 304
         end
305 305
 
306 306
         # IPv6
307
-        tbl = Rex::Ui::Text::Table.new(
307
+        tbl = Rex::Text::Table.new(
308 308
           'Header'  => 'IPv6 network routes',
309 309
           'Indent'  => 4,
310 310
           'Columns' => [
@@ -412,7 +412,7 @@ class Console::CommandDispatcher::Stdapi::Net
412 412
     case args.shift
413 413
       when 'list'
414 414
 
415
-        table = Rex::Ui::Text::Table.new(
415
+        table = Rex::Text::Table.new(
416 416
           'Header'    => 'Active Port Forwards',
417 417
           'Indent'    => 3,
418 418
           'SortIndex' => -1,
@@ -616,7 +616,7 @@ class Console::CommandDispatcher::Stdapi::Net
616 616
 
617 617
     response = client.net.resolve.resolve_hosts(hostnames, family)
618 618
 
619
-    table = Rex::Ui::Text::Table.new(
619
+    table = Rex::Text::Table.new(
620 620
       'Header'    => 'Host resolutions',
621 621
       'Indent'    => 4,
622 622
       'SortIndex' => 0,

+ 1
- 1
lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/sys.rb View File

@@ -297,7 +297,7 @@ class Console::CommandDispatcher::Stdapi::Sys
297 297
     if vars.length == 0
298 298
       print_error("None of the specified environment variables were found/set.")
299 299
     else
300
-      table = Rex::Ui::Text::Table.new(
300
+      table = Rex::Text::Table.new(
301 301
         'Header'    => 'Environment Variables',
302 302
         'Indent'    => 0,
303 303
         'SortIndex' => 1,

+ 1
- 1
lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/ui.rb View File

@@ -187,7 +187,7 @@ class Console::CommandDispatcher::Stdapi::Ui
187 187
 
188 188
     desktops = client.ui.enum_desktops
189 189
 
190
-    desktopstable = Rex::Ui::Text::Table.new(
190
+    desktopstable = Rex::Text::Table.new(
191 191
       'Header'  => "Desktops",
192 192
       'Indent'  => 4,
193 193
       'Columns' => [	"Session",

+ 1
- 1
lib/rex/ropbuilder/rop.rb View File

@@ -25,7 +25,7 @@ class RopBase
25 25
       @gadgets = gadgets
26 26
     end
27 27
 
28
-    table = Rex::Ui::Text::Table.new(
28
+    table = Rex::Text::Table.new(
29 29
     'Header'    => "#{@file} ROP Gadgets",
30 30
     'Indent'    => 1,
31 31
     'Columns'   =>

+ 1
- 1
lib/rex/sslscan/result.rb View File

@@ -161,7 +161,7 @@ class Result
161 161
     unless supports_ssl?
162 162
       return "Server does not appear to support SSL on this port!"
163 163
     end
164
-    table = Rex::Ui::Text::Table.new(
164
+    table = Rex::Text::Table.new(
165 165
       'Header'      => 'SSL Ciphers',
166 166
       'Indent'       => 1,
167 167
       'Columns'   => ['Status', 'Weak', 'SSL Version', 'Key Length', 'Cipher'],

+ 1
- 1
modules/auxiliary/admin/http/webnms_cred_disclosure.rb View File

@@ -80,7 +80,7 @@ Windows and Linux.
80 80
     end
81 81
 
82 82
     if res && res.code == 200 && !res.body.empty?
83
-      cred_table = Rex::Ui::Text::Table.new(
83
+      cred_table = Rex::Text::Table.new(
84 84
         'Header'  => 'WebNMS Login Credentials',
85 85
         'Indent'  => 1,
86 86
         'Columns' =>

+ 1
- 1
modules/auxiliary/admin/mssql/mssql_enum_domain_accounts.rb View File

@@ -97,7 +97,7 @@ class MetasploitModule < Msf::Auxiliary
97 97
     end
98 98
 
99 99
     # Create table for report
100
-    windows_domain_login_table = Rex::Ui::Text::Table.new(
100
+    windows_domain_login_table = Rex::Text::Table.new(
101 101
       'Header'  => 'Windows Domain Accounts',
102 102
       'Ident'   => 1,
103 103
       'Columns' => ['name']

+ 1
- 1
modules/auxiliary/admin/mssql/mssql_enum_domain_accounts_sqli.rb View File

@@ -84,7 +84,7 @@ class MetasploitModule < Msf::Auxiliary
84 84
     print_good("#{domain_users.length} user accounts, groups, and computer accounts were found.")
85 85
 
86 86
     # Create table for report
87
-    windows_domain_login_table = Rex::Ui::Text::Table.new(
87
+    windows_domain_login_table = Rex::Text::Table.new(
88 88
       'Header'  => 'Windows Domain Accounts',
89 89
       'Ident'   => 1,
90 90
       'Columns' => ['name']

+ 1
- 1
modules/auxiliary/admin/mssql/mssql_findandsampledata.rb View File

@@ -356,7 +356,7 @@ class MetasploitModule < Msf::Auxiliary
356 356
     end
357 357
 
358 358
     # CREATE TABLE TO STORE SQL SERVER DATA LOOT
359
-    sql_data_tbl = Rex::Ui::Text::Table.new(
359
+    sql_data_tbl = Rex::Text::Table.new(
360 360
       'Header'  => 'SQL Server Data',
361 361
       'Indent'   => 1,
362 362
       'Columns' => ['Server', 'Database', 'Schema', 'Table', 'Column', 'Data Type', 'Sample Data', 'Row Count']

+ 1
- 1
modules/auxiliary/admin/scada/advantech_webaccess_dbvisitor_sqli.rb View File

@@ -151,7 +151,7 @@ class MetasploitModule < Msf::Auxiliary
151 151
       print_good("#{@users.length} users found!")
152 152
     end
153 153
 
154
-    users_table = Rex::Ui::Text::Table.new(
154
+    users_table = Rex::Text::Table.new(
155 155
       'Header'  => 'Advantech WebAccess Users',
156 156
       'Indent'   => 1,
157 157
       'Columns' => ['Username', 'Encrypted Password', 'Key', 'Recovered password', 'Origin']

+ 1
- 1
modules/auxiliary/admin/scada/modicon_password_recovery.rb View File

@@ -150,7 +150,7 @@ class MetasploitModule < Msf::Auxiliary
150 150
   end
151 151
 
152 152
   def grab
153
-    logins = Rex::Ui::Text::Table.new(
153
+    logins = Rex::Text::Table.new(
154 154
       'Header'	=>	"Schneider Modicon Quantum services, usernames, and passwords",
155 155
       'Indent'	=>	1,
156 156
       'Columns'	=>	["Service", "User Name", "Password"]

+ 1
- 1
modules/auxiliary/admin/smb/list_directory.rb View File

@@ -66,7 +66,7 @@ class MetasploitModule < Msf::Auxiliary
66 66
         print_status("Listing \\\\#{datastore['RHOST']}\\#{datastore['SMBSHARE']}\\#{datastore['RPATH']}'...")
67 67
       end
68 68
       listing = self.simple.client.find_first("\\#{datastore['RPATH']}\\*")
69
-      directory = Rex::Ui::Text::Table.new(
69
+      directory = Rex::Text::Table.new(
70 70
             'Header' => "Directory Listing of \\\\#{datastore['RHOST']}\\#{datastore['SMBSHARE']}\\#{datastore['RPATH']}",
71 71
             'Indent' => 2,
72 72
             'SortIndex' => 2,

+ 1
- 1
modules/auxiliary/gather/chromecast_wifi.rb View File

@@ -32,7 +32,7 @@ class MetasploitModule < Msf::Auxiliary
32 32
 
33 33
     return unless res && res.code == 200
34 34
 
35
-    waps = Rex::Ui::Text::Table.new(
35
+    waps = Rex::Text::Table.new(
36 36
       'Header' => 'Wireless Access Points',
37 37
       'Columns' => [
38 38
         'BSSID',

+ 1
- 1
modules/auxiliary/gather/d20pass.rb View File

@@ -222,7 +222,7 @@ class MetasploitModule < Msf::Auxiliary
222 222
     headerlen = makeword(f.read(2))
223 223
     f.seek(userentryptr + 40) # sorry decimal
224 224
     entrylen = makeword(f.read(2)) # sorry this is decimal
225
-    logins = Rex::Ui::Text::Table.new(
225
+    logins = Rex::Text::Table.new(
226 226
       'Header' => "D20 usernames, passwords, and account levels\n(use for TELNET authentication)",
227 227
       'Indent' => 1,
228 228
       'Columns' => ["Type", "User Name", "Password"])

+ 1
- 1
modules/auxiliary/gather/doliwamp_traversal_creds.rb View File

@@ -192,7 +192,7 @@ class MetasploitModule < Msf::Auxiliary
192 192
       print_warning("No credentials collected.")
193 193
       return
194 194
     end
195
-    cred_table = Rex::Ui::Text::Table.new(
195
+    cred_table = Rex::Text::Table.new(
196 196
       'Header'  => 'Dolibarr User Credentials',
197 197
       'Indent'  => 1,
198 198
       'Columns' => ['Username', 'Password', 'Admin', 'E-mail']

+ 1
- 1
modules/auxiliary/gather/eaton_nsm_creds.rb View File

@@ -98,7 +98,7 @@ class MetasploitModule < Msf::Auxiliary
98 98
       return
99 99
     end
100 100
 
101
-    cred_table = Rex::Ui::Text::Table.new(
101
+    cred_table = Rex::Text::Table.new(
102 102
       'Header'  => 'Network Shutdown Module Credentials',
103 103
       'Indent'  => 1,
104 104
       'Columns' => ['Username', 'Password']

+ 1
- 1
modules/auxiliary/gather/eventlog_cred_disclosure.rb View File

@@ -90,7 +90,7 @@ class MetasploitModule < Msf::Auxiliary
90 90
       end
91 91
     end
92 92
 
93
-    cred_table = Rex::Ui::Text::Table.new(
93
+    cred_table = Rex::Text::Table.new(
94 94
       'Header'  => 'ManageEngine EventLog Analyzer Managed Devices Credentials',
95 95
       'Indent'  => 1,
96 96
       'Columns' =>

+ 1
- 1
modules/auxiliary/gather/hp_snac_domain_creds.rb View File

@@ -142,7 +142,7 @@ class MetasploitModule < Msf::Auxiliary
142 142
       return
143 143
     end
144 144
 
145
-    cred_table = Rex::Ui::Text::Table.new(
145
+    cred_table = Rex::Text::Table.new(
146 146
       'Header'  => 'Domain Controllers Credentials',
147 147
       'Indent'  => 1,
148 148
       'Columns' => ['Domain Controller', 'Username', 'Password']

+ 1
- 1
modules/auxiliary/gather/memcached_extractor.rb View File

@@ -134,7 +134,7 @@ class MetasploitModule < Msf::Auxiliary
134 134
       return if keys.size == 0
135 135
 
136 136
       data = data_for_keys(keys)
137
-      result_table = Rex::Ui::Text::Table.new(
137
+      result_table = Rex::Text::Table.new(
138 138
         'Header'  => "Keys/Values Found for #{peer}",
139 139
         'Indent'  => 1,
140 140
         'Columns' => [ 'Key', 'Value' ]

+ 1
- 1
modules/auxiliary/gather/shodan_search.rb View File

@@ -144,7 +144,7 @@ class MetasploitModule < Msf::Auxiliary
144 144
     end
145 145
 
146 146
     # Save the results to this table
147
-    tbl = Rex::Ui::Text::Table.new(
147
+    tbl = Rex::Text::Table.new(
148 148
       'Header'  => 'Search Results',
149 149
       'Indent'  => 1,
150 150
       'Columns' => ['IP:Port', 'City', 'Country', 'Hostname']

+ 1
- 1
modules/auxiliary/gather/vbulletin_vote_sqli.rb View File

@@ -189,7 +189,7 @@ class MetasploitModule < Msf::Auxiliary
189 189
     count_users = data.to_i
190 190
     print_good("#{count_users} users found. Collecting credentials...")
191 191
 
192
-    users_table = Rex::Ui::Text::Table.new(
192
+    users_table = Rex::Text::Table.new(
193 193
       'Header'  => 'vBulletin Users',
194 194
       'Indent'   => 1,
195 195
       'Columns' => ['Username', 'Password Hash', 'Salt']

+ 1
- 1
modules/auxiliary/scanner/dcerpc/windows_deployment_services.rb View File

@@ -91,7 +91,7 @@ class MetasploitModule < Msf::Auxiliary
91 91
       :info => "#{WDS_CONST::WDSCP_RPC_UUID} v1.0 Windows Deployment Services"
92 92
     )
93 93
 
94
-    table = Rex::Ui::Text::Table.new({
94
+    table = Rex::Text::Table.new({
95 95
       'Header' => 'Windows Deployment Services',
96 96
       'Indent' => 1,
97 97
       'Columns' => ['Architecture', 'Type', 'Domain', 'Username', 'Password']

+ 1
- 1
modules/auxiliary/scanner/http/jboss_status.rb View File

@@ -88,7 +88,7 @@ class MetasploitModule < Msf::Auxiliary
88 88
   def show_results(target_host)
89 89
     print_good("#{rhost}:#{rport} JBoss application server found")
90 90
 
91
-    req_table = Rex::Ui::Text::Table.new(
91
+    req_table = Rex::Text::Table.new(
92 92
       'Header'  => 'JBoss application server requests',
93 93
         'Indent'  => 1,
94 94
         'Columns' => ['Client', 'Vhost target', 'Request']

+ 1
- 1
modules/auxiliary/scanner/http/manageengine_deviceexpert_user_creds.rb View File

@@ -93,7 +93,7 @@ class MetasploitModule < Msf::Auxiliary
93 93
       workspace_id: myworkspace_id
94 94
     }
95 95
 
96
-    cred_table = Rex::Ui::Text::Table.new(
96
+    cred_table = Rex::Text::Table.new(
97 97
       'Header'  => 'ManageEngine DeviceExpert User Credentials',
98 98
       'Indent'  => 1,
99 99
       'Columns' =>

+ 4
- 4
modules/auxiliary/scanner/misc/dahua_dvr_auth_bypass.rb View File

@@ -128,7 +128,7 @@ class MetasploitModule < Msf::Auxiliary
128 128
     sock.put(DDNS)
129 129
     return unless (response = sock.get_once)
130 130
     data = response.split(/&&[0-1]&&/)
131
-    ddns_table = Rex::Ui::Text::Table.new(
131
+    ddns_table = Rex::Text::Table.new(
132 132
       'Header' => 'Dahua DDNS Settings',
133 133
       'Indent' => 1,
134 134
       'Columns' => ['Peer', 'DDNS Service', 'DDNS Server', 'DDNS Port', 'Domain', 'Username', 'Password']
@@ -186,7 +186,7 @@ class MetasploitModule < Msf::Auxiliary
186 186
     connect
187 187
     sock.put(CHANNELS)
188 188
     data = sock.get_once.split('&&')
189
-    channels_table = Rex::Ui::Text::Table.new(
189
+    channels_table = Rex::Text::Table.new(
190 190
       'Header' => 'Dahua Camera Channels',
191 191
       'Indent' => 1,
192 192
       'Columns' => ['ID', 'Peer', 'Channels']
@@ -206,7 +206,7 @@ class MetasploitModule < Msf::Auxiliary
206 206
     return unless (response = sock.get_once)
207 207
     data = response.split('&&')
208 208
     usercount = 0
209
-    users_table = Rex::Ui::Text::Table.new(
209
+    users_table = Rex::Text::Table.new(
210 210
       'Header' => 'Dahua Users Hashes and Rights',
211 211
       'Indent' => 1,
212 212
       'Columns' => ['Peer', 'Username', 'Password Hash', 'Groups', 'Permissions', 'Description']
@@ -237,7 +237,7 @@ class MetasploitModule < Msf::Auxiliary
237 237
     sock.put(GROUPS)
238 238
     return unless (response = sock.get_once)
239 239
     data = response.split('&&')
240
-    groups_table = Rex::Ui::Text::Table.new(
240
+    groups_table = Rex::Text::Table.new(
241 241
       'Header' => 'Dahua groups',
242 242
       'Indent' => 1,
243 243
       'Columns' => ['ID', 'Peer', 'Group']

+ 1
- 1
modules/auxiliary/scanner/misc/sunrpc_portmapper.rb View File

@@ -50,7 +50,7 @@ class MetasploitModule < Msf::Auxiliary
50 50
       return if maps.empty?
51 51
       vprint_good("Found #{maps.size} programs available")
52 52
 
53
-      table = Rex::Ui::Text::Table.new(
53
+      table = Rex::Text::Table.new(
54 54
         'Header'  => "SunRPC Programs for #{ip}",
55 55
         'Indent'  => 1,
56 56
         'Columns' => %w(Name Number Version Port Protocol)

+ 1
- 1
modules/auxiliary/scanner/mssql/mssql_hashdump.rb View File

@@ -110,7 +110,7 @@ class MetasploitModule < Msf::Auxiliary
110 110
           :proto => 'tcp'
111 111
           )
112 112
 
113
-    tbl = Rex::Ui::Text::Table.new(
113
+    tbl = Rex::Text::Table.new(
114 114
       'Header'  => 'MS SQL Server Hashes',
115 115
       'Indent'   => 1,
116 116
       'Columns' => ['Username', 'Hash']

+ 1
- 1
modules/auxiliary/scanner/mysql/mysql_authbypass_hashdump.rb View File

@@ -177,7 +177,7 @@ class MetasploitModule < Msf::Auxiliary
177 177
     end
178 178
 
179 179
     # Create a table to store data
180
-    tbl = Rex::Ui::Text::Table.new(
180
+    tbl = Rex::Text::Table.new(
181 181
       'Header'  => 'MysQL Server Hashes',
182 182
       'Indent'   => 1,
183 183
       'Columns' => ['Username', 'Hash']

+ 1
- 1
modules/auxiliary/scanner/oracle/oracle_hashdump.rb View File

@@ -55,7 +55,7 @@ class MetasploitModule < Msf::Auxiliary
55 55
 
56 56
 
57 57
 
58
-    tbl = Rex::Ui::Text::Table.new(
58
+    tbl = Rex::Text::Table.new(
59 59
       'Header'  => 'Oracle Server Hashes',
60 60
       'Indent'   => 1,
61 61
       'Columns' => ['Username', 'Hash']

+ 1
- 1
modules/auxiliary/scanner/postgres/postgres_hashdump.rb View File

@@ -94,7 +94,7 @@ class MetasploitModule < Msf::Auxiliary
94 94
     end
95 95
 
96 96
 
97
-    tbl = Rex::Ui::Text::Table.new(
97
+    tbl = Rex::Text::Table.new(
98 98
       'Header'  => 'Postgres Server Hashes',
99 99
       'Indent'   => 1,
100 100
       'Columns' => ['Username', 'Hash']

+ 2
- 2
modules/auxiliary/scanner/smb/smb_enumshares.rb View File

@@ -321,7 +321,7 @@ class MetasploitModule < Msf::Auxiliary
321 321
     write = false
322 322
 
323 323
     # Creating a separate file for each IP address's results.
324
-    detailed_tbl = Rex::Ui::Text::Table.new(
324
+    detailed_tbl = Rex::Text::Table.new(
325 325
       'Header'  => "Spidered results for #{ip}.",
326 326
       'Indent'  => 1,
327 327
       'Columns' => [ 'IP Address', 'Type', 'Share', 'Path', 'Name', 'Created', 'Accessed', 'Written', 'Changed', 'Size' ]
@@ -368,7 +368,7 @@ class MetasploitModule < Msf::Auxiliary
368 368
           header << "\\#{x.sub("C$","C$\\")}" if simple.client.default_name
369 369
           header << subdirs[0]
370 370
 
371
-          pretty_tbl = Rex::Ui::Text::Table.new(
371
+          pretty_tbl = Rex::Text::Table.new(
372 372
             'Header'  => header,
373 373
             'Indent'  => 1,
374 374
             'Columns' => [ 'Type', 'Name', 'Created', 'Accessed', 'Written', 'Changed', 'Size' ]

+ 1
- 1
modules/auxiliary/scanner/vmware/vmware_enum_permissions.rb View File

@@ -67,7 +67,7 @@ class MetasploitModule < Msf::Auxiliary
67 67
       when :error
68 68
         print_error "An error occured while trying to enumerate the permissions on #{ip}"
69 69
       else
70
-        tmp_perms = Rex::Ui::Text::Table.new(
70
+        tmp_perms = Rex::Text::Table.new(
71 71
             'Header'  => "Permissions for VMWare #{ip}",
72 72
             'Indent'  => 1,
73 73
             'Columns' => ['Name', 'IsAGroup', 'Role', 'Role Summary']

+ 4
- 4
modules/auxiliary/scanner/vmware/vmware_enum_users.rb View File

@@ -40,12 +40,12 @@ class MetasploitModule < Msf::Auxiliary
40 40
     if vim_do_login(datastore['USERNAME'], datastore['PASSWORD']) == :success
41 41
       # Get local Users and Groups
42 42
       user_list = vim_get_user_list(nil)
43
-      tmp_users = Rex::Ui::Text::Table.new(
43
+      tmp_users = Rex::Text::Table.new(
44 44
         'Header'  => "Users for server #{ip}",
45 45
         'Indent'  => 1,
46 46
         'Columns' => ['Name', 'Description']
47 47
       )
48
-      tmp_groups = Rex::Ui::Text::Table.new(
48
+      tmp_groups = Rex::Text::Table.new(
49 49
         'Header'  => "Groups for server #{ip}",
50 50
         'Indent'  => 1,
51 51
         'Columns' => ['Name', 'Description']
@@ -85,13 +85,13 @@ class MetasploitModule < Msf::Auxiliary
85 85
       else
86 86
         # Enumerate Domain Users and Groups
87 87
         esx_domains.each do |domain|
88
-          tmp_dusers = Rex::Ui::Text::Table.new(
88
+          tmp_dusers = Rex::Text::Table.new(
89 89
             'Header'  => "Users for domain #{domain}",
90 90
             'Indent'  => 1,
91 91
             'Columns' => ['Name', 'Description']
92 92
           )
93 93
 
94
-          tmp_dgroups = Rex::Ui::Text::Table.new(
94
+          tmp_dgroups = Rex::Text::Table.new(
95 95
             'Header'  => "Groups for domain #{domain}",
96 96
             'Indent'  => 1,
97 97
             'Columns' => ['Name', 'Description']

+ 1
- 1
modules/exploits/windows/mssql/mssql_linkcrawler.rb View File

@@ -111,7 +111,7 @@ class MetasploitModule < Msf::Exploit::Remote
111 111
     master..sysservers where dataaccess=1 and srvname!=@@servername and srvproduct = 'SQL Server')as linkcount"
112 112
 
113 113
     # Create loot table to store configuration information from crawled database server links
114
-    linked_server_table = Rex::Ui::Text::Table.new(
114
+    linked_server_table = Rex::Text::Table.new(
115 115
       'Header'  => 'Linked Server Table',
116 116
       'Indent'   => 1,
117 117
       'Columns' => ['db_server', 'db_version', 'db_os', 'link_server', 'link_user', 'link_privilege', 'link_version', 'link_os','link_state']

+ 1
- 1
modules/post/linux/gather/enum_psk.rb View File

@@ -52,7 +52,7 @@ class MetasploitModule < Msf::Post
52 52
   end
53 53
 
54 54
   def extract_all_creds
55
-    tbl = Rex::Ui::Text::Table.new({
55
+    tbl = Rex::Text::Table.new({
56 56
       'Header'  => '802-11-wireless-security',
57 57
       'Columns' => ['AccessPoint-Name', 'PSK'],
58 58
       'Indent'  => 1,

+ 1
- 1
modules/post/linux/gather/mount_cifs_creds.rb View File

@@ -29,7 +29,7 @@ class MetasploitModule < Msf::Post
29 29
     # where we'll store hashes of found credentials while parsing.  reporting is done at the end.
30 30
     creds = []
31 31
     # A table to store the found credentials for loot storage afterward
32
-    cred_table = Rex::Ui::Text::Table.new(
32
+    cred_table = Rex::Text::Table.new(
33 33
     'Header'    => "mount.cifs credentials",
34 34
     'Indent'    => 1,
35 35
     'Columns'   =>

+ 1
- 1
modules/post/linux/gather/pptpd_chap_secrets.rb View File

@@ -85,7 +85,7 @@ class MetasploitModule < Msf::Post
85 85
   # Extracts client, server, secret, and IP addresses
86 86
   #
87 87
   def extract_secrets(data)
88
-    tbl = Rex::Ui::Text::Table.new({
88
+    tbl = Rex::Text::Table.new({
89 89
       'Header'  => 'PPTPd chap-secrets',
90 90
       'Indent'  => 1,
91 91
       'Columns' => ['Client', 'Server', 'Secret', 'IP']

+ 1
- 1
modules/post/multi/gather/check_malware.rb View File

@@ -81,7 +81,7 @@ class MetasploitModule < Msf::Post
81 81
     print_status("#{rhost} - SHA1: #{sha1}")     unless sha1.blank?
82 82
     print_status("#{rhost} - SHA256: #{sha256}") unless sha256.blank?
83 83
 
84
-    tbl = Rex::Ui::Text::Table.new(
84
+    tbl = Rex::Text::Table.new(
85 85
       'Header'  => "Analysis Report: #{filename} (#{res['positives']} / #{res['total']}): #{res['sha256']}",
86 86
       'Indent'  => 1,
87 87
       'Columns' => ['Antivirus', 'Detected', 'Version', 'Result', 'Update']

+ 2
- 2
modules/post/multi/gather/dbvis_enum.rb View File

@@ -112,7 +112,7 @@ class MetasploitModule < Msf::Post
112 112
   # New config file parse function
113 113
   def parse_new_config_file(raw_xml)
114 114
 
115
-    db_table = Rex::Ui::Text::Table.new(
115
+    db_table = Rex::Text::Table.new(
116 116
     'Header'    => "DbVisualizer Databases",
117 117
     'Indent'    => 2,
118 118
     'Columns'   =>
@@ -219,7 +219,7 @@ class MetasploitModule < Msf::Post
219 219
   # New config file parse function
220 220
   def parse_old_config_file(raw_xml)
221 221
 
222
-    db_table = Rex::Ui::Text::Table.new(
222
+    db_table = Rex::Text::Table.new(
223 223
     'Header'    => 'DbVisualizer Databases',
224 224
     'Indent'    => 2,
225 225
     'Columns'   =>

+ 1
- 1
modules/post/multi/gather/fetchmailrc_creds.rb View File

@@ -26,7 +26,7 @@ class MetasploitModule < Msf::Post
26 26
 
27 27
   def run
28 28
     # A table to store the found credentials.
29
-    cred_table = Rex::Ui::Text::Table.new(
29
+    cred_table = Rex::Text::Table.new(
30 30
     'Header'    => ".fetchmailrc credentials",
31 31
     'Indent'    => 1,
32 32
     'Columns'   =>

+ 1
- 1
modules/post/multi/gather/firefox_creds.rb View File

@@ -663,7 +663,7 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
663 663
     file_rm(@paths['loot'])
664 664
 
665 665
     # Create table to store
666
-    cred_table = Rex::Ui::Text::Table.new(
666
+    cred_table = Rex::Text::Table.new(
667 667
       'Header' => 'Firefox Credentials',
668 668
       'Indent' => 1,
669 669
       'Columns'=>

+ 2
- 2
modules/post/multi/gather/lastpass_creds.rb View File

@@ -376,7 +376,7 @@ class MetasploitModule < Msf::Post
376 376
 
377 377
   # Print all extracted LastPass data
378 378
   def print_lastpass_data(account_map)
379
-    lastpass_data_table = Rex::Ui::Text::Table.new(
379
+    lastpass_data_table = Rex::Text::Table.new(
380 380
       'Header' => "LastPass Accounts",
381 381
       'Indent' => 1,
382 382
       'Columns' => %w(Account LP_Username LP_Password LP_2FA LP_Key)
@@ -662,7 +662,7 @@ class MetasploitModule < Msf::Post
662 662
     account_map.each_pair do |account, browser_map|
663 663
       browser_map.each_pair do |browser, lp_data|
664 664
         lp_data['lp_creds'].each_pair do |username, user_data|
665
-          lastpass_vault_data_table = Rex::Ui::Text::Table.new(
665
+          lastpass_vault_data_table = Rex::Text::Table.new(
666 666
             'Header' => "Decrypted vault from #{username}",
667 667
             'Indent' => 1,
668 668
             'Columns' => %w(URL Username Password)

+ 1
- 1
modules/post/multi/gather/netrc_creds.rb View File

@@ -25,7 +25,7 @@ class MetasploitModule < Msf::Post
25 25
 
26 26
   def run
27 27
     # A table to store the found credentials.
28
-    cred_table = Rex::Ui::Text::Table.new(
28
+    cred_table = Rex::Text::Table.new(
29 29
     'Header'    => ".netrc credentials",
30 30
     'Indent'    => 1,
31 31
     'Columns'   =>

+ 1
- 1
modules/post/multi/gather/pgpass_creds.rb View File

@@ -66,7 +66,7 @@ class MetasploitModule < Msf::Post
66 66
 
67 67
   # Store the creds to
68 68
   def parse_creds(f)
69
-    cred_table = Rex::Ui::Text::Table.new(
69
+    cred_table = Rex::Text::Table.new(
70 70
       'Header'  => 'Postgres Data',
71 71
       'Indent'  => 1,
72 72
       'Columns' => ['Host', 'Port', 'DB', 'User', 'Password']

+ 2
- 2
modules/post/multi/gather/pidgin_cred.rb View File

@@ -130,7 +130,7 @@ class MetasploitModule < Msf::Post
130 130
     end
131 131
 
132 132
     data = ""
133
-    credentials = Rex::Ui::Text::Table.new(
133
+    credentials = Rex::Text::Table.new(
134 134
     'Header'    => "Pidgin Credentials",
135 135
     'Indent'    => 1,
136 136
     'Columns'   =>
@@ -143,7 +143,7 @@ class MetasploitModule < Msf::Post
143 143
       "Port"
144 144
     ])
145 145
 
146
-    buddylists = Rex::Ui::Text::Table.new(
146
+    buddylists = Rex::Text::Table.new(
147 147
     'Header'    => "Pidgin Contact List",
148 148
     'Indent'    => 1,
149 149
     'Columns'   =>

+ 1
- 1
modules/post/multi/gather/remmina_creds.rb View File

@@ -33,7 +33,7 @@ class MetasploitModule < Msf::Post
33 33
       vprint_status('No Reminna credentials collected')
34 34
     else
35 35
       vprint_good("Collected #{creds.size} sets of Remmina credentials")
36
-      cred_table = Rex::Ui::Text::Table.new(
36
+      cred_table = Rex::Text::Table.new(
37 37
         'Header'  => 'Remmina Credentials',
38 38
         'Indent'  => 1,
39 39
         'Columns' => %w(Host Port Service User Password)

+ 1
- 1
modules/post/multi/gather/resolve_hosts.rb View File

@@ -61,7 +61,7 @@ class MetasploitModule < Msf::Post
61 61
 
62 62
     response = client.net.resolve.resolve_hosts(hosts, family)
63 63
 
64
-    table = Rex::Ui::Text::Table.new(
64
+    table = Rex::Text::Table.new(
65 65
       'Indent' => 0,
66 66
       'SortIndex' => -1,
67 67
       'Columns' =>

+ 1
- 1
modules/post/multi/gather/rsyncd_creds.rb View File

@@ -42,7 +42,7 @@ class MetasploitModule < Msf::Post
42 42
 
43 43
   def dump_rsync_secrets(config_file)
44 44
     vprint_status("Attempting to get RSYNC creds from #{config_file}")
45
-    creds_table = Rex::Ui::Text::Table.new(
45
+    creds_table = Rex::Text::Table.new(
46 46
       'Header' => "RSYNC credentials from #{config_file}",
47 47
       'Columns' => %w(Username Password Module)
48 48
     )

+ 1
- 1
modules/post/multi/gather/thunderbird_creds.rb View File

@@ -165,7 +165,7 @@ class MetasploitModule < Msf::Post
165 165
     end
166 166
 
167 167
     # Create a rex table to store our data
168
-    tbl = Rex::Ui::Text::Table.new(
168
+    tbl = Rex::Text::Table.new(
169 169
       'Header'  => 'Thunderbird login data',
170 170
       'Indent'  => 1,
171 171
       'Columns' =>

+ 1
- 1
modules/post/osx/gather/safari_lastsession.rb View File

@@ -157,7 +157,7 @@ class MetasploitModule < Msf::Post
157 157
   # Runs the module
158 158
   #
159 159
   def run
160
-    cred_tbl = Rex::Ui::Text::Table.new({
160
+    cred_tbl = Rex::Text::Table.new({
161 161
       'Header'  => 'Credentials',
162 162
       'Indent'  => 1,
163 163
       'Columns' => ['Domain', 'Username', 'Password']

+ 1
- 1
modules/post/windows/gather/cachedump.rb View File

@@ -271,7 +271,7 @@ class MetasploitModule < Msf::Post
271 271
 
272 272
 
273 273
   def run
274
-    @credentials = Rex::Ui::Text::Table.new(
274
+    @credentials = Rex::Text::Table.new(
275 275
     'Header'    => "MSCACHE Credentials",
276 276
     'Indent'    => 1,
277 277
     'Columns'   =>

+ 1
- 1
modules/post/windows/gather/credentials/bulletproof_ftp.rb View File

@@ -290,7 +290,7 @@ class MetasploitModule < Msf::Post
290 290
     end
291 291
 
292 292
     # Report / Show findings
293
-    @credentials = Rex::Ui::Text::Table.new(
293
+    @credentials = Rex::Text::Table.new(
294 294
       'Header'    => "BulletProof FTP Client Bookmarks",
295 295
       'Indent'    => 1,
296 296
       'Columns'   =>

+ 2
- 2
modules/post/windows/gather/credentials/dyndns.rb View File

@@ -123,13 +123,13 @@ class MetasploitModule < Msf::Post
123 123
   #
124 124
   def do_report(data)
125 125
 
126
-    tbl  = Rex::Ui::Text::Table.new(
126
+    tbl  = Rex::Text::Table.new(
127 127
       'Header'  => 'DynDNS Client Data',
128 128
       'Indent'  => 1,
129 129
       'Columns' => ['Field', 'Value']
130 130
     )
131 131
 
132
-    creds  = Rex::Ui::Text::Table.new(
132
+    creds  = Rex::Text::Table.new(
133 133
       'Header'  => 'DynDNS Credentials',
134 134
       'Indent'  => 1,
135 135
       'Columns' => ['User', 'Password']

+ 2
- 2
modules/post/windows/gather/credentials/enum_laps.rb View File

@@ -75,11 +75,11 @@ class MetasploitModule < Msf::Post
75 75
   # the database if datastore option STORE_DB is true.
76 76
   #
77 77
   # @param [Array<Array<Hash>>] the LDAP query results to parse
78
-  # @return [Rex::Ui::Text::Table] the table containing all the result data
78
+  # @return [Rex::Text::Table] the table containing all the result data
79 79
   def parse_results(results)
80 80
     laps_results = []
81 81
     # Results table holds raw string data
82
-    results_table = Rex::Ui::Text::Table.new(
82
+    results_table = Rex::Text::Table.new(
83 83
       'Header'     => 'Local Administrator Password Solution (LAPS) Results',
84 84
       'Indent'     => 1,
85 85
       'SortIndex'  => -1,

+ 1
- 1
modules/post/windows/gather/credentials/enum_picasa_pwds.rb View File

@@ -73,7 +73,7 @@ class MetasploitModule < Msf::Post
73 73
       username = registry_getvaldata("HKCU\\Software\\Google\\Picasa\\Picasa2\\Preferences\\", 'GaiaEmail') || ''
74 74
       password = registry_getvaldata("HKCU\\Software\\Google\\Picasa\\Picasa2\\Preferences\\", 'GaiaPass')  || ''
75 75
 
76
-      credentials = Rex::Ui::Text::Table.new(
76
+      credentials = Rex::Text::Table.new(
77 77
           'Header'    => "Picasa Credentials",
78 78
           'Indent'    => 1,
79 79
           'Columns'   =>

+ 4
- 4
modules/post/windows/gather/credentials/filezilla_server.rb View File

@@ -103,7 +103,7 @@ class MetasploitModule < Msf::Post
103 103
   def get_filezilla_creds(paths)
104 104
     fs_xml  = ""   # FileZilla Server.xml           - Settings for the local install
105 105
     fsi_xml = ""   # FileZilla Server Interface.xml - Last server used with the interface
106
-    credentials = Rex::Ui::Text::Table.new(
106
+    credentials = Rex::Text::Table.new(
107 107
     'Header'    => "FileZilla FTP Server Credentials",
108 108
     'Indent'    => 1,
109 109
     'Columns'   =>
@@ -115,7 +115,7 @@ class MetasploitModule < Msf::Post
115 115
       "SSL"
116 116
     ])
117 117
 
118
-    permissions = Rex::Ui::Text::Table.new(
118
+    permissions = Rex::Text::Table.new(
119 119
     'Header'    => "FileZilla FTP Server Permissions",
120 120
     'Indent'    => 1,
121 121
     'Columns'   =>
@@ -135,7 +135,7 @@ class MetasploitModule < Msf::Post
135 135
       "Home"
136 136
     ])
137 137
 
138
-    configuration = Rex::Ui::Text::Table.new(
138
+    configuration = Rex::Text::Table.new(
139 139
     'Header'      => "FileZilla FTP Server Configuration",
140 140
     'Indent'      => 1,
141 141
     'Columns'     =>
@@ -150,7 +150,7 @@ class MetasploitModule < Msf::Post
150 150
       "SSL Key Password"
151 151
     ])
152 152
 
153
-    lastserver = Rex::Ui::Text::Table.new(
153
+    lastserver = Rex::Text::Table.new(
154 154
     'Header'   => "FileZilla FTP Last Server",
155 155
     'Indent'   => 1,
156 156
     'Columns'  =>

+ 1
- 1
modules/post/windows/gather/credentials/idm.rb View File

@@ -32,7 +32,7 @@ class MetasploitModule < Msf::Post
32 32
   end
33 33
 
34 34
   def run
35
-    creds = Rex::Ui::Text::Table.new(
35
+    creds = Rex::Text::Table.new(
36 36
         'Header'  => 'Internet Downloader Manager Credentials',
37 37
         'Indent'   => 1,
38 38
         'Columns' =>

+ 1
- 1
modules/post/windows/gather/credentials/imail.rb View File

@@ -140,7 +140,7 @@ class MetasploitModule < Msf::Post
140 140
   end
141 141
 
142 142
   def report(users)
143
-    credentials = Rex::Ui::Text::Table.new(
143
+    credentials = Rex::Text::Table.new(
144 144
       'Header'  => 'Ipswitch iMail User Credentials',
145 145
       'Indent'   => 1,
146 146
       'Columns' =>

+ 1
- 1
modules/post/windows/gather/credentials/imvu.rb View File

@@ -37,7 +37,7 @@ class MetasploitModule < Msf::Post
37 37
 
38 38
   def run
39 39
 
40
-    creds = Rex::Ui::Text::Table.new(
40
+    creds = Rex::Text::Table.new(
41 41
       'Header' => 'IMVU Credentials',
42 42
       'Indent' => 1,
43 43
       'Columns' =>[

+ 1
- 1
modules/post/windows/gather/credentials/meebo.rb View File

@@ -42,7 +42,7 @@ class MetasploitModule < Msf::Post
42 42
 
43 43
   def parse_txt(file)
44 44
     begin
45
-      creds = Rex::Ui::Text::Table.new(
45
+      creds = Rex::Text::Table.new(
46 46
         'Header'  => 'Meebo Instant Messenger Credentials',
47 47
         'Indent'	=> 1,
48 48
         'Columns' =>

+ 1
- 1
modules/post/windows/gather/credentials/nimbuzz.rb View File

@@ -29,7 +29,7 @@ class MetasploitModule < Msf::Post
29 29
   end
30 30
 
31 31
   def run
32
-    creds = Rex::Ui::Text::Table.new(
32
+    creds = Rex::Text::Table.new(
33 33
       'Header'  => 'Nimbuzz Instant Messenger Credentials',
34 34
       'Indent'   => 1,
35 35
       'Columns' =>

+ 1
- 1
modules/post/windows/gather/credentials/razorsql.rb View File

@@ -76,7 +76,7 @@ class MetasploitModule < Msf::Post
76 76
 
77 77
   def run
78 78
     print_status("Checking All Users...")
79
-    creds_tbl = Rex::Ui::Text::Table.new(
79
+    creds_tbl = Rex::Text::Table.new(
80 80
       'Header'  => 'RazorSQL User Credentials',
81 81
       'Indent'  => 1,
82 82
       'Columns' =>

+ 1
- 1
modules/post/windows/gather/credentials/sso.rb View File

@@ -76,7 +76,7 @@ class MetasploitModule < Msf::Post
76 76
       vprint_error("LiveSSP credentials not present")
77 77
     end
78 78
 
79
-    table = Rex::Ui::Text::Table.new(
79
+    table = Rex::Text::Table.new(
80 80
       'Header' => "Windows SSO Credentials",
81 81
       'Indent' => 0,
82 82
       'SortIndex' => 0,

+ 1
- 1
modules/post/windows/gather/credentials/trillian.rb View File

@@ -54,7 +54,7 @@ class MetasploitModule < Msf::Post
54 54
         return
55 55
       end
56 56
 
57
-      creds = Rex::Ui::Text::Table.new(
57
+      creds = Rex::Text::Table.new(
58 58
         'Header'  => 'Trillian versions 4-5 Instant Messenger Credentials',
59 59
         'Indent'	=> 1,
60 60
         'Columns' =>

+ 1
- 1
modules/post/windows/gather/dnscache_dump.rb View File

@@ -17,7 +17,7 @@ class MetasploitModule < Msf::Post
17 17
   end
18 18
 
19 19
   def run
20
-    rtable = Rex::Ui::Text::Table.new(
20
+    rtable = Rex::Text::Table.new(
21 21
       'Header' => 'DNS Cached Entries',
22 22
       'Indent' =>  3,
23 23
       'Columns' => ['TYPE', 'DOMAIN']

+ 1
- 1
modules/post/windows/gather/enum_ad_bitlocker.rb View File

@@ -53,7 +53,7 @@ class MetasploitModule < Msf::Post
53 53
     end
54 54
 
55 55
     # Results table holds raw string data
56
-    results_table = Rex::Ui::Text::Table.new(
56
+    results_table = Rex::Text::Table.new(
57 57
       'Header'     => 'BitLocker Recovery Passwords',
58 58
       'Indent'     => 1,
59 59
       'SortIndex'  => -1,

+ 1
- 1
modules/post/windows/gather/enum_ad_computers.rb View File

@@ -71,7 +71,7 @@ class MetasploitModule < Msf::Post
71 71
     return if q.nil? or q[:results].empty?
72 72
 
73 73
     # Results table holds raw string data
74
-    results_table = Rex::Ui::Text::Table.new(
74
+    results_table = Rex::Text::Table.new(
75 75
       'Header'     => "Domain Computers",
76 76
       'Indent'     => 1,
77 77
       'SortIndex'  => -1,

+ 2
- 2
modules/post/windows/gather/enum_ad_groups.rb View File

@@ -69,10 +69,10 @@ class MetasploitModule < Msf::Post
69 69
   # the database.
70 70
   #
71 71
   # @param [Array<Array<Hash>>] the LDAP query results to parse
72
-  # @return [Rex::Ui::Text::Table] the table containing all the result data
72
+  # @return [Rex::Text::Table] the table containing all the result data
73 73
   def parse_results(results)
74 74
     # Results table holds raw string data
75
-    results_table = Rex::Ui::Text::Table.new(
75
+    results_table = Rex::Text::Table.new(
76 76
       'Header'     => "Domain Groups",
77 77
       'Indent'     => 1,
78 78
       'SortIndex'  => -1,

+ 1
- 1
modules/post/windows/gather/enum_ad_managedby_groups.rb View File

@@ -75,7 +75,7 @@ class MetasploitModule < Msf::Post
75 75
 
76 76
   # Takes the results of LDAP query, parses them into a table
77 77
   def parse_results(results)
78
-    results_table = Rex::Ui::Text::Table.new(
78
+    results_table = Rex::Text::Table.new(
79 79
       'Header'     => "Groups with Managers",
80 80
       'Indent'     => 1,
81 81
       'SortIndex'  => -1,

+ 1
- 1
modules/post/windows/gather/enum_ad_service_principal_names.rb View File

@@ -74,7 +74,7 @@ class MetasploitModule < Msf::Post
74 74
     fields << "Host"
75 75
 
76 76
     # Results table holds raw string data
77
-    results_table = Rex::Ui::Text::Table.new(
77
+    results_table = Rex::Text::Table.new(
78 78
       'Header'     => "Service Principal Names",
79 79
       'Indent'     => 1,
80 80
       'SortIndex'  => -1,

+ 1
- 1
modules/post/windows/gather/enum_ad_user_comments.rb View File

@@ -53,7 +53,7 @@ class MetasploitModule < Msf::Post
53 53
     end
54 54
 
55 55
     # Results table holds raw string data
56
-    results_table = Rex::Ui::Text::Table.new(
56
+    results_table = Rex::Text::Table.new(
57 57
         'Header'     => "Domain Users",
58 58
         'Indent'     => 1,
59 59
         'SortIndex'  => -1,

+ 2
- 2
modules/post/windows/gather/enum_ad_users.rb View File

@@ -105,12 +105,12 @@ class MetasploitModule < Msf::Post
105 105
   # the database.
106 106
   #
107 107
   # @param [Array<Array<Hash>>] the LDAP query results to parse
108
-  # @return [Rex::Ui::Text::Table] the table containing all the result data
108
+  # @return [Rex::Text::Table] the table containing all the result data
109 109
   def parse_results(results)
110 110
     domain = datastore['DOMAIN'] || get_domain
111 111
     domain_ip = client.net.resolve.resolve_host(domain)[:ip]
112 112
     # Results table holds raw string data
113
-    results_table = Rex::Ui::Text::Table.new(
113
+    results_table = Rex::Text::Table.new(
114 114
       'Header'     => "Domain Users",
115 115
       'Indent'     => 1,
116 116
       'SortIndex'  => -1,

+ 1
- 1
modules/post/windows/gather/enum_applications.rb View File

@@ -23,7 +23,7 @@ class MetasploitModule < Msf::Post
23 23
   end
24 24
 
25 25
   def app_list
26
-    tbl = Rex::Ui::Text::Table.new(
26
+    tbl = Rex::Text::Table.new(
27 27
       'Header'  => "Installed Applications",
28 28
       'Indent'  => 1,
29 29
       'Columns' =>

+ 1
- 1
modules/post/windows/gather/enum_av_excluded.rb View File

@@ -99,7 +99,7 @@ class MetasploitModule < Msf::Post
99 99
       print_status("No #{exclusion_type} exclusions for #{product}")
100 100
       return
101 101
     end
102
-    table = Rex::Ui::Text::Table.new(
102
+    table = Rex::Text::Table.new(
103 103
       'Header'    => "#{product} excluded #{exclusion_type.pluralize}",
104 104
       'Indent'    => 1,
105 105
       'Columns'   => [ exclusion_type.capitalize ]

+ 1
- 1
modules/post/windows/gather/enum_chrome.rb View File

@@ -131,7 +131,7 @@ class MetasploitModule < Msf::Post
131 131
 
132 132
   def process_files(username)
133 133
     secrets = ""
134
-    decrypt_table = Rex::Ui::Text::Table.new(
134
+    decrypt_table = Rex::Text::Table.new(
135 135
       "Header"  => "Decrypted data",
136 136
       "Indent"  => 1,
137 137
       "Columns" => ["Name", "Decrypted Data", "Origin"]

+ 1
- 1
modules/post/windows/gather/enum_computers.rb View File

@@ -76,7 +76,7 @@ class MetasploitModule < Msf::Post
76 76
   end
77 77
 
78 78
   def list_computers(domain,hosts)
79
-    tbl = Rex::Ui::Text::Table.new(
79
+    tbl = Rex::Text::Table.new(
80 80
       'Header'  => "List of Domain Hosts for the primary Domain.",
81 81
       'Indent'  => 1,
82 82
       'Columns' =>

+ 1
- 1
modules/post/windows/gather/enum_db.rb View File

@@ -56,7 +56,7 @@ class MetasploitModule < Msf::Post
56 56
 
57 57
     print_status("Done, Databases Found.")
58 58
 
59
-    tbl = Rex::Ui::Text::Table.new(
59
+    tbl = Rex::Text::Table.new(
60 60
       'Header'  => "Installed Databases",
61 61
       'Indent'  => 1,
62 62
       'Columns' =>

+ 1
- 1
modules/post/windows/gather/enum_devices.rb View File

@@ -28,7 +28,7 @@ class MetasploitModule < Msf::Post
28 28
   end
29 29
 
30 30
   def list
31
-    tbl = Rex::Ui::Text::Table.new(
31
+    tbl = Rex::Text::Table.new(
32 32
       'Header'  => "Device Information",
33 33
       'Indent'  => 1,
34 34
       'Columns' =>

+ 0
- 0
modules/post/windows/gather/enum_domain_tokens.rb View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save