Make Metasploit::Concern a first-class dep.

Also adds a Concern hook to HttpServer, so Pro can more
easily change its behavior.
bug/bundler_fix
Joe Vennix 2014-09-11 13:28:45 -05:00
parent 5477d5452e
commit 37e6173d1f
No known key found for this signature in database
GPG Key ID: 127B05FB3E85A2B0
3 changed files with 6 additions and 1 deletions

View File

@ -6,10 +6,13 @@ gemspec
group :db do group :db do
# Needed for Msf::DbManager # Needed for Msf::DbManager
gem 'activerecord', '>= 3.0.0', '< 4.0.0' gem 'activerecord', '>= 3.0.0', '< 4.0.0'
# Metasploit::Concern hooks
gem 'metasploit-concern', '~> 0.1.1'
# Metasploit::Credential database models # Metasploit::Credential database models
gem 'metasploit-credential', '>= 0.9.0' gem 'metasploit-credential', '>= 0.9.0'
# Database models shared between framework and Pro. # Database models shared between framework and Pro.
gem 'metasploit_data_models', '~> 0.19' gem 'metasploit_data_models', '~> 0.19'
# Needed for module caching in Mdm::ModuleDetails # Needed for module caching in Mdm::ModuleDetails
gem 'pg', '>= 0.11' gem 'pg', '>= 0.11'
end end

View File

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

View File

@ -662,6 +662,8 @@ module Exploit::Remote::HttpServer
def on_request_uri(cli, request) def on_request_uri(cli, request)
end end
# allow this module to be patched at initialization-time
Metasploit::Concern.run(self)
end end
### ###
@ -1014,7 +1016,6 @@ module Exploit::Remote::HttpServer::PHPInclude
"http://#{host}:#{datastore['SRVPORT']}#{get_resource()}?" "http://#{host}:#{datastore['SRVPORT']}#{get_resource()}?"
end end
end end
end end