Skip to content

Commit 0a141f1

Browse files
committed
Land rapid7#2810, masked password format switcheroo
2 parents c4a9b4f + cc4c958 commit 0a141f1

File tree

4 files changed

+4
-130
lines changed

4 files changed

+4
-130
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ group :db do
1919
# Needed for Msf::DbManager
2020
gem 'activerecord'
2121
# Database models shared between framework and Pro.
22-
gem 'metasploit_data_models', '~> 0.16.9'
22+
gem 'metasploit_data_models', '~> 0.17.0'
2323
# Needed for module caching in Mdm::ModuleDetails
2424
gem 'pg', '>= 0.11'
2525
end

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ GEM
2222
fivemat (1.2.1)
2323
i18n (0.6.5)
2424
json (1.8.0)
25-
metasploit_data_models (0.16.9)
25+
metasploit_data_models (0.17.0)
2626
activerecord (>= 3.2.13)
2727
activesupport
2828
pg
@@ -67,7 +67,7 @@ DEPENDENCIES
6767
factory_girl (>= 4.1.0)
6868
fivemat (= 1.2.1)
6969
json
70-
metasploit_data_models (~> 0.16.9)
70+
metasploit_data_models (~> 0.17.0)
7171
msgpack
7272
network_interface (~> 0.0.1)
7373
nokogiri

documentation/samples/pro/msfrpc_pro_report.rb

Lines changed: 0 additions & 126 deletions
This file was deleted.

lib/msf/core/db_manager/import_msf_xml.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ def import_msf_xml(args={}, &block)
364364
cred_data[datum.gsub("-","_").intern] = nils_for_nulls(cred.elements[datum].text.to_s.strip)
365365
end
366366
}
367-
if cred_data[:pass] == "<masked>"
367+
if cred_data[:pass] == "*MASKED*"
368368
cred_data[:pass] = ""
369369
cred_data[:active] = false
370370
elsif cred_data[:pass] == "*BLANK PASSWORD*"

0 commit comments

Comments
 (0)