Merge branch 'staging/great-backport' into feature/MSP-11126/msf-module-reorg

MSP-11126

Author: limhoff-r7

.rspec

@@ -1,2 +1,3 @@
 --color
 --format Fivemat
+--require spec_helper

Gemfile.lock

@@ -9,7 +9,7 @@ PATH
       json
       metasploit-concern (~> 0.3.0)
       metasploit-model (~> 0.28.0)
-      meterpreter_bins (= 0.0.7)
+      meterpreter_bins (= 0.0.10)
       msgpack
       nokogiri
       packetfu (= 1.1.9)
@@ -121,11 +121,11 @@ GEM
       pg
       railties (< 4.0.0)
       recog (~> 1.0)
-    meterpreter_bins (0.0.7)
+    meterpreter_bins (0.0.10)
     method_source (0.8.2)
     mime-types (1.25.1)
     mini_portile (0.6.0)
-    msgpack (0.5.8)
+    msgpack (0.5.9)
     multi_json (1.0.4)
     network_interface (0.0.1)
     nokogiri (1.6.3.1)

lib/msf/core/auxiliary/crawler.rb

@@ -44,7 +44,7 @@ def initialize(info = {})
         OptString.new('HTTPAdditionalHeaders', [false, "A list of additional headers to send (separated by \\x01)"]),
         OptString.new('HTTPCookie', [false, "A HTTP cookie header to send with each request"]),
         OptBool.new('SSL', [ false, 'Negotiate SSL for outgoing connections', false]),
-        OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL that should be used', 'SSL3', ['SSL2', 'SSL23', 'SSL3', 'TLS1']]),
+        OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL that should be used', 'Auto', ['Auto', 'SSL2', 'SSL23', 'SSL3', 'TLS1']]),
       ], self.class
     )
 

lib/msf/core/database_event.rb

@@ -0,0 +1,34 @@
+# Events that can occur in the host/service database.
+module Msf::DatabaseEvent
+  # Called when a new client is added to the database.  The client
+  # parameter is of type Client.
+  def on_db_client(client)
+  end
+
+  # Called when a new host is added to the database.  The host parameter is
+  # of type Host.
+  def on_db_host(host)
+  end
+
+  # Called when an existing host's state changes
+  def on_db_host_state(host, ostate)
+  end
+
+  # Called when a new reference is created.
+  def on_db_ref(ref)
+  end
+
+  # Called when a new service is added to the database.  The service
+  # parameter is of type Service.
+  def on_db_service(service)
+  end
+
+  # Called when an existing service's state changes
+  def on_db_service_state(host, port, ostate)
+  end
+
+  # Called when an applicable vulnerability is found for a service.  The vuln
+  # parameter is of type Vuln.
+  def on_db_vuln(vuln)
+  end
+end