Allow quotes in CmdStagerFlavor metadata

lib/msf/core/exploit/cmdstager.rb

@@ -209,8 +209,8 @@ module Exploit::CmdStager
   end
 
   def target_flavor
-    return target.opts['CmdStagerFlavor'] if target && target.opts['CMDStagerFlavor']
-    return module_info['CmdStagerFlavor'] if module_info['CMDStagerFlavor']
+    return target.opts['CmdStagerFlavor'].to_sym if target && target.opts['CMDStagerFlavor']
+    return module_info['CmdStagerFlavor'].to_sym if module_info['CMDStagerFlavor']
     nil
   end
 

modules/exploits/linux/http/linksys_wrt110_cmd_exec.rb

@@ -39,7 +39,7 @@ class Metasploit3 < Msf::Exploit::Remote
         [
             ['Linux mipsel Payload', { } ]
         ],
-      'CmdStagerFlavor' => :echo,
+      'CmdStagerFlavor' => 'echo',
       'DefaultTarget'  => 0,
       ))
 

modules/exploits/multi/http/hp_sitescope_issuesiebelcmd.rb

@@ -51,7 +51,7 @@ class Metasploit3 < Msf::Exploit::Remote
             {
               'Arch' => ARCH_X86,
               'Platform' => 'win',
-              'CmdStagerFlavor' => :vbs
+              'CmdStagerFlavor' => 'vbs'
             }
           ],
           [ 'HP SiteScope 11.20 / Linux',

modules/exploits/multi/http/hp_sys_mgmt_exec.rb

@@ -42,22 +42,22 @@ class Metasploit3 < Msf::Exploit::Remote
           ['Linux', {
             'Platform' => 'linux',
             'Arch' => ARCH_X86,
-            'CmdStagerFlavor' => :bourne
+            'CmdStagerFlavor' => 'bourne'
           }],
           ['Linux (x64)', {
             'Platform' => 'linux',
             'Arch' => ARCH_X86_64,
-            'CmdStagerFlavor' => :bourne
+            'CmdStagerFlavor' => 'bourne'
           }],
           ['Windows', {
             'Platform' => 'win',
             'Arch' => ARCH_X86,
-            'CmdStagerFlavor' => :vbs
+            'CmdStagerFlavor' => 'vbs'
           }],
           ['Windows (x64)', {
             'Platform' => 'win',
             'Arch' => ARCH_X86_64,
-            'CmdStagerFlavor' => :vbs
+            'CmdStagerFlavor' => 'vbs'
           }],
         ],
       'Privileged'     => false,

modules/exploits/multi/http/hyperic_hq_script_console.rb

@@ -37,7 +37,7 @@ class Metasploit3 < Msf::Exploit::Remote
         [
           # Tested on Hyperic HQ versions 4.5.2-win32 and 4.6.6-win32 on Windows XP SP3 and Ubuntu 10.04
           ['Automatic', {} ],
-          ['Windows',  {'Arch' => ARCH_X86, 'Platform' => 'win', 'CmdStagerFlavor' => :vbs}],
+          ['Windows',  {'Arch' => ARCH_X86, 'Platform' => 'win', 'CmdStagerFlavor' => 'vbs'}],
           ['Linux',    {'Arch' => ARCH_X86, 'Platform' => 'linux' }],
           ['Unix CMD', {'Arch' => ARCH_CMD, 'Platform' => 'unix', 'Payload' => {'BadChars' => "\x22"}}]
       ],

modules/exploits/multi/http/jenkins_script_console.rb

@@ -35,7 +35,7 @@ class Metasploit3 < Msf::Exploit::Remote
       'Platform'  => %w{ win linux unix },
       'Targets'		=>
         [
-          ['Windows',  {'Arch'  => ARCH_X86, 'Platform' => 'win', 'CmdStagerFlavor' => :vbs}],
+          ['Windows',  {'Arch'  => ARCH_X86, 'Platform' => 'win', 'CmdStagerFlavor' => 'vbs'}],
           ['Linux',    { 'Arch' => ARCH_X86, 'Platform' => 'linux' }],
           ['Unix CMD', {'Arch'  => ARCH_CMD, 'Platform' => 'unix', 'Payload' => {'BadChars' => "\x22"}}]
         ],

