Fix bugs

Author: jvazquez-r7

modules/post/linux/gather/enum_protections.rb

@@ -58,11 +58,7 @@ def get_host
   end
 
   def which(env_paths, cmd)
-    print_status("#{env_paths}")
-    print_status("#{cmd}")
     for path in env_paths
-      output = cmd_exec("/bin/ls #{path} | /bin/grep '#{cmd}'")
-      print_status(output)
       if "#{cmd}" == cmd_exec("/bin/ls #{path} | /bin/grep '#{cmd}'")
         return "#{path}/#{cmd}"
       end
@@ -78,12 +74,6 @@ def find_apps
       "psad", "wireshark", "nagios", "nagios", "apparmor", "honeyd", "thpot"
     ]
 
-    #output = cmd_exec("echo $PATH")
-    #print_status("#{Rex::Text.to_hex_dump(output)}")
-    #print_status("#{Rex::Text.to_hex_dump(output.chomp)}")
-
-    #return
-
     env_paths = cmd_exec("echo $PATH").split(":")
 
     apps.each do |a|

modules/post/linux/gather/enum_users_history.rb

@@ -49,8 +49,8 @@ def run
     last = execute("/usr/bin/last && /usr/bin/lastlog")
     sudoers = cat_file("/etc/sudoers")
 
-    save("Last logs", last)
-    save("Sudoers", sudoers) unless sudoers =~ /Permission denied/
+    save("Last logs", last) unless last.nil?
+    save("Sudoers", sudoers) unless sudoers.nil? || sudoers =~ /Permission denied/
   end
 
   def save(msg, data, ctype="text/plain")
@@ -96,13 +96,13 @@ def get_bash_history(users, user)
           hist = cat_file("/home/#{u}/.bash_history")
         end
 
-        save("History for #{u}", hist) unless hist =~ /No such file or directory/
+        save("History for #{u}", hist) unless hist.nil? || hist =~ /No such file or directory/
       end
     else
       vprint_status("Extracting history for #{user}")
       hist = cat_file("/home/#{user}/.bash_history")
       vprint_status(hist)
-      save("History for #{user}", hist) unless hist =~ /No such file or directory/
+      save("History for #{user}", hist) unless hist.nil? || hist =~ /No such file or directory/
     end
   end
 
@@ -118,13 +118,13 @@ def get_sql_history(users, user)
           sql_hist = cat_file("/home/#{u}/.mysql_history")
         end
 
-        save("History for #{u}", sql_hist) unless sql_hist =~ /No such file or directory/
+        save("History for #{u}", sql_hist) unless sql_hist.nil? || sql_hist =~ /No such file or directory/
       end
     else
       vprint_status("Extracting SQL history for #{user}")
       sql_hist = cat_file("/home/#{user}/.mysql_history")
       vprint_status(sql_hist) if sql_hist
-      save("SQL History for #{user}", sql_hist) unless sql_hist && sql_hist =~ /No such file or directory/
+      save("SQL History for #{user}", sql_hist) unless sql_hist.nil? || sql_hist =~ /No such file or directory/
     end
   end
 
@@ -140,13 +140,13 @@ def get_vim_history(users, user)
           vim_hist = cat_file("/home/#{u}/.viminfo")
         end
 
-        save("VIM History for #{u}", vim_hist) unless vim_hist =~ /No such file or directory/
+        save("VIM History for #{u}", vim_hist) unless vim_hist.nil? || vim_hist =~ /No such file or directory/
       end
     else
       vprint_status("Extracting history for #{user}")
       vim_hist = cat_file("/home/#{user}/.viminfo")
       vprint_status(vim_hist)
-      save("VIM History for #{user}", vim_hist) unless vim_hist =~ /No such file or directory/
+      save("VIM History for #{user}", vim_hist) unless vim_hist.nil? || vim_hist =~ /No such file or directory/
     end
   end
 end