Skip to content

Commit f3eb708

Browse files
committed
Update metasploit_data_models and metasploit-credential for tag search
MSP-10029 Use metasploit_data_models that supports searching Mdm::Tag and a compatible metasploit-credential. Needed so Metasploit::Credential::Core#tags can be searched in Pro.
1 parent f8af435 commit f3eb708

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ group :db do
77
# Needed for Msf::DbManager
88
gem 'activerecord', '>= 3.0.0', '< 4.0.0'
99
# Metasploit::Credential database models
10-
gem 'metasploit-credential', '>= 0.7.9.pre.core.pre.search', '< 0.8'
10+
gem 'metasploit-credential', '>= 0.7.10.pre.core.pre.search', '< 0.8'
1111
# Database models shared between framework and Pro.
12-
gem 'metasploit_data_models', '>= 0.18.0', '< 0.19'
12+
gem 'metasploit_data_models', '~> 0.19'
1313
# Needed for module caching in Mdm::ModuleDetails
1414
gem 'pg', '>= 0.11'
1515
end

Gemfile.lock

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ GEM
4141
i18n (~> 0.6, >= 0.6.4)
4242
multi_json (~> 1.0)
4343
arel (3.0.3)
44+
arel-helpers (2.0.0)
45+
activerecord (>= 3.1.0, < 5)
4446
bcrypt (3.1.7)
4547
builder (3.0.4)
4648
coderay (1.1.0)
@@ -58,18 +60,19 @@ GEM
5860
json (1.8.1)
5961
metasploit-concern (0.1.1)
6062
activesupport (~> 3.0, >= 3.0.0)
61-
metasploit-credential (0.7.9.pre.core.pre.search)
63+
metasploit-credential (0.7.10.pre.core.pre.search)
6264
metasploit-concern (~> 0.1.0)
6365
metasploit-model (>= 0.25.6)
64-
metasploit_data_models (>= 0.18.0.pre.compatibility, < 0.19)
66+
metasploit_data_models (~> 0.19)
6567
pg
6668
rubyntlm
6769
rubyzip (~> 1.1)
6870
metasploit-model (0.25.6)
6971
activesupport
70-
metasploit_data_models (0.18.0)
72+
metasploit_data_models (0.19.0)
7173
activerecord (>= 3.2.13, < 4.0.0)
7274
activesupport
75+
arel-helpers
7376
metasploit-concern (~> 0.1.0)
7477
metasploit-model (>= 0.25.1, < 0.26)
7578
pg
@@ -156,9 +159,9 @@ DEPENDENCIES
156159
factory_girl (>= 4.1.0)
157160
factory_girl_rails
158161
fivemat (= 1.2.1)
159-
metasploit-credential (>= 0.7.9.pre.core.pre.search, < 0.8)
162+
metasploit-credential (>= 0.7.10.pre.core.pre.search, < 0.8)
160163
metasploit-framework!
161-
metasploit_data_models (>= 0.18.0, < 0.19)
164+
metasploit_data_models (~> 0.19)
162165
network_interface (~> 0.0.1)
163166
pcaprub
164167
pg (>= 0.11)

0 commit comments

Comments
 (0)