modules/exploits/multi/http/netwin_surgeftp_exec.rb

@@ -33,7 +33,7 @@ class Metasploit3 < Msf::Exploit::Remote
       'Platform'       => %w{ win unix },
       'Targets'        =>
         [
-          [ 'Windows', { 'Arch'=>ARCH_X86, 'Platform'=>'win', 'CmdStagerFlavor' => :vbs}  ],
+          [ 'Windows', { 'Arch'=>ARCH_X86, 'Platform'=>'win', 'CmdStagerFlavor' => 'vbs'}  ],
           [ 'Unix',    { 'Arch'=>ARCH_CMD, 'Platform'=>'unix', 'Payload'=>{'BadChars' => "\x22"}} ]
         ],
       'DisclosureDate' => 'Dec 06 2012'))

modules/exploits/multi/http/struts_code_exec.rb

@@ -43,7 +43,7 @@ class Metasploit3 < Msf::Exploit::Remote
             {
                 'Arch' => ARCH_X86,
                 'Platform' => 'win',
-                'CmdStagerFlavor' => :tftp
+                'CmdStagerFlavor' => 'tftp'
             }
           ],
           ['Linux Universal',

modules/exploits/multi/http/struts_code_exec_exception_delegator.rb

@@ -46,7 +46,7 @@ class Metasploit3 < Msf::Exploit::Remote
             {
                 'Arch' => ARCH_X86,
                 'Platform' => 'win',
-                'CmdStagerFlavor' => :tftp
+                'CmdStagerFlavor' => 'tftp'
             }
           ],
           ['Linux Universal',

modules/exploits/multi/sap/sap_mgmt_con_osexec_payload.rb

@@ -57,7 +57,7 @@ class Metasploit4 < Msf::Exploit::Remote
             {
               'Arch' => ARCH_X86,
               'Platform' => 'win',
-              'CmdStagerFlavor' => :vbs
+              'CmdStagerFlavor' => 'vbs'
             },
           ],
         ],

modules/exploits/multi/sap/sap_soap_rfc_sxpg_call_system_exec.rb

@@ -67,7 +67,7 @@ class Metasploit4 < Msf::Exploit::Remote
           {
             'Arch' => ARCH_X86_64,
             'Platform' => 'win',
-            'CmdStagerFlavor' => :vbs
+            'CmdStagerFlavor' => 'vbs'
           }
         ]
       ],

modules/exploits/multi/sap/sap_soap_rfc_sxpg_command_exec.rb

@@ -68,7 +68,7 @@ class Metasploit4 < Msf::Exploit::Remote
           {
             'Arch' => ARCH_X86_64,
             'Platform' => 'win',
-            'CmdStagerFlavor' => :vbs
+            'CmdStagerFlavor' => 'vbs'
           }
         ]
       ],

modules/exploits/multi/ssh/sshexec.rb

@@ -61,7 +61,7 @@ class Metasploit3 < Msf::Exploit::Remote
             }
           ]
         ],
-      'CmdStagerFlavor' => [ :bourne, :echo, :printf ],
+      'CmdStagerFlavor' => %w{ bourne echo printf },
       'DefaultTarget'  => 0,
       # For the CVE
       'DisclosureDate' => 'Jan 01 1999'

modules/exploits/unix/webapp/zeroshell_exec.rb

@@ -35,7 +35,7 @@ class Metasploit3 < Msf::Exploit::Remote
         ],
       'Platform'        => ['linux'],
       'Arch'            => ARCH_X86,
-      'CmdStagerFlavor' => :echo,
+      'CmdStagerFlavor' => 'echo',
       'Targets'         =>
         [
           ['ZeroShell 2.0 RC2', {}]

modules/exploits/windows/antivirus/ams_hndlrsvc.rb

@@ -39,7 +39,7 @@ class Metasploit3 < Msf::Exploit::Remote
         ],
       'Privileged' => true,
       'Platform' => 'win',
