Land #6889, check #nil? and #empty? instead of #empty?

modules/exploits/multi/http/struts_code_exec.rb

@@ -133,7 +133,7 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def exploit
-    if not datastore['CMD'].empty?
+    unless datastore['CMD'].blank?
       print_status("Executing user supplied command")
       execute_command(datastore['CMD'])
       return

modules/exploits/multi/http/struts_code_exec_exception_delegator.rb

@@ -186,7 +186,7 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def exploit
-    if not datastore['CMD'].empty?
+    unless datastore['CMD'].blank?
       print_status("Executing user supplied command")
       execute_command(datastore['CMD'])
       return

modules/exploits/windows/antivirus/ams_hndlrsvc.rb

@@ -149,7 +149,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
   def exploit
 
-    if not datastore['CMD'].empty?
+    unless datastore['CMD'].blank?
       print_status("Executing command '#{datastore['CMD']}'")
       execute_command(datastore['CMD'])
       return
@@ -160,7 +160,7 @@ class MetasploitModule < Msf::Exploit::Remote
         windows_stager
       else
         fail_with(Failure::Unknown, 'Target not supported.')
-      end
+    end
 
     handler
 

modules/exploits/windows/antivirus/ams_xfr.rb

@@ -57,7 +57,7 @@ class MetasploitModule < Msf::Exploit::Remote
     exe_fname = rand_text_alphanumeric(4+rand(4)) + ".exe"
 
     print_status("Sending request to #{datastore['RHOST']}:#{datastore['RPORT']}")
-    execute_cmdstager({ :temp => '.' })
+    execute_cmdstager({ :temp => '.', :cgifname => exe_fname })
     @payload_exe = generate_payload_exe
 
     print_status("Attempting to execute the payload...")
@@ -92,8 +92,7 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def exploit
-
-    if not datastore['CMD'].empty?
+    unless datastore['CMD'].blank?
       print_status("Executing command '#{datastore['CMD']}'")
       execute_command(datastore['CMD'])
       return
@@ -104,7 +103,7 @@ class MetasploitModule < Msf::Exploit::Remote
         windows_stager
       else
         fail_with(Failure::Unknown, 'Target not supported.')
-      end
+    end
 
     handler
 

modules/exploits/windows/http/ca_totaldefense_regeneratereports.rb

@@ -110,7 +110,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
   def exploit
 
-    if not datastore['CMD'].empty?
+    unless datastore['CMD'].blank?
       print_status("Executing command '#{datastore['CMD']}'")
       execute_command(datastore['CMD'])
       return

modules/exploits/windows/http/osb_uname_jlist.rb

@@ -93,7 +93,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
   def exploit
 
-    if not datastore['CMD'].empty?
+    unless datastore['CMD'].blank?
       print_status("Executing command '#{datastore['CMD']}'")
       execute_command(datastore['CMD'])
       return