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
parent
5477d5452e
commit
37e6173d1f
3
Gemfile
3
Gemfile
|
@ -6,10 +6,13 @@ 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.
|
||||
gem 'metasploit_data_models', '~> 0.19'
|
||||
|
||||
# Needed for module caching in Mdm::ModuleDetails
|
||||
gem 'pg', '>= 0.11'
|
||||
end
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -662,6 +662,8 @@ module Exploit::Remote::HttpServer
|
|||
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 @@ module Exploit::Remote::HttpServer::PHPInclude
|
|||
"http://#{host}:#{datastore['SRVPORT']}#{get_resource()}?"
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue