Merge branch 'master' into bug/windows-pro-modules

Author: sinn3r

documentation/samples/modules/auxiliary/sample.rb

@@ -1,25 +1,19 @@
-##
-# $Id$
-##
-
 ##
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
-# Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# web site for more information on licensing and terms of use.
+#   http://metasploit.com/
 ##
 
 require 'msf/core'
 
-module Msf
-
 ###
 #
 # This sample auxiliary module simply displays the selected action and
 # registers a custom command that will show up when the module is used.
 #
 ###
-class Auxiliary::Sample < Msf::Auxiliary
+class Metasploit4 < Msf::Auxiliary
 
 	def initialize
 		super(
@@ -50,5 +44,3 @@ def cmd_aux_extra_command(*args)
 	end
 
 end
-
-end

documentation/samples/modules/encoders/sample.rb

@@ -1,24 +1,17 @@
-##
-# $Id$
-##
-
 ##
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
-# Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# web site for more information on licensing and terms of use.
+#   http://metasploit.com/
 ##
 
-module Msf
-module Encoders
-
 ###
 #
 # This sample illustrates a very basic encoder that simply returns the block
 # that it's passed.
 #
 ###
-class Sample < Msf::Encoder
+class Metasploit4 < Msf::Encoder
 
 	def initialize
 		super(
@@ -40,6 +33,3 @@ def encode_block(state, buf)
 	end
 
 end
-
-end
-end

documentation/samples/modules/exploits/sample.rb

@@ -1,25 +1,19 @@
-##
-# $Id$
-##
-
 ##
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
-# Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# web site for more information on licensing and terms of use.
+#   http://metasploit.com/
 ##
 
 require 'msf/core'
 
-module Msf
-
 ###
 #
 # This exploit sample shows how an exploit module could be written to exploit
 # a bug in an arbitrary TCP server.
 #
 ###
-class Exploits::Sample < Msf::Exploit::Remote
+class Metasploit4 < Msf::Exploit::Remote
 
 	#
 	# This exploit affects TCP servers, so we use the TCP client mixin.
@@ -88,4 +82,3 @@ def exploit
 
 end
 
-end

documentation/samples/modules/nops/sample.rb

@@ -1,26 +1,19 @@
-##
-# $Id$
-##
-
 ##
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
-# Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# web site for more information on licensing and terms of use.
+#   http://metasploit.com/
 ##
 
 require 'msf/core'
 
-module Msf
-module Nops
-
 ###
 #
 # This class implements a very basic NOP sled generator that just returns a
 # string of 0x90's.
 #
 ###
-class Sample < Msf::Nop
+class Metasploit4 < Msf::Nop
 
 	def initialize
 		super(
@@ -39,6 +32,3 @@ def generate_sled(length, opts)
 	end
 
 end
-
-end 
-end

documentation/samples/modules/payloads/singles/sample.rb

@@ -1,26 +1,18 @@
-##
-# $Id$
-##
-
 ##
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
-# Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# web site for more information on licensing and terms of use.
+#   http://metasploit.com/
 ##
 
 require 'msf/core'
 
-module Msf
-module Payloads
-module Singles
-
 ###
 #
 # This sample payload is designed to trigger a debugger exception via int3.
 #
 ###
-module Sample
+module Metasploit4
 
 	include Msf::Payload::Single
 
@@ -40,7 +32,3 @@ def initialize(info = {})
 	end
 
 end
-
-end
-end
-end

lib/msf/core/modules/loader/base.rb

@@ -113,7 +113,7 @@ def load_module(parent_path, type, module_reference_name, options={})
     metasploit_class = nil
     module_path = self.module_path(parent_path, type, module_reference_name)
 
-    loaded = namespace_module_transaction(module_reference_name, :reload => reload) { |namespace_module|
+    loaded = namespace_module_transaction(type + "/" + module_reference_name, :reload => reload) { |namespace_module|
       # set the parent_path so that the module can be reloaded with #load_module
       namespace_module.parent_path = parent_path
 
@@ -301,7 +301,7 @@ def reload_module(original_metasploit_class_or_instance)
           reloaded_module_instance.datastore.update(original_metasploit_instance.datastore)
         end
       else
-        elog("Failed to create instance of #{refname} after reload.", 'core')
+        elog("Failed to create instance of #{original_metasploit_class_or_instance.refname} after reload.", 'core')
 
         # Return the old module instance to avoid an strace trace
         return original_metasploit_class_or_instance
@@ -370,13 +370,14 @@ def create_namespace_module(namespace_module_names)
   # @return [Module] module that wraps the previously loaded content from {#read_module_content}.
   # @return [nil] if any module name along the chain does not exist.
   def current_module(module_names)
-    # don't look at ancestors for constant
-    inherit = false
-
     # Don't want to trigger ActiveSupport's const_missing, so can't use constantize.
     named_module = module_names.inject(Object) { |parent, module_name|
-      if parent.const_defined?(module_name, inherit)
-        parent.const_get(module_name, inherit)
+      # Since we're searching parent namespaces first anyway, this is
+      # semantically equivalent to providing false for the 1.9-only
+      # "inherit" parameter to const_defined?. If we ever drop 1.8
+      # support, we can save a few cycles here by adding it back.
+      if parent.const_defined?(module_name)
+        parent.const_get(module_name)
       else
         break
       end
@@ -429,7 +430,7 @@ def module_path?(path)
 
     extension = File.extname(path)
 
-    unless (path.starts_with?('.') or
+    unless (path[0,1] == "." or
             extension != MODULE_EXTENSION or
             path =~ UNIT_TEST_REGEX)
       module_path = true
@@ -454,8 +455,8 @@ def module_reference_name_from_path(path)
   #
   # @see MODULE_SEPARATOR
   # @see #namespace_module_names
-  def namespace_module_name(module_reference_name)
-    namespace_module_names = self.namespace_module_names(module_reference_name)
+  def namespace_module_name(uniq_module_reference_name)
+    namespace_module_names = self.namespace_module_names(uniq_module_reference_name)
     namespace_module_name = namespace_module_names.join(MODULE_SEPARATOR)
 
     namespace_module_name
@@ -465,40 +466,19 @@ def namespace_module_name(module_reference_name)
   # doesn't overwrite other (metasploit) module's classes.  Invalid module name characters are escaped by using 'H*'
   # unpacking and prefixing each code with X so the code remains a valid module name when it starts with a digit.
   #
-  # @param [String] module_reference_name The canonical name for the module.
+  # @param [String] uniq_module_reference_name The unique canonical name for the module including type.
   # @return [Array<String>] {NAMESPACE_MODULE_NAMES} + <derived-constant-safe names>
   #
   # @see namespace_module
-  def namespace_module_names(module_reference_name)
-    relative_module_name = module_reference_name.camelize
-
-    module_names = relative_module_name.split(MODULE_SEPARATOR)
-
-    # The module_reference_name is path-like, so it can include characters that are invalid in module names
-    valid_module_names = module_names.collect { |module_name|
-      valid_module_name = module_name.gsub(/^[0-9]|[^A-Za-z0-9]/) { |invalid_constant_name_character|
-        unpacked = invalid_constant_name_character.unpack('H*')
-        # unpack always returns an array, so get first value to get character's encoding
-        hex_code = unpacked[0]
-
-        # as a convention start each hex-code with X so that it'll make a valid constant name since constants can't
-        # start with digits.
-        "X#{hex_code}"
-      }
-
-      valid_module_name
-    }
-
-    namespace_module_names = NAMESPACE_MODULE_NAMES + valid_module_names
-
-    namespace_module_names
+  def namespace_module_names(uniq_module_reference_name)
+    NAMESPACE_MODULE_NAMES + [ "Mod" + uniq_module_reference_name.unpack("H*").first.downcase ]
   end
 
-  def namespace_module_transaction(module_reference_name, options={}, &block)
+  def namespace_module_transaction(uniq_module_reference_name, options={}, &block)
     options.assert_valid_keys(:reload)
 
     reload = options[:reload] || false
-    namespace_module_names = self.namespace_module_names(module_reference_name)
+    namespace_module_names = self.namespace_module_names(uniq_module_reference_name)
 
     previous_namespace_module = current_module(namespace_module_names)
 
@@ -617,4 +597,5 @@ def usable?(metasploit_class)
 
     usable
   end
-end
+end
+

lib/msf/core/modules/namespace.rb

@@ -11,10 +11,15 @@ module Msf::Modules::Namespace
   def metasploit_class
     metasploit_class = nil
     # don't search ancestors for the metasploit_class
-    inherit = false
+    #inherit = false
 
     ::Msf::Framework::Major.downto(1) do |major|
-      if const_defined?("Metasploit#{major}", inherit)
+      # Since we really only care about the deepest namespace, we don't
+      # need to look for parents' constants. However, the "inherit"
+      # parameter for const_defined? only exists after 1.9. If we ever
+      # drop 1.8 support, we can save a few cycles here by passing false
+      # here.
+      if const_defined?("Metasploit#{major}")
         metasploit_class = const_get("Metasploit#{major}")
 
         break
@@ -52,4 +57,5 @@ def version_compatible!(module_path, module_reference_name)
       end
     end
   end
-end
+end
+

lib/rex.rb

@@ -91,7 +91,7 @@ module Rex
 
 # Overload the Kernel.sleep() function to be thread-safe
 Kernel.class_eval("
-	def sleep(seconds)
+	def sleep(seconds=nil)
 		Rex::ThreadSafe.sleep(seconds)
 	end
 ")

lib/rex/sync/thread_safe.rb

@@ -72,7 +72,7 @@ def self.select(rfd = nil, wfd = nil, efd = nil, t = nil)
 	# Simulates a sleep operation by selecting on nil until a timeout period
 	# expires.
 	#
-	def self.sleep(seconds)
+	def self.sleep(seconds=nil)
 		self.select(nil, nil, nil, seconds)
 
 		seconds

modules/auxiliary/scanner/http/ssl.rb

@@ -57,13 +57,13 @@ def run_host(ip)
 				caissuer = (/CA Issuers - URI:(.*?),/i).match(cert.extensions.to_s)
 
 				if caissuer.to_s.empty?
-					print_good("Certificate contains no CA Issuers extension... possible self signed certificate")
+					print_good("#{ip}:#{rport} Certificate contains no CA Issuers extension... possible self signed certificate")
 				else
 					print_status("#{ip}:#{rport} " +caissuer.to_s[0..-2])
 				end
 
 				if cert.issuer.to_s == cert.subject.to_s
-					print_good("Certificate Subject and Issuer match... possible self signed certificate")
+					print_good("#{ip}:#{rport} Certificate Subject and Issuer match... possible self signed certificate")
 				end
 
 				alg = cert.signature_algorithm