Merge branch 'master' into bug/module-load-cache-update

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

lib/msf/base/sessions/meterpreter.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base'
 require 'msf/base/sessions/scriptable'

lib/msf/base/sessions/meterpreter_java.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/meterpreter'
 

lib/msf/base/sessions/meterpreter_options.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'shellwords'
 

lib/msf/base/sessions/meterpreter_php.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/meterpreter'
 

lib/msf/base/sessions/meterpreter_x86_bsd.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/meterpreter'
 

lib/msf/base/sessions/meterpreter_x86_linux.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/meterpreter'
 

lib/msf/base/sessions/meterpreter_x86_win.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/meterpreter'
 require 'msf/windows_error'

lib/msf/base/sessions/tty.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base'
 

lib/msf/base/sessions/vncinject_options.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 module Sessions

lib/msf/base/simple/buffer.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base'
 

lib/msf/base/simple/payload.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base'
 

lib/msf/core/auxiliary/commandshell.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/command_shell_options'
 

lib/msf/core/auxiliary/login.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 

lib/msf/core/auxiliary/pii.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-###
-# $Id$
-###
 
 module Msf
 

lib/msf/core/auxiliary/rservices.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 ##
 #

lib/msf/core/db_manager.rb

@@ -3,6 +3,7 @@
 require 'msf/base/config'
 require 'msf/core'
 require 'msf/core/db'
+require 'msf/core/db_manager/migration'
 require 'msf/core/task_manager'
 require 'fileutils'
 require 'shellwords'
@@ -17,6 +18,9 @@ module Msf
 ###
 
 class DBManager
+	# Provides :framework and other accessors
+	include Msf::DBManager::Migration
+	include Msf::Framework::Offspring
 
 	# Mainly, it's Ruby 1.9.1 that cause a lot of problems now, along with Ruby 1.8.6.
 	# Ruby 1.8.7 actually seems okay, but why tempt fate? Let's say 1.9.3 and beyond.
@@ -28,9 +32,6 @@ class DBManager
 		end
 	end
 
-	# Provides :framework and other accessors
-	include Framework::Offspring
-
 	# Returns true if we are ready to load/store data
 	def active
 		return false if not @usable
@@ -53,9 +54,6 @@ class DBManager
 	# Stores a TaskManager for serializing database events
 	attr_accessor :sink
 
-	# Flag to indicate database migration has completed
-	attr_accessor :migrated
-
 	# Flag to indicate that modules are cached
 	attr_accessor :modules_cached
 
@@ -287,33 +285,6 @@ class DBManager
 		end
 	end
 
-	# Migrate database to latest schema version.
-	#
-	# @param verbose [Boolean] see ActiveRecord::Migration.verbose
-	# @return [Array<ActiveRecord::MigrationProxy] List of migrations that ran.
-	#
-	# @see ActiveRecord::Migrator.migrate
-	def migrate(verbose=false)
-		ran = []
-		ActiveRecord::Migration.verbose = verbose
-
-		ActiveRecord::Base.connection_pool.with_connection do
-			begin
-				ran = ActiveRecord::Migrator.migrate(
-						ActiveRecord::Migrator.migrations_paths
-				)
-			# ActiveRecord::Migrator#migrate rescues all errors and re-raises them as
-			# StandardError
-			rescue StandardError => error
-				self.error = error
-				elog("DB.migrate threw an exception: #{error}")
-				dlog("Call stack:\n#{error.backtrace.join "\n"}")
-			end
-		end
-
-		return ran
-	end
-
 	def workspace=(workspace)
 		@workspace_name = workspace.name
 	end

lib/msf/core/db_manager/migration.rb