-      'CmdStagerFlavor' => :tftp,
+      'CmdStagerFlavor' => 'tftp',
       'DefaultTarget' => 0,
       'DisclosureDate' => 'Jul 26 2010'))
 

modules/exploits/windows/antivirus/ams_xfr.rb

@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Exploit::Remote
             }
           ]
         ],
-      'CmdStagerFlavor' => :tftp,
+      'CmdStagerFlavor' => 'tftp',
       'Privileged' => true,
       'Platform' => 'win',
       'DefaultTarget' => 0,

modules/exploits/windows/browser/dxstudio_player_exec.rb

@@ -50,7 +50,7 @@ class Metasploit3 < Msf::Exploit::Remote
         [
           [ 'Automatic', { } ],
         ],
-      'CmdStagerFlavor' => :vbs,
+      'CmdStagerFlavor' => 'vbs',
       'DisclosureDate' => 'Jun 09 2009',
       'DefaultTarget'  => 0))
   end

modules/exploits/windows/emc/replication_manager_exec.rb

@@ -50,7 +50,7 @@ class Metasploit3 < Msf::Exploit::Remote
           # Tested on Windows XP and Windows 2003
           [ 'EMC Replication Manager 5.2.1 / Windows Native Payload', { } ]
         ],
-      'CmdStagerFlavor' => :vbs,
+      'CmdStagerFlavor' => 'vbs',
       'DefaultOptions' =>
         {
           'WfsDelay' => 5

modules/exploits/windows/http/ca_totaldefense_regeneratereports.rb

@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Exploit::Remote
             }
           ]
         ],
-      'CmdStagerFlavor' => :tftp,
+      'CmdStagerFlavor' => 'tftp',
       'Privileged' => true,
       'Platform' => 'win',
       'DisclosureDate' => 'Apr 13 2011',

modules/exploits/windows/http/hp_sitescope_runomagentcommand.rb

@@ -42,7 +42,7 @@ class Metasploit3 < Msf::Exploit::Remote
       'Privileged'  => true,
       'Platform'    => 'win',
       'Arch'        => ARCH_X86,
-      'CmdStagerFlavor' => :vbs,
+      'CmdStagerFlavor' => 'vbs',
       'Targets'     =>
         [
           [ 'HP SiteScope 11.20 (with Operations Agent) / Windows 2003 SP2', {} ]

modules/exploits/windows/http/osb_uname_jlist.rb

@@ -39,7 +39,7 @@ class Metasploit3 < Msf::Exploit::Remote
             }
           ]
         ],
-      'CmdStagerFlavor' => :tftp,
+      'CmdStagerFlavor' => 'tftp',
       'Privileged' => true,
       'Platform' => 'win',
       'DisclosureDate' => 'Jul 13 2010',

modules/exploits/windows/http/sap_configservlet_exec_noauth.rb

@@ -43,7 +43,7 @@ class Metasploit3 < Msf::Exploit
             }
           ]
         ],
-      'CmdStagerFlavor' => :vbs,
+      'CmdStagerFlavor' => 'vbs',
       'DefaultTarget'  => 0,
       'Privileged'     => false
       ))

modules/exploits/windows/iis/ms01_026_dbldecode.rb

@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Exploit::Remote
         [
           [ 'Automatic', { } ]
         ],
-      'CmdStagerFlavor' => :tftp,
+      'CmdStagerFlavor' => 'tftp',
       'DefaultTarget'  => 0,
       'DisclosureDate' => 'May 15 2001'
     ))

modules/exploits/windows/iis/msadc.rb

@@ -50,7 +50,7 @@ class Metasploit3 < Msf::Exploit::Remote
           # w2k w/sp0, IIS5.0, mdac 2.7 RTM, sql2000, handunsf.reg, over xp_cmdshell, reverse_tcp
           [ 'Automatic', { } ],
         ],
