dnrops
/
metasploit-framework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Msf::DBManager spec upgrade problems 

MSP-13484
This commit is contained in:
Luke Imhoff 2015-10-20 15:52:30 -05:00 committed by Brent Cook
parent d1f64363b1
commit 337be4355d
7 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/support/shared/contexts/msf/db_manager.rb
View File

@ -12,6 +12,6 @@ RSpec.shared_context 'Msf::DBManager' do
before(:each) do
# already connected due to use_transactional_fixtures, but need some of the side-effects of #connect
framework.db.workspace = framework.db.default_workspace
expect(db_manager).to receive(:active).and_return(active)
allow(db_manager).to receive(:active).and_return(active)
end
end

4
spec/support/shared/examples/msf/db_manager/exploit_attempt.rb
View File

@ -127,8 +127,8 @@ shared_examples_for 'Msf::DBManager::ExploitAttempt' do
expect(db_manager).not_to receive(:create_match_result)
end
it "should not call create_run_for_vuln" do
expect(db_manager).not_to receive(:create_run_for_vuln)
it "should not call create_match_for_vuln" do
expect(db_manager).not_to receive(:create_match_for_vuln)
end
end

4
spec/support/shared/examples/msf/db_manager/import/metasploit_framework/xml.rb
View File

@ -245,7 +245,7 @@ shared_examples_for 'Msf::DBManager::Import::MetasploitFramework::XML' do
end
it 'should return an empty Hash' do
expect(info).to eq {}
expect(info).to eq({})
end
end
end
@ -390,7 +390,7 @@ shared_examples_for 'Msf::DBManager::Import::MetasploitFramework::XML' do
end
before(:each) do
expect(db_manager).to receive(:import_msf_text_element).and_return(returned_hash)
allow(db_manager).to receive(:import_msf_text_element).and_return(returned_hash)
end
it 'should pass returned Hash as part of Hash passed to report_web_<:type' do

40
spec/support/shared/examples/msf/db_manager/module_cache.rb
View File

@ -27,7 +27,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
before(:each) do
expect(db_manager).to receive(:migrated).and_return(migrated)
allow(db_manager).to receive(:migrated).and_return(migrated)
end
context 'with migrated' do
@ -40,7 +40,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
before(:each) do
expect(db_manager).to receive(:modules_caching).and_return(modules_caching)
allow(db_manager).to receive(:modules_caching).and_return(modules_caching)
end
context 'with modules_caching' do
@ -97,7 +97,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
before(:each) do
expect(db_manager).to receive(:migrated).and_return(migrated)
allow(db_manager).to receive(:migrated).and_return(migrated)
end
context 'with migrated' do
@ -169,7 +169,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
it "should match Mdm::Module::Detail#stance 'passive'" do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|
@ -185,7 +185,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
it "should match Mdm::Module::Detail#stance 'aggressive'" do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|
@ -216,7 +216,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
it 'should match Mdm::Module::Author#email' do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|
@ -235,7 +235,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
it 'should match Mdm::Module::Author#name' do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|
@ -271,7 +271,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
it 'should match Mdm::Module::Detail#fullname' do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|
@ -288,7 +288,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
it 'should match Mdm::Module::Detail#name' do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|
@ -325,7 +325,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
it 'should match Mdm::Module::Ref#name' do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|
@ -367,7 +367,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
it 'should match Mdm::Module::Detail#mtype' do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|
@ -395,7 +395,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
it 'should match Mdm::Module::Action#name' do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|
@ -417,7 +417,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
it 'should match Mdm::Module::Arch#name' do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|
@ -439,7 +439,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
it 'should match Mdm::Module::Author#name' do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|
@ -521,7 +521,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
it 'should match Mdm::Module::Platform#name' do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|
@ -543,7 +543,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
it 'should match Mdm::Module::Ref#name' do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|
@ -565,7 +565,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
it 'should match Mdm::Module::Target#name' do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|
@ -589,7 +589,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
before(:each) do
expect(db_manager).to receive(:migrated).and_return(migrated)
allow(db_manager).to receive(:migrated).and_return(migrated)
end
context 'with migrated' do
@ -602,7 +602,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
before(:each) do
expect(db_manager).to receive(:modules_caching).and_return(modules_caching)
allow(db_manager).to receive(:modules_caching).and_return(modules_caching)
end
context 'with modules_caching' do
@ -805,7 +805,7 @@ shared_examples_for 'Msf::DBManager::ModuleCache' do
end
before(:each) do
expect(db_manager).to receive(:migrated).and_return(migrated)
allow(db_manager).to receive(:migrated).and_return(migrated)
end
context 'with migrated' do