@@ -0,0 +1,58 @@
+module Msf
+	class DBManager
+		module Migration
+			# Migrate database to latest schema version.
+			#
+			# @param verbose [Boolean] see ActiveRecord::Migration.verbose
+			# @return [Array<ActiveRecord::MigrationProxy] List of migrations that
+			#   ran.
+			#
+			# @see ActiveRecord::Migrator.migrate
+			def migrate(verbose=false)
+				ran = []
+				ActiveRecord::Migration.verbose = verbose
+
+				ActiveRecord::Base.connection_pool.with_connection do
+					begin
+						ran = ActiveRecord::Migrator.migrate(
+								ActiveRecord::Migrator.migrations_paths
+						)
+					# ActiveRecord::Migrator#migrate rescues all errors and re-raises them
+					# as StandardError
+					rescue StandardError => error
+						self.error = error
+						elog("DB.migrate threw an exception: #{error}")
+						dlog("Call stack:\n#{error.backtrace.join "\n"}")
+					end
+				end
+
+				# Since the connections that existed before the migrations ran could
+				# have outdated column information, reset column information for all
+				# ActiveRecord::Base descendents to prevent missing method errors for
+				# column methods for columns created in migrations after the column
+				# information was cached.
+				reset_column_information
+
+				return ran
+			end
+
+			# Flag to indicate database migration has completed
+			#
+			# @return [Boolean]
+			attr_accessor :migrated
+
+			private
+
+			# Resets the column information for all descendants of ActiveRecord::Base
+			# since some of the migrations may have cached column information that
+			# has been updated by later migrations.
+			#
+			# @return [void]
+			def reset_column_information
+				ActiveRecord::Base.descendants.each do |descendant|
+					descendant.reset_column_information
+				end
+			end
+		end
+	end
+end

lib/msf/core/encoded_payload.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/core'
 

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

lib/msf/core/exploit/cmdstager.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/exploitation/cmdstager'
 require 'msf/core/exploit/exe'

lib/msf/core/exploit/cmdstager_debug_asm.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/core/exploit/cmdstager'
 

lib/msf/core/exploit/cmdstager_debug_write.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/core/exploit/cmdstager'
 

lib/msf/core/exploit/cmdstager_tftp.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/text'
 require 'msf/core/exploit/tftp'

lib/msf/core/exploit/cmdstager_vbs.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/core/exploit/cmdstager'
 

lib/msf/core/exploit/cmdstager_vbs_adodb.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id: $
 
 require 'msf/core/exploit/cmdstager'
 

lib/msf/core/exploit/dhcp.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/proto/dhcp'
 

lib/msf/core/exploit/egghunter.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/exploitation/egghunter'
 

lib/msf/core/exploit/exe.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 ###
 #

lib/msf/core/exploit/fmtstr.rb

@@ -7,7 +7,6 @@ module Msf
 # in a more intelligent way.
 #
 # Author: jduck
-# $Id$
 ###
 
 module Exploit::FormatString

lib/msf/core/exploit/ipv6.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 

lib/msf/core/exploit/mixins.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 #
 # All exploit mixins should be added to the list below
 #

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

lib/msf/core/exploit/omelet.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/exploitation/omelet'
 

lib/msf/core/exploit/pdf.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 ###
 #

lib/msf/core/exploit/php_exe.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 ###
 #

lib/msf/core/exploit/riff.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 

lib/msf/core/exploit/telnet.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 

lib/msf/core/exploit/tftp.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/proto/tftp'
 

lib/msf/core/exploit/wbemexec.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 #
 # This mixin enables executing arbitrary commands via the

lib/msf/core/payload/windows/exec.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 

lib/msf/core/payload/windows/loadlibrary.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 

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

lib/msf/ui/console/command_dispatcher/exploit.rb

@@ -33,7 +33,9 @@ class Exploit
 			"exploit"  => "Launch an exploit attempt",
 			"rcheck"   => "Reloads the module and checks if the target is vulnerable",
 			"rexploit" => "Reloads the module and launches an exploit attempt",
-			"reload"   => "Just reloads the module"
+			"reload"   => "Just reloads the module",
+			"run"      => "Alias for exploit",
+			"rerun"    => "Alias for rexploit",
 		})
 	end
 
@@ -197,6 +199,8 @@ class Exploit
 		end
 	end
 
+	alias cmd_run cmd_exploit
+
 	def cmd_exploit_help
 		print_line "Usage: exploit [options]"
 		print_line
@@ -204,6 +208,8 @@ class Exploit
 		print @@exploit_opts.usage
 	end
 
+	alias cmd_run_help cmd_exploit_help
+
 	#
 	# Reloads an exploit module and checks the target to see if it's
 	# vulnerable.
@@ -227,6 +233,8 @@ class Exploit
 		end
 	end
 
