This fixes a few things, see commit message for more info

This commit fixes the following:

1. Not handling eval_host()'s nil file return value, which can causes
   a NoMethodError at runtime due to various conditions.
2. Renames datastore option VERBOSE to ShowFiles to pass msftidy
3. Avoids overwriting datastore options directly to pass msftidy

Author: wchen-r7

modules/auxiliary/scanner/smb/smb_enumshares.rb

@@ -46,7 +46,7 @@ def initialize(info={})
     register_options(
       [
         OptBool.new('SpiderShares',      [false, 'Spider shares recursively', false]),
-        OptBool.new('VERBOSE',        [true, 'Show detailed information when spidering', false]),
+        OptBool.new('ShowFiles',        [true, 'Show detailed information when spidering', false]),
         OptBool.new('SpiderProfiles',  [false, 'Spider only user profiles when share = C$', true]),
         OptEnum.new('LogSpider',      [false, '0 = disabled, 1 = CSV, 2 = table (txt), 3 = one liner (txt)', 3, [0,1,2,3]]),
         OptInt.new('MaxDepth',      [true, 'Max number of subdirectories to spider', 999]),
@@ -188,7 +188,7 @@ def lanman_netshareenum(ip, rport, info)
     rescue ::Rex::Proto::SMB::Exceptions::ErrorCode => e
       if e.error_code == 0xC00000BB
         vprint_error("#{ip}:#{rport} - Got 0xC00000BB while enumerating shares, switching to srvsvc...")
-        datastore['USE_SRVSVC_ONLY'] = true # Make sure the module is aware of this state
+        @srvsvc = true # Make sure the module is aware of this state
         return srvsvc_netshareenum(ip)
       end
     end
@@ -287,6 +287,8 @@ def get_user_dirs(ip, share, base, sub_dirs)
 
     begin
       read,write,type,files = eval_host(ip, share, base)
+      # files or type could return nil due to various conditions
+      return dirs if files.nil?
       files.each do |f|
         if f[0] != "." and f[0] != ".."
           usernames.push(f[0])
@@ -299,7 +301,6 @@ def get_user_dirs(ip, share, base, sub_dirs)
       end
       return dirs
     rescue
-      dirs = nil
       return dirs
     end
   end
@@ -309,7 +310,7 @@ def profile_options(ip, share)
     new_dirs = ['Desktop','Documents','Downloads','Music','Pictures','Videos']
 
     dirs = get_user_dirs(ip, share, "Documents and Settings", old_dirs)
-    if dirs == nil
+    if dirs.blank?
       dirs = get_user_dirs(ip, share, "Users", new_dirs)
     end
     return dirs
@@ -334,7 +335,7 @@ def get_files_info(ip, rport, shares, info)
       if x == "ADMIN$" or x == "IPC$"
         next
       end
-      if not datastore['VERBOSE']
+      if not datastore['ShowFiles']
         print_status("#{ip}:#{rport} - Spidering #{x}.")
       end
       subdirs = [""]
@@ -403,11 +404,11 @@ def get_files_info(ip, rport, shares, info)
 
             end
           end
-          vprint_good(pretty_tbl.to_s)
+          print_good(pretty_tbl.to_s) if datastore['ShowFiles']
         end
         subdirs.shift
       end
-    print_status("#{ip}:#{rport} - Spider #{x} complete.") unless datastore['VERBOSE'] == true
+    print_status("#{ip}:#{rport} - Spider #{x} complete.") unless datastore['ShowFiles'] == true
     end
     unless detailed_tbl.rows.empty?
       if datastore['LogSpider'] == '1'
@@ -423,12 +424,14 @@ def get_files_info(ip, rport, shares, info)
     end
   end
 
-  def cleanup
-    datastore['RPORT']           = @rport
-    datastore['SMBDirect']       = @smb_redirect
-    datastore['USE_SRVSVC_ONLY'] = @srvsvc
+  def rport
+    @rport || datastore['RPORT']
   end
 
+  # Overrides the one in smb.rb
+  def smb_direct
+    @smb_redirect || datastore['SMBDirect']
+  end
 
   def run_host(ip)
     @rport        = datastore['RPORT']
@@ -437,13 +440,13 @@ def run_host(ip)
     shares        = []
 
     [[139, false], [445, true]].each do |info|
-      datastore['RPORT']     = info[0]
-      datastore['SMBDirect'] = info[1]
+      @rport        = info[0]
+      @smb_redirect = info[1]
 
       begin
         connect
         smb_login
-        if datastore['USE_SRVSVC_ONLY']
+        if @srvsvc
           shares = srvsvc_netshareenum(ip)
         else
           shares = lanman_netshareenum(ip, rport, info)
@@ -506,3 +509,4 @@ def run_host(ip)
     end
   end
 end
+