-      'CmdStagerFlavor' => :tftp,
+      'CmdStagerFlavor' => 'tftp',
       'DefaultTarget'  => 0,
       'DisclosureDate' => 'Jul 17 1998'
     )

modules/exploits/windows/misc/altiris_ds_sqli.rb

@@ -48,7 +48,7 @@ class Metasploit3 < Msf::Exploit::Remote
             }
           ]
         ],
-      'CmdStagerFlavor' => :tftp,
+      'CmdStagerFlavor' => 'tftp',
       'Privileged' => true,
       'Platform' => 'win',
       'DisclosureDate' => 'May 15 2008',

modules/exploits/windows/mssql/mssql_linkcrawler.rb

@@ -55,7 +55,7 @@ class Metasploit3 < Msf::Exploit::Remote
         [
           [ 'Automatic', { } ],
         ],
-      'CmdStagerFlavor' => :vbs,
+      'CmdStagerFlavor' => 'vbs',
       'DefaultTarget'  => 0
     ))
 

modules/exploits/windows/mssql/mssql_payload.rb

@@ -58,7 +58,7 @@ class Metasploit3 < Msf::Exploit::Remote
         [
           [ 'Automatic', { } ],
         ],
-      'CmdStagerFlavor' => :vbs,
+      'CmdStagerFlavor' => 'vbs',
       'DefaultTarget'  => 0,
       'DisclosureDate' => 'May 30 2000'
       ))

modules/exploits/windows/mssql/mssql_payload_sqli.rb

@@ -83,7 +83,7 @@ class Metasploit3 < Msf::Exploit::Remote
         [
           [ 'Automatic', { } ],
         ],
-      'CmdStagerFlavor' => :vbs,
+      'CmdStagerFlavor' => 'vbs',
       'DefaultTarget'  => 0,
       'DisclosureDate' => 'May 30 2000'
       ))

modules/exploits/windows/mysql/mysql_payload.rb

@@ -44,7 +44,7 @@ class Metasploit3 < Msf::Exploit::Remote
           [
             [ 'Automatic', { } ], # Confirmed on MySQL 4.1.22, 5.5.9, and 5.1.56 (64bit)
           ],
-        'CmdStagerFlavor' => :vbs,
+        'CmdStagerFlavor' => 'vbs',
         'DefaultTarget'  => 0,
         'DisclosureDate' => 'Jan 16 2009' # Date of Bernardo's blog post.
     ))

modules/exploits/windows/oracle/extjob.rb

@@ -40,7 +40,7 @@ class Metasploit3 < Msf::Exploit::Remote
       # This module has been tested on Oracle 10g Release 1
       # where the Oracle Job Scheduler runs as SYSTEM on Windows
       'Targets'        => [['Automatic',{}]],
-      'CmdStagerFlavor' => :vbs,
+      'CmdStagerFlavor' => 'vbs',
       'Privileged'     => true,
       'DisclosureDate' => 'Jan 01 2007',
       'DefaultTarget'  => 0))

modules/exploits/windows/scada/abb_wserver_exec.rb

@@ -45,7 +45,7 @@ class Metasploit3 < Msf::Exploit::Remote
         [
           [ 'ABB MicroSCADA Pro SYS600 9.3', { } ]
         ],
-      'CmdStagerFlavor' => :vbs,
+      'CmdStagerFlavor' => 'vbs',
       'DefaultTarget'  => 0,
       'Privileged'     => false,
       'DisclosureDate' => 'Apr 05 2013'

modules/exploits/windows/winrm/winrm_script_exec.rb

@@ -49,7 +49,7 @@ class Metasploit3 < Msf::Exploit::Remote
         [
           [ 'Windows', { } ],
         ],
-      'CmdStagerFlavor' => :vbs,
+      'CmdStagerFlavor' => 'vbs',
       'DefaultTarget'  => 0,
       'DisclosureDate' => 'Nov 01 2012'
     ))