Merge branch 'python_payload_support' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-python_payload_support

modules/exploits/multi/http/familycms_less_exec.rb

@@ -40,7 +40,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'     =>
 					{
 						'PayloadType'  => 'cmd',
-						'RequiredCmd'  => 'generic telnet perl ruby',
+						'RequiredCmd'  => 'generic telnet perl ruby python',
 					}
 				},
 			'Platform'       => ['unix', 'linux'],

modules/exploits/multi/http/op5_license.rb

@@ -39,7 +39,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'      =>
 						{
 							'PayloadType' => 'cmd',
-							'RequiredCmd' => 'perl ruby',
+							'RequiredCmd' => 'perl ruby python',
 						}
 				},
 			'Platform'       => 'unix',

modules/exploits/multi/http/op5_welcome.rb

@@ -39,7 +39,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'      =>
 						{
 							'PayloadType' => 'cmd',
-							'RequiredCmd' => 'perl ruby',
+							'RequiredCmd' => 'perl ruby python',
 						}
 				},
 			'Platform'       => [ 'unix', 'linux' ],

modules/exploits/multi/http/plone_popen2.rb

@@ -42,7 +42,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				'Compat'     =>
 				{
 					'PayloadType'  => 'cmd',
-					'RequiredCmd'  => 'generic telnet perl ruby',
+					'RequiredCmd'  => 'generic telnet perl ruby python',
 				}
 			},
 			'Platform'       => ['unix', 'linux'],

modules/exploits/multi/http/snortreport_exec.rb

@@ -39,7 +39,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				'Compat'     =>
 				{
 					'PayloadType'  => 'cmd',
-					'RequiredCmd'  => 'generic perl ruby bash telnet',
+					'RequiredCmd'  => 'generic perl ruby bash telnet python',
 				}
 			},
 			'Platform'       => ['unix', 'linux'],

modules/exploits/unix/webapp/awstats_configdir_exec.rb

@@ -44,7 +44,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'      =>
 						{
 							'PayloadType' => 'cmd',
-							'RequiredCmd' => 'generic perl ruby bash telnet',
+							'RequiredCmd' => 'generic perl ruby python bash telnet',
 						}
 				},
 			'Platform'       => 'unix',

modules/exploits/unix/webapp/awstats_migrate_exec.rb

@@ -47,7 +47,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'      =>
 						{
 							'PayloadType' => 'cmd',
-							'RequiredCmd' => 'generic perl ruby bash telnet',
+							'RequiredCmd' => 'generic perl ruby python bash telnet',
 						}
 				},
 			'Platform'       => 'unix',

modules/exploits/unix/webapp/awstatstotals_multisort.rb

@@ -43,7 +43,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'      =>
 						{
 							'PayloadType' => 'cmd',
-							'RequiredCmd' => 'generic perl ruby bash telnet',
+							'RequiredCmd' => 'generic perl ruby python bash telnet',
 						}
 				},
 			'Platform'       => 'unix',

modules/exploits/unix/webapp/barracuda_img_exec.rb

@@ -43,7 +43,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'      =>
 						{
 							'PayloadType' => 'cmd',
-							'RequiredCmd' => 'generic perl ruby bash telnet',
+							'RequiredCmd' => 'generic perl ruby python bash telnet',
 						}
 				},
 			'Platform'       => 'unix',

modules/exploits/unix/webapp/basilic_diff_exec.rb

@@ -40,7 +40,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'      =>
 						{
 							'PayloadType' => 'cmd',
-							'RequiredCmd' => 'generic perl ruby bash telnet'
+							'RequiredCmd' => 'generic perl ruby python bash telnet'
 						}
 				},
 			'Targets'        =>

modules/exploits/unix/webapp/cacti_graphimage_exec.rb

@@ -41,7 +41,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'      =>
 						{
 							'PayloadType' => 'cmd',
-							'RequiredCmd' => 'generic perl ruby bash telnet',
+							'RequiredCmd' => 'generic perl ruby python bash telnet',
 						}
 				},
 			'Platform'       => 'unix',

modules/exploits/unix/webapp/dogfood_spell_exec.rb

@@ -49,7 +49,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'      =>
 						{
 							'PayloadType' => 'cmd',
-							'RequiredCmd' => 'generic perl ruby bash telnet',
+							'RequiredCmd' => 'generic perl ruby python bash telnet',
 						}
 				},
 			'Targets'        => [ ['Automatic', { }], ],

modules/exploits/unix/webapp/guestbook_ssi_exec.rb

@@ -47,7 +47,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'      =>
 						{
 							'PayloadType' => 'cmd',
-							'RequiredCmd' => 'generic perl ruby bash telnet',
+							'RequiredCmd' => 'generic perl ruby python bash telnet',
 						}
 				},
 			'Platform'       => [ 'unix', 'win', 'linux' ],

modules/exploits/unix/webapp/hastymail_exec.rb

@@ -40,7 +40,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'      =>
 						{
 							'PayloadType' => 'cmd',
-							'RequiredCmd' => 'generic perl ruby netcat-e',
+							'RequiredCmd' => 'generic perl ruby python netcat-e',
 						}
 				},
 			'Platform'       => ['unix'],

modules/exploits/unix/webapp/mitel_awc_exec.rb

@@ -45,7 +45,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'      =>
 						{
 							'PayloadType' => 'cmd',
-							'RequiredCmd' => 'generic perl ruby bash telnet',
+							'RequiredCmd' => 'generic perl ruby python bash telnet',
 						}
 				},
 			'Targets'        => [ ['Automatic', { }], ],

modules/exploits/unix/webapp/nagios3_statuswml_ping.rb

@@ -43,7 +43,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'BadChars'    => '<>',
 					'Compat'      =>
 						{
-							'RequiredCmd' => 'generic perl ruby bash telnet',
+							'RequiredCmd' => 'generic perl ruby python bash telnet',
 						}
 				},
 			'Targets'        =>

modules/exploits/unix/webapp/phpbb_highlight.rb

@@ -49,7 +49,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'      =>
 						{
 							'PayloadType' => 'cmd',
-							'RequiredCmd' => 'generic perl ruby bash telnet',
+							'RequiredCmd' => 'generic perl ruby python bash telnet',
 						}
 				},
 			'Platform'       => 'unix',

modules/exploits/unix/webapp/squirrelmail_pgp_plugin.rb

@@ -54,7 +54,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'      =>
 						{
 							'PayloadType' => 'cmd',
-							'RequiredCmd' => 'generic perl ruby bash telnet',
+							'RequiredCmd' => 'generic perl ruby python bash telnet',
 						}
 				},
 			'Targets'        =>

modules/exploits/unix/webapp/tikiwiki_jhot_exec.rb

@@ -46,7 +46,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'      =>
 						{
 							'PayloadType' => 'cmd',
-							'RequiredCmd' => 'generic perl ruby bash telnet',
+							'RequiredCmd' => 'generic perl ruby python bash telnet',
 						}
 				},
 			'Platform'       => 'unix',

modules/exploits/unix/webapp/webmin_show_cgi_exec.rb

@@ -43,7 +43,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					'Compat'      =>
 						{
 							'PayloadType' => 'cmd',
-							'RequiredCmd' => 'generic perl bash telnet',
+							'RequiredCmd' => 'generic perl ruby python bash telnet',
 						}
 				},
 			'Platform'       => 'unix',