+	alias cmd_rerun cmd_rexploit
+
 	def cmd_rexploit_help
 		print_line "Usage: rexploit [options]"
 		print_line
@@ -234,6 +242,8 @@ class Exploit
 		print @@exploit_opts.usage
 	end
 
+	alias cmd_rerun_help cmd_rexploit_help
+
 	#
 	# Picks a reasonable payload and minimally configures it
 	#

lib/msf/ui/console/command_dispatcher/payload.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/parser/arguments'
 

lib/msf/windows_error.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 #
 # Windows system error codes (0-499)

lib/rex/elfparsey.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ElfParsey
 

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'

lib/rex/elfparsey/elfbase.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/struct2'
 
 module Rex

lib/rex/elfparsey/exceptions.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ElfParsey
 

lib/rex/elfscan.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ElfScan
 

lib/rex/elfscan/scanner.rb

@@ -1,7 +1,5 @@
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ElfScan
 module Scanner

lib/rex/elfscan/search.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ElfScan
 module Search

lib/rex/exploitation/cmdstager/tftp.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/text'
 require 'rex/arch'

lib/rex/exploitation/jsobfu.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/text'
 require 'rkelly'

lib/rex/image_source.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ImageSource
 

lib/rex/image_source/disk.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/image_source/image_source'
 require 'rex/struct2'
 

lib/rex/image_source/image_source.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ImageSource
 class ImageSource

lib/rex/image_source/memory.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/image_source/image_source'
 require 'rex/struct2'
 

lib/rex/ole.rb

@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation

lib/rex/ole/clsid.rb

@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation

lib/rex/ole/difat.rb

@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation

lib/rex/ole/directory.rb

@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation

lib/rex/ole/direntry.rb

@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation

lib/rex/ole/fat.rb

@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation

lib/rex/ole/header.rb

@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation

lib/rex/ole/minifat.rb

@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation

lib/rex/ole/propset.rb

@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation

lib/rex/ole/storage.rb

@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation

lib/rex/ole/stream.rb

@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation

lib/rex/ole/substorage.rb

@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation

lib/rex/ole/util.rb

@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation

lib/rex/peparsey.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module PeParsey
 

lib/rex/peparsey/exceptions.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module PeParsey
 

lib/rex/peparsey/pe.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/image_source'
 require 'rex/peparsey/exceptions'
 require 'rex/peparsey/pebase'

lib/rex/peparsey/pe_memdump.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/image_source'
 require 'rex/peparsey/exceptions'
 require 'rex/peparsey/pebase'

lib/rex/peparsey/pebase.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/peparsey/exceptions'
 require 'rex/struct2'
 

lib/rex/peparsey/section.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/peparsey/exceptions'
 require 'rex/peparsey/pebase'
 require 'rex/struct2'

lib/rex/pescan.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module PeScan
 

lib/rex/proto/dhcp.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 #
 # DHCP Server support written by scriptjunkie
 #

lib/rex/proto/dhcp/constants.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 require 'rex/proto/dhcp'
 
 module Rex

lib/rex/proto/dhcp/server.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/socket'
 require 'rex/proto/dhcp'

lib/rex/proto/ntlm/crypt.rb

@@ -43,10 +43,6 @@
 # The latter has a minor bug in its separate_keys function.
 # The third key has to begin from the 14th character of the
 # input string instead of 13th:)
-#--
-# $Id: ntlm.rb 11678 2011-01-30 19:26:35Z hdm $
-#++
-
 
 require 'rex/proto/ntlm/constants'
 require 'rex/proto/ntlm/base'

lib/rex/proto/ntlm/message.rb

@@ -40,9 +40,6 @@
 # The latter has a minor bug in its separate_keys function.
 # The third key has to begin from the 14th character of the
 # input string instead of 13th:)
-#--
-# $Id: ntlm.rb 11678 2011-01-30 19:26:35Z hdm $
-#++
 
 #this module defines the message class , useful for easily handling type 1/2/3 ntlm messages
 

lib/rex/proto/rfb.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id: $
 #
 # RFB protocol support
 #

