Merge pull request rapid7#20100 from bcoles/rubocop-modules-post-windows-gather

modules/post/windows/gather: Resolve RuboCop violations

Author: jheysel-r7

modules/post/windows/gather/ad_to_sqlite.rb

@@ -23,7 +23,12 @@ def initialize(info = {})
           'Stuart Morgan <stuart.morgan[at]mwrinfosecurity.com>'
         ],
         'Platform' => [ 'win' ],
-        'SessionTypes' => [ 'meterpreter' ]
+        'SessionTypes' => [ 'meterpreter' ],
+        'Notes' => {
+          'Stability' => [CRASH_SAFE],
+          'SideEffects' => [],
+          'Reliability' => []
+        }
       )
     )
 
@@ -35,15 +40,14 @@ def initialize(info = {})
     ])
   end
 
-  # Entry point
   def run
     max_search = datastore['MAX_SEARCH']
 
     db, dbfile = create_sqlite_db
-    print_status "Temporary database created: #{dbfile.path}"
+    print_status("Temporary database created: #{dbfile.path}")
 
     # Download the list of groups from Active Directory
-    vprint_status 'Retrieving AD Groups'
+    vprint_status('Retrieving AD Groups')
     begin
       group_fields = ['distinguishedName', 'objectSid', 'samAccountType', 'sAMAccountName', 'whenChanged', 'whenCreated', 'description', 'groupType', 'adminCount', 'comment', 'managedBy', 'cn']
       if datastore['GROUP_FILTER'].nil? || datastore['GROUP_FILTER'].empty?
@@ -64,8 +68,8 @@ def run
     end
 
     # Go through each of the groups and identify the individual users in each group
-    vprint_status "Groups retrieval completed: #{groups[:results].size} group(s)"
-    vprint_status 'Retrieving AD Group Membership'
+    vprint_status("Groups retrieval completed: #{groups[:results].size} group(s)")
+    vprint_status('Retrieving AD Group Membership')
     users_fields = ['distinguishedName', 'objectSid', 'sAMAccountType', 'sAMAccountName', 'displayName', 'description', 'logonCount', 'userAccountControl', 'userPrincipalName', 'whenChanged', 'whenCreated', 'primaryGroupID', 'badPwdCount', 'comment', 'title', 'cn', 'adminCount', 'manager']
 
     remaining_groups = groups[:results]
@@ -254,7 +258,7 @@ def run
       group_gather.map(&:join)
     end
 
-    vprint_status 'Retrieving computers'
+    vprint_status('Retrieving computers')
     begin
       computer_filter = '(objectClass=computer)'
       computer_fields = ['distinguishedName', 'objectSid', 'cn', 'dNSHostName', 'sAMAccountType', 'sAMAccountName', 'displayName', 'logonCount', 'userAccountControl', 'whenChanged', 'whenCreated', 'primaryGroupID', 'badPwdCount', 'operatingSystem', 'operatingSystemServicePack', 'operatingSystemVersion', 'description', 'comment']

modules/post/windows/gather/arp_scanner.rb

@@ -14,13 +14,18 @@ def initialize(info = {})
         info,
         'Name' => 'Windows Gather ARP Scanner',
         'Description' => %q{
-          This Module will perform an ARP scan for a given IP range through a
-          Meterpreter Session.
+          This module will perform an ARP scan for a given IP range through a
+          Meterpreter session.
         },
         'License' => MSF_LICENSE,
         'Author' => [ 'Carlos Perez <carlos_perez[at]darkoperator.com>'],
         'Platform' => [ 'win' ],
         'SessionTypes' => [ 'meterpreter'],
+        'Notes' => {
+          'Stability' => [CRASH_SAFE],
+          'SideEffects' => [],
+          'Reliability' => []
+        },
         'Compat' => {
           'Meterpreter' => {
             'Commands' => %w[
@@ -34,14 +39,13 @@ def initialize(info = {})
       [
         OptString.new('RHOSTS', [true, 'The target address range or CIDR identifier', nil]),
         OptInt.new('THREADS', [false, 'The number of concurrent threads', 10])
-
       ]
     )
   end
 
-  # Run Method for when run command is issued
   def run
-    print_status("Running module against #{sysinfo['Computer']}")
+    hostname = sysinfo.nil? ? cmd_exec('hostname') : sysinfo['Computer']
+    print_status("Running module against #{hostname} (#{session.session_host})")
     arp_scan(datastore['RHOSTS'], datastore['THREADS'])
   end
 
@@ -63,7 +67,7 @@ def arp_scan(cidr, threads)
       iplst << ipa
     end
 
-    while (!iplst.nil? && !iplst.empty?)
+    while !iplst.nil? && !iplst.empty?
       a = []
       1.upto(threads) do
         a << framework.threads.spawn("Module(#{refname})", false, iplst.shift) do |ip_text|

modules/post/windows/gather/bitcoin_jacker.rb

@@ -26,6 +26,11 @@ def initialize(info = {})
         ],
         'Platform' => [ 'win' ], # TODO: Several more platforms host Bitcoin wallets...
         'SessionTypes' => [ 'meterpreter' ],
+        'Notes' => {
+          'Stability' => [CRASH_SAFE],
+          'SideEffects' => [],
+          'Reliability' => []
+        },
         'Compat' => {
           'Meterpreter' => {
             'Commands' => %w[
@@ -90,7 +95,7 @@ def jack_wallet(wallet_path)
 
     begin
       data = read_file(wallet_path) || ''
-    rescue ::Exception => e
+    rescue StandardError => e
       print_error("Failed to download #{wallet_path}: #{e.class} #{e}")
       return
     end

modules/post/windows/gather/bitlocker_fvek.rb

@@ -26,8 +26,13 @@ def initialize(info = {})
         'Author' => ['Danil Bazin <danil.bazin[at]hsc.fr>'], # @danilbaz
         'References' => [
           ['URL', 'https://github.com/libyal/libbde/blob/master/documentation/BitLocker Drive Encryption (BDE) format.asciidoc'],
-          ['URL', 'http://www.hsc.fr/ressources/outils/dislocker/']
+          ['URL', 'https://web.archive.org/web/20170914195545/http://www.hsc.fr/ressources/outils/dislocker/'],
         ],
+        'Notes' => {
+          'Stability' => [CRASH_SAFE],
+          'SideEffects' => [],
+          'Reliability' => []
+        },
         'Compat' => {
           'Meterpreter' => {
             'Commands' => %w[
@@ -129,7 +134,7 @@ def run
       if !fvek.blank?
         stored_path = store_loot('windows.file', 'application/octet-stream',
                                  session, fvek)
-        print_good("Successfuly extract FVEK in #{stored_path}")
+        print_good("Successfully extracted FVEK in #{stored_path}")
         print_good('This hard drive could later be decrypted using : dislocker -k <key_file> ...')
       else
         print_error('Failed to generate FVEK, wrong recovery key?')