Commit Graph

136 Commits (147ff13080053d9e137a1e47b7aa6c8acc43e164)

Author SHA1 Message Date
Luke Imhoff 8249ef62c9
Merge branch 'master' into chore/MSP-11614/remove-msf-db-manager-sink
MSP-11614

Conflicts:
	spec/lib/msf/core/task_manager_spec.rb
2014-11-18 08:54:14 -06:00
Trevor Rosen 3b558624f3
Merge branch 'landing/4129' into upstream-master
Landing #4129

* Detect leaked constants in spec runs
2014-11-14 12:55:56 -06:00
Luke Imhoff 55a8f6f339
Remove Msf::DBManager::Sink
MSP-11614

`Msf::DBManager::Sink` contains code for a `sink` that is a meant to
serialize database events, but it's unneeded because all database events
go directly through ActiveRecord, which handles threading.
2014-11-14 10:51:51 -06:00
Luke Imhoff 1fd8fe57df
Merge staging/great-backport to master
Conflicts:
	spec/lib/msf/core/module_spec.rb
2014-11-12 11:08:18 -06:00
Luke Imhoff b0f1b2a1f7
Merge branch 'master' into feature/MSP-11130/metasploit-framework-spec-constants
MSP-11130

Conflicts:
	Rakefile
2014-11-04 10:10:12 -06:00
Luke Imhoff c2bd75b587
Clean up leaked constants
MSP-11130
2014-10-29 15:50:47 -05:00
James Lee 7081026ae6 Fix some specs broken by 2.x's new rules
* default utf-8 everywhere broke tests in lib/rex/text_spec that dealt
   with binary data
 * new protected rules
2014-10-27 10:28:24 -05:00
Luke Imhoff 080ea3e56a
Merge branch 'staging/great-backport' into feature/MSP-11126/msf-module-reorg
MSP-11126
2014-10-17 14:28:13 -05:00
Luke Imhoff ae45c1b9d3
Msf::Module::Rank -> Msf::Module::Ranking
MSP-11126

So that mixin module won't appear as Rank constant that Msf::Module
subclasses are supposed to define.
2014-10-17 13:39:53 -05:00
Luke Imhoff 575717681c
Extract Msf::Module::Privileged shared examples
MSP-11126
2014-10-17 11:48:36 -05:00
Luke Imhoff 45302b9403
Extract Msf::Module::UUID shared examples
MSP-11126
2014-10-17 11:34:35 -05:00
Luke Imhoff d86eda5f1d
Extract Msf::Module::Author shared examples
MSP-11126
2014-10-17 11:20:23 -05:00
Luke Imhoff 13923a8ca5
Fully-qualify Msf::DBImportError
MSP-11152