lib/rex/proto/rfb.rb.ut.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 #
-# $Id: $
-#
 # RFB protocol support
 #
 # @author Joshua J. Drake <jduck>

lib/rex/proto/rfb/cipher.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id: $
-##
 
 ##
 #

lib/rex/proto/rfb/client.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id: $
-##
 
 ##
 #

lib/rex/proto/rfb/constants.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id: $
-##
 
 ##
 #

lib/rex/proto/tftp.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 #
 # TFTP Server implementation according to:
 #

lib/rex/proto/tftp/constants.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 require 'rex/proto/tftp'
 
 module Rex

lib/rex/proto/tftp/server.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 require 'rex/socket'
 require 'rex/proto/tftp'
 

lib/rex/proto/tftp/server.rb.ut.rb

@@ -1,10 +1,5 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
-#
-# $Revision$
-#
-# $Id$
-#
 
 require 'rex/compat'
 require 'rex/proto/tftp'

lib/rex/zip/archive.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Rex
 module Zip

lib/rex/zip/blocks.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Rex
 module Zip

lib/rex/zip/entry.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Rex
 module Zip

lib/zip/zip.rb

@@ -1259,6 +1259,8 @@ module Zip
       @cdirOffset                           = ZipEntry::read_zip_long(buf)
       commentLength                         = ZipEntry::read_zip_short(buf)
       @comment                              = buf.read(commentLength)
+			# remove trailing \n symbol
+			buf.chomp!
       raise ZipError, "Zip consistency problem while reading eocd structure" unless buf.size == 0
     end
     

modules/auxiliary/scanner/rdp/ms12_020_check.rb

@@ -53,7 +53,7 @@ class Metasploit3 < Msf::Auxiliary
 		res = sock.get_once(-1, 5)
 
 		# return true if this matches our vulnerable response
-		( res and res == "\x03\x00\x00\x0b\x06\xd0\x00\x00\x12\x34\x00" )
+		( res and res.match("\x03\x00\x00\x0b\x06\xd0\x00\x00\x12\x34\x00") )
 	end
 
 	def report_goods
@@ -121,16 +121,9 @@ class Metasploit3 < Msf::Auxiliary
 		"\x28"               # PER encoded PDU contents
 	end
 
-	def channel_request_one
+	def channel_request
 		"\x03\x00\x00\x0c" +
-		"\x02\xf0\x80\x38" +
-		"\x00\x01\x03\xeb"
-	end
-
-	def channel_request_two
-		"\x03\x00\x00\x0c" +
-		"\x02\xf0\x80\x38" +
-		"\x00\x02\x03\xeb"
+		"\x02\xf0\x80\x38"
 	end
 
 	def peer
@@ -143,6 +136,7 @@ class Metasploit3 < Msf::Auxiliary
 
 		# check if rdp is open
 		if not check_rdp
+			vprint_status "#{peer} Could not connect to RDP."
 			disconnect
 			return
 		end
@@ -153,18 +147,23 @@ class Metasploit3 < Msf::Auxiliary
 		# send userRequest
 		sock.put(user_request)
 		res = sock.get_once(-1, 5)
+		user1 = res[9,2].unpack("n").first
+		chan1 = user1 + 1001
 
 		# send 2nd userRequest
 		sock.put(user_request)
 		res = sock.get_once(-1, 5)
 
+		user2 = res[9,2].unpack("n").first
+		chan2 = user2 + 1001
+
 		# send channel request one
-		sock.put(channel_request_one)
+		sock.put(channel_request << [user1, chan2].pack("nn"))
 		res = sock.get_once(-1, 5)
 
-		if res and res[8,2] == "\x3e\x00"
+		if res and res[7,2] == "\x3e\x00"
 			# send ChannelRequestTwo - prevent BSoD
-			sock.put(channel_request_two)
+			sock.put(channel_request << [user2, chan2].pack("nn"))
 
 			print_good("#{peer} Vulnerable to MS12-020")
 			report_goods

modules/auxiliary/server/capture/drda.rb

@@ -1,6 +1,4 @@
-##
-# $Id: drda.rb 14774 2012-02-21 01:42:17Z rapid7 $
-##
+# -*- coding: binary -*-
 
 ##
 # This file is part of the Metasploit Framework and may be subject to