4
spec/support/shared/examples/msf/db_manager/search_modules/mdm_module_platform_name_or_mdm_module_target_name_keyword.rb
View File

@ -19,7 +19,7 @@ shared_examples_for 'Msf::DBManager#search_modules Mdm::Module::Platform#name or
end
it 'should find matching Mdm::Module::Platform#name' do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|
@ -38,7 +38,7 @@ shared_examples_for 'Msf::DBManager#search_modules Mdm::Module::Platform#name or
end
it 'should find matching Mdm::Module::Target#name' do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|

2
spec/support/shared/examples/msf/db_manager/search_modules/mdm_module_ref_name_keyword.rb
View File

@ -25,7 +25,7 @@ shared_examples_for 'Msf::DBManager#search_modules Mdm::Module::Ref#name keyword
end
it 'should match Mdm::Module::Ref#name' do
expect(module_details.count).to > 0
expect(module_details.count).to be > 0
expect(
module_details.all? { |module_detail|

15
spec/support/shared/examples/msf/db_manager/session.rb
View File

@ -84,6 +84,7 @@ shared_examples_for 'Msf::DBManager::Session' do
Class.new do
include Msf::Session
attr_accessor :arch
attr_accessor :exploit
attr_accessor :datastore
attr_accessor :platform
@ -123,7 +124,7 @@ shared_examples_for 'Msf::DBManager::Session' do
context 'with a run_id in user_data' do
before(:each) do
MetasploitDataModels::AutomaticExploitation::MatchSet.any_instance.stub(:create_match_for_vuln).and_return(nil)
allow(db_manager).to receive(:create_match_for_vuln).and_return(nil)
end
let(:match_set) do
@ -192,7 +193,7 @@ shared_examples_for 'Msf::DBManager::Session' do
end
before(:each) do
expect(session).to receive(:arch).and_return(arch)
allow(session).to receive(:arch).and_return(arch)
end
it 'should pass :arch to #find_or_create_host' do
@ -437,7 +438,7 @@ shared_examples_for 'Msf::DBManager::Session' do
context "with session.exploit_datastore['ParentModule']" do
it "should have session.exploit_datastore['ParentModule']" do
session.exploit_datastore['ParentModule'].should_not be_nil
expect(session.exploit_datastore['ParentModule']).not_to be_nil
end
it { expect(subject.via_exploit).to eq(parent_module_fullname) }
@ -516,9 +517,9 @@ shared_examples_for 'Msf::DBManager::Session' do
context 'with workspace from either :workspace or session' do
it 'should pass normalized host from session as :host to #find_or_create_host' do
normalized_host = double('Normalized Host')
expect(db_manager).to receive(:normalize_host).with(session).and_return(normalized_host)
allow(db_manager).to receive(:normalize_host).with(session).and_return(normalized_host)
# stub report_vuln so its use of find_or_create_host and normalize_host doesn't interfere.
expect(db_manager).to receive(:report_vuln)
allow(db_manager).to receive(:report_vuln)
expect(db_manager).to receive(:find_or_create_host).with(
hash_including(
@ -535,7 +536,7 @@ shared_examples_for 'Msf::DBManager::Session' do
end
before(:each) do
expect(session).to receive(:arch).and_return(arch)
allow(session).to receive(:arch).and_return(arch)
end
it 'should pass :arch to #find_or_create_host' do
@ -780,7 +781,7 @@ shared_examples_for 'Msf::DBManager::Session' do
context "with session.exploit_datastore['ParentModule']" do
it "should have session.exploit_datastore['ParentModule']" do
session.exploit_datastore['ParentModule'].should_not be_nil
expect(session.exploit_datastore['ParentModule']).not_to be_nil
end
it { expect(subject.via_exploit).to eq(parent_module_fullname) }