adam/metasploit-gs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,054 Commits 27 Branches 1,043 Tags
94de45d856b7d4ea32456bbdc7531af67bfbcaa1
Commit Graph

316 Commits

Author SHA1 Message Date
James Lee b9934cfd3f Add workspace to ensure consistency with session 2015-03-24 13:14:55 -05:00
James Lee 13a899b3d2 Use a named subject 2015-03-24 13:13:54 -05:00
James Lee 414983ac8c Merge branch 'feature/MSP-11925/create-user-data' into staging/single-vuln-push 
Conflicts:
	Gemfile.lock
 2015-03-24 12:42:08 -05:00
Matt Buck f29a3f69e9 Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile.lock
	metasploit-framework-db.gemspec
 2015-03-17 15:47:48 -05:00
James Lee cb41154712 Make a MatchResult when sessions are reported 2015-03-10 15:17:57 -05:00
HD Moore 60145ad9a1 Cosmetic tweaks to the specs 2015-03-09 15:08:11 -05:00
HD Moore 7dc0af443f Rework specs 2015-03-09 14:41:25 -05:00
HD Moore 33f96f5c31 Remvoe the useless pinst variable from the previous test 2015-03-09 13:59:58 -05:00
HD Moore f61c3f33bd Validate cached_size and dynamic_size? in the payload specs 2015-03-09 13:58:18 -05:00
James Lee ff91953f92 Whitespace 2015-03-09 08:58:25 -05:00
James Lee 9195479a6d Add a context for without user_data 2015-03-09 08:56:52 -05:00
James Lee b37a975108 Use metasploit_data_models staging branch 2015-03-09 01:28:27 -05:00
HD Moore 8b0354b193 Fix the SSL boolean test 2015-02-23 14:29:28 -06:00
Matt Buck 2cd5be021b Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb
	metasploit-framework-db.gemspec
	metasploit-framework.gemspec
 2015-01-08 13:12:27 -06:00
Matt Buck 0249e0a800 Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile.lock
	db/schema.rb
	metasploit-framework-db.gemspec
 2014-12-02 09:47:47 -06:00
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
darkbushido 2d7c517e2f Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile.lock
 2014-11-04 15:34:25 -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
darkbushido 001e98ab1d porting the IPAddr support over 
I lost some of the changes I had made to db.rb and had to dig them up
the changes made to mdm fixes the last failing specs.
 2014-10-29 15:21:16 -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