rapid7 · wchen-r7 · May 22, 2013 · May 20, 2013 · jvazquez-r7 · May 20, 2013
diff --git a/lib/msf/base/sessions/command_shell_options.rb b/lib/msf/base/sessions/command_shell_options.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 ##
 # This file is part of the Metasploit Framework and may be subject to

diff --git a/lib/msf/base/sessions/meterpreter.rb b/lib/msf/base/sessions/meterpreter.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base'
 require 'msf/base/sessions/scriptable'

diff --git a/lib/msf/base/sessions/meterpreter_java.rb b/lib/msf/base/sessions/meterpreter_java.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/meterpreter'
 

diff --git a/lib/msf/base/sessions/meterpreter_options.rb b/lib/msf/base/sessions/meterpreter_options.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'shellwords'
 

diff --git a/lib/msf/base/sessions/meterpreter_php.rb b/lib/msf/base/sessions/meterpreter_php.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/meterpreter'
 

diff --git a/lib/msf/base/sessions/meterpreter_x86_bsd.rb b/lib/msf/base/sessions/meterpreter_x86_bsd.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/meterpreter'
 

diff --git a/lib/msf/base/sessions/meterpreter_x86_linux.rb b/lib/msf/base/sessions/meterpreter_x86_linux.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/meterpreter'
 

diff --git a/lib/msf/base/sessions/meterpreter_x86_win.rb b/lib/msf/base/sessions/meterpreter_x86_win.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/meterpreter'
 require 'msf/windows_error'

diff --git a/lib/msf/base/sessions/tty.rb b/lib/msf/base/sessions/tty.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base'
 

diff --git a/lib/msf/base/sessions/vncinject_options.rb b/lib/msf/base/sessions/vncinject_options.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 module Sessions

diff --git a/lib/msf/base/simple/buffer.rb b/lib/msf/base/simple/buffer.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base'
 

diff --git a/lib/msf/base/simple/payload.rb b/lib/msf/base/simple/payload.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base'
 

diff --git a/lib/msf/core/auxiliary/commandshell.rb b/lib/msf/core/auxiliary/commandshell.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/command_shell_options'
 

diff --git a/lib/msf/core/auxiliary/login.rb b/lib/msf/core/auxiliary/login.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 

diff --git a/lib/msf/core/auxiliary/pii.rb b/lib/msf/core/auxiliary/pii.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-###
-# $Id$
-###
 
 module Msf
 

diff --git a/lib/msf/core/auxiliary/rservices.rb b/lib/msf/core/auxiliary/rservices.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 ##
 #

diff --git a/lib/msf/core/encoded_payload.rb b/lib/msf/core/encoded_payload.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/core'
 

diff --git a/lib/msf/core/exploit/browser_autopwn.rb b/lib/msf/core/exploit/browser_autopwn.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 #
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit

diff --git a/lib/msf/core/exploit/cmdstager.rb b/lib/msf/core/exploit/cmdstager.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/exploitation/cmdstager'
 require 'msf/core/exploit/exe'

diff --git a/lib/msf/core/exploit/cmdstager_debug_asm.rb b/lib/msf/core/exploit/cmdstager_debug_asm.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/core/exploit/cmdstager'
 

diff --git a/lib/msf/core/exploit/cmdstager_debug_write.rb b/lib/msf/core/exploit/cmdstager_debug_write.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/core/exploit/cmdstager'
 

diff --git a/lib/msf/core/exploit/cmdstager_tftp.rb b/lib/msf/core/exploit/cmdstager_tftp.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/text'
 require 'msf/core/exploit/tftp'

diff --git a/lib/msf/core/exploit/cmdstager_vbs.rb b/lib/msf/core/exploit/cmdstager_vbs.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/core/exploit/cmdstager'
 

diff --git a/lib/msf/core/exploit/cmdstager_vbs_adodb.rb b/lib/msf/core/exploit/cmdstager_vbs_adodb.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id: $
 
 require 'msf/core/exploit/cmdstager'
 

diff --git a/lib/msf/core/exploit/dhcp.rb b/lib/msf/core/exploit/dhcp.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/proto/dhcp'
 

diff --git a/lib/msf/core/exploit/egghunter.rb b/lib/msf/core/exploit/egghunter.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/exploitation/egghunter'
 

diff --git a/lib/msf/core/exploit/exe.rb b/lib/msf/core/exploit/exe.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 ###
 #

diff --git a/lib/msf/core/exploit/fmtstr.rb b/lib/msf/core/exploit/fmtstr.rb
@@ -7,7 +7,6 @@ module Msf
 # in a more intelligent way.
 #
 # Author: jduck
-# $Id$
 ###
 
 module Exploit::FormatString

diff --git a/lib/msf/core/exploit/ipv6.rb b/lib/msf/core/exploit/ipv6.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 

