Commit Graph

199 Commits

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 45fea32c77 Use 'Metasploit::Simple::Framework#modules loading' in 'payloads can be instantiated'
MSP-11130

Use `expect_to_load_module_ancestor` and `load_and_create_module` in
favor of the custom code in 'payloads can be instantiated'.
2014-11-04 13:06:52 -06:00
Luke Imhoff c115ad3c36 Use load_and_create_module in modules_spec
MSP-11130

Reuse 'Msf::Simple::Framework#modules loading' context in 'all modules
with module type can be instantiated' instead of using the similar code.
2014-11-04 12:59:59 -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
Tod Beardsley 0b39c2ed85 Land #4084, prep for Ruby 2.1 2014-11-03 13:43:50 -06:00
Luke Imhoff c2bd75b587 Clean up leaked constants
MSP-11130
2014-10-29 15:50:47 -05:00
Luke Imhoff 7e2897277b Rename shared example file to match name
MSP-11130
2014-10-29 12:54:29 -05:00
Joe Vennix c6bbc5bccf Merge branch 'landing-4055' into upstream-master 2014-10-28 11:18:20 -05:00
Luke Imhoff dae114a7f3 Document how to derive reference_name from ancestors
MSP-11145
2014-10-27 15:59:12 -05:00
Luke Imhoff 1df82ea273 Fix typo in file name
MSP-11145
2014-10-27 11:34:26 -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 48d6880f1d Add docs for untested payload testing
MSP-11145

Add docs to rake task, shared examples, and share contexts for how to
use all 3 together.
2014-10-23 11:17:05 -05:00
Luke Imhoff 6c3c830efb Extract 'payload can be instantiated' shared example
MSP-11145

Extracted so that pro can use it.
2014-10-23 09:35:52 -05:00
Luke Imhoff 88839e841a Extract 'all modules with module type can be instantiated' shared example
MSP-11145

Extracted so it can be used by pro.
2014-10-23 09:31:44 -05:00
James Lee bb119b840a Move Tcp specs into their own shared example
All the Tcp options formerly in RexSocket got moved, this just brings
the specs in line with the new reality.
2014-10-22 09:16:14 -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
Joshua Smith 32faa0bc62 Land 3796, specs for Rex::Encoder::Alpha2 encoders 2014-10-17 13:15:00 -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