Land rapid7#3781, my addition of Metasploit::Concern to msf.

Author: jvennix-r7

Gemfile

@@ -6,6 +6,8 @@ gemspec
 group :db do
   # Needed for Msf::DbManager
   gem 'activerecord', '>= 3.0.0', '< 4.0.0'
+  # Metasploit::Concern hooks
+  gem 'metasploit-concern', '~> 0.1.1'
   # Metasploit::Credential database models
   gem 'metasploit-credential', '>= 0.9.0'
   # Database models shared between framework and Pro.

Gemfile.lock

@@ -211,6 +211,7 @@ DEPENDENCIES
   factory_girl (>= 4.1.0)
   factory_girl_rails
   fivemat (= 1.2.1)
+  metasploit-concern (~> 0.1.1)
   metasploit-credential (>= 0.9.0)
   metasploit-framework!
   metasploit_data_models (~> 0.19)

lib/metasploit/framework.rb

@@ -9,6 +9,7 @@
 require 'bcrypt'
 require 'json'
 require 'msgpack'
+require 'metasploit/concern'
 require 'metasploit/model'
 require 'nokogiri'
 require 'packetfu'

lib/msf/core/exploit/http/server.rb

@@ -662,6 +662,8 @@ def regenerate_payload(cli, arch = nil, platform = nil, target = nil)
   def on_request_uri(cli, request)
   end
 
+  # allow this module to be patched at initialization-time
+  Metasploit::Concern.run(self)
 end
 
 ###
@@ -1014,7 +1016,6 @@ def php_include_url(sock=nil)
     "http://#{host}:#{datastore['SRVPORT']}#{get_resource()}?"
   end
 
-
 end
 end