diff --git a/lib/msf/core/exploit/mixins.rb b/lib/msf/core/exploit/mixins.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 #
 # All exploit mixins should be added to the list below
 #

diff --git a/lib/msf/core/exploit/mysql.rb b/lib/msf/core/exploit/mysql.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 ##
 # This file is part of the Metasploit Framework and may be subject to

diff --git a/lib/msf/core/exploit/omelet.rb b/lib/msf/core/exploit/omelet.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/exploitation/omelet'
 

diff --git a/lib/msf/core/exploit/pdf.rb b/lib/msf/core/exploit/pdf.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 ###
 #

diff --git a/lib/msf/core/exploit/php_exe.rb b/lib/msf/core/exploit/php_exe.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 ###
 #

diff --git a/lib/msf/core/exploit/riff.rb b/lib/msf/core/exploit/riff.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 

diff --git a/lib/msf/core/exploit/tcp.rb b/lib/msf/core/exploit/tcp.rb
@@ -468,6 +468,8 @@ def ssl_cert
 	#
 	def regenerate_payload(cli, arch = nil, platform = nil, target = nil)
 
+		$stderr.puts("Tcp##{__method__} : target: #{target.inspect}")
+
 		ohost = datastore['RHOST']
 		oport = datastore['RPORT']
 		p = nil
@@ -477,7 +479,7 @@ def regenerate_payload(cli, arch = nil, platform = nil, target = nil)
 			datastore['RHOST'] = cli.peerhost
 			datastore['RPORT'] = cli.peerport
 
-			if ((p = super(arch, platform, target)) == nil)
+			if ((p = super(platform, arch, target)) == nil)
 				print_error("Failed to generate payload")
 				return nil
 			end

diff --git a/lib/msf/core/exploit/telnet.rb b/lib/msf/core/exploit/telnet.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 

diff --git a/lib/msf/core/exploit/tftp.rb b/lib/msf/core/exploit/tftp.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/proto/tftp'
 

diff --git a/lib/msf/core/exploit/wbemexec.rb b/lib/msf/core/exploit/wbemexec.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 #
 # This mixin enables executing arbitrary commands via the

diff --git a/lib/msf/core/payload/generic.rb b/lib/msf/core/payload/generic.rb
@@ -211,10 +211,13 @@ def actual_arch
 		arch = nil
 
 		if explicit_arch.nil? == false
+			$stderr.puts "explicit"
 			arch = explicit_arch
 		elsif datastore['ARCH']
+			$stderr.puts "datastore"
 			arch = datastore['ARCH']
 		elsif assoc_exploit
+			$stderr.puts "assoc_exploit"
 			arch = assoc_exploit.target_arch || ARCH_X86
 		end
 
@@ -233,6 +236,8 @@ def find_actual_payload
 
 		# Look for one based on the exploit's compatible set
 		if(assoc_exploit)
+			$stderr.puts "assoc_exploit #{assoc_exploit.name}"
+			$stderr.puts "#{actual_arch} #{actual_platform.inspect}"
 			self.actual_payload = framework.payloads.find_payload_from_set(
 				assoc_exploit.compatible_payloads,
 				actual_platform,

diff --git a/lib/msf/core/payload/windows/exec.rb b/lib/msf/core/payload/windows/exec.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 

diff --git a/lib/msf/core/payload/windows/loadlibrary.rb b/lib/msf/core/payload/windows/loadlibrary.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 

diff --git a/lib/msf/core/rpc/v10/rpc_module.rb b/lib/msf/core/rpc/v10/rpc_module.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id: module.rb 12624 2011-05-15 23:51:53Z hdm $
-##
 
 module Msf
 module RPC

diff --git a/lib/msf/ui/console/command_dispatcher/payload.rb b/lib/msf/ui/console/command_dispatcher/payload.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/parser/arguments'
 

diff --git a/lib/msf/windows_error.rb b/lib/msf/windows_error.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 #
 # Windows system error codes (0-499)

diff --git a/lib/rex/elfparsey.rb b/lib/rex/elfparsey.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ElfParsey
 

diff --git a/lib/rex/elfparsey/elf.rb b/lib/rex/elfparsey/elf.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/elfparsey/elfbase'
 require 'rex/elfparsey/exceptions'
 require 'rex/image_source'

diff --git a/lib/rex/elfparsey/elfbase.rb b/lib/rex/elfparsey/elfbase.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/struct2'
 
 module Rex

diff --git a/lib/rex/elfparsey/exceptions.rb b/lib/rex/elfparsey/exceptions.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ElfParsey
 

diff --git a/lib/rex/elfscan.rb b/lib/rex/elfscan.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ElfScan
 

diff --git a/lib/rex/elfscan/scanner.rb b/lib/rex/elfscan/scanner.rb
@@ -1,7 +1,5 @@
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ElfScan
 module Scanner

diff --git a/lib/rex/elfscan/search.rb b/lib/rex/elfscan/search.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ElfScan
 module Search