infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug/MSP-10654/compatibility' into staging/electro-release

bug/bundler_fix
Lance Sanchez 2014-07-07 17:13:16 -05:00
parent aeda74f394 d7450dcbdf
commit d178b1f788
No known key found for this signature in database
GPG Key ID: 3922EB70FB80E8DD
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -7,9 +7,9 @@ group :db do
# Needed for Msf::DbManager
gem 'activerecord', '>= 3.0.0', '< 4.0.0'
# Metasploit::Credential database models
gem 'metasploit-credential', git: 'github-metasploit-credential:rapid7/metasploit-credential.git', tag: 'v0.4.8-electro-release'
gem 'metasploit-credential', git: 'github-metasploit-credential:rapid7/metasploit-credential.git', tag: 'v0.5.5.pre.electro.pre.release'
# Database models shared between framework and Pro.
gem 'metasploit_data_models', '~> 0.17.2.pre.metasploit.pre.data.pre.models.pre.search'
gem 'metasploit_data_models', '>= 0.18.0', '< 0.19'
# Needed for module caching in Mdm::ModuleDetails
gem 'pg', '>= 0.11'
end

21
Gemfile.lock
View File

@ -1,12 +1,12 @@
GIT
remote: github-metasploit-credential:rapid7/metasploit-credential.git
revision: b7234221ce41e311947e3e32c03aa7b6474f4f4f
tag: v0.4.8-electro-release
revision: 5f83705b0f6b918159ba7c86dabb518b716f9ed6
tag: v0.5.5.pre.electro.pre.release
specs:
metasploit-credential (0.4.8.pre.electro.pre.release)
metasploit-credential (0.5.5.pre.electro.pre.release)
metasploit-concern (~> 0.1.0)
metasploit-model (>= 0.24.1.pre.semantic.pre.versioning.pre.2.pre.0, < 0.25)
metasploit_data_models (>= 0.17.2.pre.metasploit.pre.data.pre.models.pre.search, < 0.18)
metasploit-model (>= 0.25.1, < 0.26)
metasploit_data_models (>= 0.18.0, < 0.19)
rubyntlm
rubyzip (~> 1.1)
@ -67,14 +67,15 @@ GEM
i18n (0.6.9)
journey (1.0.4)
json (1.8.1)
metasploit-concern (0.1.0)
metasploit-concern (0.1.1)
activesupport (~> 3.0, >= 3.0.0)
metasploit-model (0.24.1.pre.semantic.pre.versioning.pre.2.pre.0)
metasploit-model (0.25.2)
activesupport
metasploit_data_models (0.17.2.pre.metasploit.pre.data.pre.models.pre.search)
metasploit_data_models (0.18.0)
activerecord (>= 3.2.13, < 4.0.0)
activesupport
metasploit-model (>= 0.24.1.pre.semantic.pre.versioning.pre.2.pre.0, < 0.25)
metasploit-concern (~> 0.1.0)
metasploit-model (>= 0.25.1, < 0.26)
pg
method_source (0.8.2)
mini_portile (0.6.0)
@ -157,7 +158,7 @@ DEPENDENCIES
fivemat (= 1.2.1)
metasploit-credential!
metasploit-framework!
metasploit_data_models (~> 0.17.2.pre.metasploit.pre.data.pre.models.pre.search)
metasploit_data_models (>= 0.18.0, < 0.19)
network_interface (~> 0.0.1)
pcaprub
pg (>= 0.11)

14
db/schema.rb
View File

@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20140605173747) do
ActiveRecord::Schema.define(:version => 20140703144541) do
create_table "api_keys", :force => true do |t|
t.text "token"
@ -28,6 +28,16 @@ ActiveRecord::Schema.define(:version => 20140605173747) do
t.datetime "updated_at"
end
create_table "credential_cores_tasks", :id => false, :force => true do |t|
t.integer "core_id"
t.integer "task_id"
end
create_table "credential_logins_tasks", :id => false, :force => true do |t|
t.integer "login_id"
t.integer "task_id"
end
create_table "creds", :force => true do |t|
t.integer "service_id", :null => false
t.datetime "created_at", :null => false
@ -208,7 +218,7 @@ ActiveRecord::Schema.define(:version => 20140605173747) do
create_table "metasploit_credential_origin_imports", :force => true do |t|
t.text "filename", :null => false
t.integer "task_id", :null => false
t.integer "task_id"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end