infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
38,808 Commits
7 Branches
556 Tags
421 MiB
Commit Graph

313 Commits (746ba4d76c7f1332896b7ba1e26207ab4df10914)

Author SHA1 Message Date
Trevor Rosen 2815462375
Update Mdm to staging hash 2015-03-27 15:16:33 -05:00
James Lee 466ef4349e
Second verse, same as the first 2015-03-27 09:59:10 -05:00
James Lee 88a8186a11
Pull up redundant hash literal 2015-03-26 19:33:53 -05:00
Matt Buck c26dfa263d
Ensure IP addresses are explicitly converted to strings 
MSP-12113
 2015-03-24 16:26:00 -05:00
James Lee 023f47f19a
Use build instead of create 2015-03-24 13:17:42 -05:00
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
Tod Beardsley db474adc7b
Remove the helper as well. 
See #3807.

Again, happy to have working tests that actually test validity. But,
these ain't them.
 2014-12-18 13:28:04 -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 43511e648a
Merge branch 'chore/MSP-11614/remove-msf-db-manager-sink' into feature/MSP-11605/lazy-thread-creation 
MSP-11605

Conflicts:
	spec/lib/msf/core/task_manager_spec.rb
 2014-11-14 11:59:12 -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 8925db2ec1
Remove thread cleaner from Msf::Simple::Framework shared context 
MSP-11605

The `framework` from 'Msf::Simple::Framework' shared context is not
guaranteed to make threads with `framework.threads` anymore, so the
cleaner shouldn't allows be present in 'Msf::Simple::Framework'.
 2014-11-14 09:14:13 -06:00
Luke Imhoff 69e726e2c9
Fail if 'Msf::Framework#threads cleaner' is unnecessary 
MSP-11605

The 'Msf::Framework#threads cleaner' shared context fails with a
RuntimeError if `framework.threads?` is false, which would indicate that
cleaning is unnecessary.  This change stops 'Msf::Framework#threads
cleaner' from accessing `framework.threads`, which would create threads
only to immediately clean them up.
 2014-11-13 14:22:40 -06:00
Luke Imhoff 69043d51e0
Merge branch 'master' into feature/MSP-11147/thread-leak-detection 
MSP-11147
 2014-11-12 12:34:25 -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 eede74be1e
Extract 'Msf::Framework#threads cleaner' 
MSP-11147

Extract from 'Msf::Simple::Framework' the `after(:each)` that kills and joins
threads from `framework.threads` into 'Msf::Framework#threads cleaner`.
 2014-11-11 11:49:48 -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
Luke Imhoff ff0391cdc7
Fix derive_module_ancestor_names 
MSP-11130

Wrap :reference_name in an Array since :ancestor_reference_names is
expected to be an Array.
 2014-11-04 09:40:55 -06:00
Tod Beardsley 0b39c2ed85
Land #4084, prep for Ruby 2.1 2014-11-03 13:43:50 -06:00
Luke Imhoff 9ea1240cbb
Default modules_path 
MSP-11130

Default `:modules_path` to use the `#modules_path` left for
'Msf::Simple::Framework#modules#loading''s `#load_and_create_module`.
 2014-11-03 11:06:49 -06:00
Luke Imhoff 0296d1784d
Derive ancestor reference names from reference name 
MSP-11130

For 'Msf::Simple::Framework#modules loading''s load_and_create_modules,
don't require `:ancestor_reference_names` when the `:module_type` is not
payload as the one ancestor reference name will be the same as
`:reference_name`.
 2014-11-03 10:59:01 -06:00
Luke Imhoff d97bc52d8a
Complete documentation for 'Msf::Simple::Framework::Modules loading' 
MSP-11130
 2014-11-03 09:47:29 -06:00
Luke Imhoff f0001eb9e6
Extract 'Msf::Simple::Framework#modules loading' 
MSP-11130

'Msf::Simple::Framework#modules loading' defines
`#load_and_create_module`, which takes the :ancestor_reference_names,
:modules_path, :module_type, and :reference_name of the module whose
ancestors to load and the reference name to create. A default modules
path, the first 'modules' path for the Rails application is available in
in the `#modules_path` let.
 2014-11-03 08:59:06 -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
Luke Imhoff 892aeaf727
Metasploit::Framework::Spec::Constants cleaner 
MSP-11130

Shared context will calls `Metasploit::Framework::Spec::Constants.clean
after each example.
 2014-10-29 11:31:17 -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
Joshua Smith 34f29f218c really resolve merge conflicts 2014-10-23 21:51:33 -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 a7317cb86c
Extract 'untested payloads' shared context 
MSP-11145

Detects if payloads are untested when using the 'payload can be
instantiated' shared examples.
 2014-10-23 09:55:14 -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
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
Luke Imhoff 1edad5e0b7
Extract Msf::DBManager::Import::Libpcap shared examples 
MSP-11124
 2014-10-15 09:49:58 -05:00
Luke Imhoff 8b8befeee1
Extract Msf::DBManager::Import::IPList shared examples 
MSP-11124
 2014-10-15 09:43:49 -05:00
Luke Imhoff 66b1dcc42d
Extract Msf::DBManager::Import::FusionVM shared examples 
MSP-11124
 2014-10-15 09:38:44 -05:00
Luke Imhoff 0bfc496824
Extract Msf::DBManager::Import::Foundstone shared examples 
MSP-11124
 2014-10-15 09:31:17 -05:00