Constant was unqualified in some of the reorganized Msf::DBManager code
because that code was take advantage of the old nested lexical scope
that included `Msf`.
2014-10-17 09:29:01 -05:00
Luke Imhoff 839657abec
Extract Msf::Module::Network shared examples
MSP-11126
2014-10-16 15:54:35 -05:00
Luke Imhoff 244e4a9954
Extract Msf::Module::Search shared examples
MSP-11126
2014-10-16 15:40:19 -05:00
Luke Imhoff be945d26fc
Extract Msf::Module::FullName shared examples
MSP-11126
2014-10-16 15:33:13 -05:00
Luke Imhoff c501e1e58a
Extract Msf::Module::Rank shared examples
MSP-11126
2014-10-16 14:41:59 -05:00
Luke Imhoff 925cd63171
Extrat Msf::Module::Type shared examples
MSP-11126
2014-10-16 14:28:43 -05:00
Luke Imhoff e418f98d45
arch -> Msf::Module::Arch
MSP-11126
2014-10-16 13:21:11 -05:00
Luke Imhoff 28af6a490b
Extract Msf::Module::Arch shared examples
MSP-11126
2014-10-16 13:16:57 -05:00
Luke Imhoff a2dc3b754f
Extract Msf::Module::ModuleInfo shared examples
MSP-11126
2014-10-16 13:10:15 -05:00
Luke Imhoff f8ada87e86
Extract Msf::Module::Options shared examples
MSP-11126
2014-10-16 11:24:03 -05:00
Luke Imhoff c50cb2eb8a
Extract Msf::Module::UI::*::Verbose and shared examples
MSP-11126
2014-10-16 10:05:45 -05:00
Luke Imhoff a3afb92ee2
Extract Msf::Module::UI::Line shared examples
MSP-11126
2014-10-16 09:51:23 -05:00
Luke Imhoff 96864b3892
Extract Msf::Module::UI::Message shared examples
MSP-11126
2014-10-16 09:45:17 -05:00
Luke Imhoff 4d9f7db15a
Extract Msf::Module::Compatibility
MSP-11126
2014-10-16 09:29:31 -05:00
Luke Imhoff 9b10a3f1dc
Extract Msf::Module::DataStore shared examples
MSP-11126
2014-10-16 09:14:44 -05:00
Luke Imhoff 6a194b3a88
Extract Msf::Module::ModuleStore shared examples
MSP-11126
2014-10-16 09:03:12 -05:00
Luke Imhoff 3bce8e418d
unserialize_object -> Msf::DBManager::Import::MetasploitFramework shared examples
MSP-11124
2014-10-15 14:03:55 -05:00
Luke Imhoff 1aca55bc2a
nils_for_nulls -> Msf::DBManager::Import::MetasploitFramework shared examples
MSP-11124
2014-10-15 14:00:42 -05:00
Luke Imhoff 27c5cf8887
Move helpers to Msf::DBManager::Import::Libpcap shared examples
MSP-11124
2014-10-15 13:57:27 -05:00
Luke Imhoff 5d59224520
Extract Msf::DBManager::Import::Report shared examples
MSP-11124
2014-10-15 13:53:09 -05:00
Luke Imhoff 505ca5fcc0
Extract Msf::DBManager::Import::Wapiti shared examples
MSP-11124
2014-10-15 13:47:22 -05:00
Luke Imhoff 6e0c7f0aaf
Extract Msf::DBManager::Import::Spiceworks shared examples
MSP-11124
2014-10-15 13:40:03 -05:00
Luke Imhoff 92a6c79200
Extract Msf::DBManager::Import::Retina shared examples
MSP-11124
2014-10-15 13:24:40 -05:00
Luke Imhoff ac6a8387a5
Extract Msf::DBManager::Import::Outpost24 shared examples
MSP-11124
2014-10-15 13:21:21 -05:00
Luke Imhoff 0418027c90
Extract Msf::DBManager::Import::OpenVAS
MSP-11124
2014-10-15 13:13:57 -05:00
Luke Imhoff aa4c104df5
Extract Msf::DBManager::Import::Nmap shared examples
MSP-11124
2014-10-15 13:08:05 -05:00
Luke Imhoff 926c5adb49
Extract Msf::DBManager::Import::Nikto shared examples
MSP-11124
2014-10-15 12:57:24 -05:00
Luke Imhoff 3049301c96
Extract Msf::DBManager::Import::Nexpose::Simple shared examples
MSP-11124
2014-10-15 12:44:24 -05:00
Luke Imhoff b49dd166fd
Extract Msf::DBManager::Import::Nexpose::Raw shared examples
MSP-11124
2014-10-15 12:38:35 -05:00
Luke Imhoff 3638b0a91b
Extract Msf::DBManager::Import::Netsparker shared examples
MSP-11124
2014-10-15 11:49:01 -05:00
Luke Imhoff cceec8eb53
Extract Msf::DBManager::Import::Nessus::XML::V* shared examples
MSP-11124
2014-10-15 11:37:24 -05:00
Luke Imhoff cee782ab8b
Extract Msf::DBManager::Import::Nessus::XML shared examples
MSP-11124
2014-10-15 11:30:23 -05:00
Luke Imhoff 71af8fd9c2
Extract Msf::DBManager::Import::Nessus::NBE shared examples
MSP-11124
2014-10-15 11:23:52 -05:00
Luke Imhoff 4c9b29de95
Extract Msf::DBManager::Import::MetasploitFramework::Credential shared examples
MSP-11124
2014-10-15 11:15:13 -05:00
Luke Imhoff 7d101be0f5
Extract Msf::DBManager::Import::MetasploitFramework::Zip shared examples
MSP-11124
2014-10-15 11:02:27 -05:00
Luke Imhoff 65885c8cc8
MsfXml -> MetasploitFramework::XML
MSP-11124
2014-10-15 10:25:42 -05:00
Luke Imhoff 102e9d8972
import_msf_file -> Msf::DBManager::Import::MsfXml shared examples
MSP-11124
2014-10-15 10:04:21 -05:00
Luke Imhoff c7d16810ad
Extract Msf::DBManager::Import::MBSA shared examples
MSP-11124
2014-10-15 09:58:24 -05:00