2b016e0216
Land #6812 , remove broken OSVDB references
2016-07-11 22:59:11 -05:00
fb5b228984
Merge branch 'master' into staging/rails-upgrade
2016-05-02 11:33:35 -05:00
050061762b
Fix db_manager rspec tests
...
MS-255
2016-04-28 13:17:02 -05:00
e7f0163c2e
Apparently super doesn't work the same here in 2.3
...
But it doesn't matter, the value just needs to be before the current
time, so replace it with a simpler solution.
2016-04-26 10:35:41 -05:00
816bc91e45
Resolve #6807 , remove all OSVDB references.
...
OSVDB is no longer a vulnerability database, therefore all the
references linked to it are invalid.
Resolve #6807
2016-04-23 12:32:34 -05:00
8f3f2f74b4
Move shared example from pro into framework
...
MS-1361
2016-04-07 13:09:52 -05:00
c6656e4031
example_group and hook_scope conversions
...
not strictly required, these conversions keep us
up to date with latest rspec conventions and best practices
which will prevent use from having to convert them when they become
deprecated later
2015-12-31 16:56:13 -06:00
99931aff44
Call stance only if module implements stance
2015-12-10 21:47:22 -06:00
a96445b302
switch out expect with a proper mock by allow
2015-12-10 21:47:22 -06:00
5056321d34
replace before block expecations with allow statements
...
comment out some before statements that seem to be causing a problem
2015-12-10 21:47:22 -06:00
71ce9b377a
change module manager stub from expect to allow
2015-12-10 21:47:22 -06:00
2fc0c0b326
switch expect stubs
...
in ui_driver shared context to allows
2015-12-10 21:47:22 -06:00
93d4be2301
replace stubbing expects with allow statements
2015-12-10 21:47:22 -06:00
2beb42a734
Use msf_data attribute
2015-12-10 21:47:22 -06:00
bc80bf7fdb
use Msf::StringIO on client_spec
2015-12-10 21:47:22 -06:00
3d0fcdf84d
Add set_msf_data
2015-12-10 21:47:22 -06:00
2041149d54
Use Msf::StringIO in connection_spec
2015-12-10 21:47:22 -06:00
4872628ff5
Try to make it generic
2015-12-10 21:47:22 -06:00
236c28b6fb
Add shared context
2015-12-10 21:47:22 -06:00
3d64c52c9a
it { should_not -> it { is_expected.not_to
...
MSP-13484
2015-12-10 21:47:22 -06:00
6f71810010
it { should -> it { is_expected.to
...
MSP-13484
2015-12-10 21:47:22 -06:00
05585acb89
.should_not -> expect().not_to
...
MSP-13484
2015-12-10 21:47:22 -06:00
337be4355d
Fix Msf::DBManager spec upgrade problems
...
MSP-13484
2015-12-10 21:47:22 -06:00
d1f64363b1
.any_instance -> *_any_isntance_of()
...
MSP-13484
2015-12-10 21:47:22 -06:00
0eb68ef16c
.should_not_receive -> expect().not_to receive
...
MSP-13484
2015-12-10 21:47:22 -06:00
4870909afc
.should -> expect().to
...
MSP-13484
2015-12-10 21:47:22 -06:00
2534b18f4c
.stub -> expect().to receive
...
MSP-13484
2015-12-10 21:47:22 -06:00
03c649bb91
should_receive -> expect().to receive
...
MSP-13484
2015-12-10 21:47:22 -06:00
6f29e9a4cf
.should == -> expect().to eq
...
MSP-13484
2015-12-10 21:47:22 -06:00
3fff6cabce
should_not == -> expect().not_to eq
...
MSP-13484
2015-12-10 21:47:22 -06:00
fc9ca84da5
shared_context -> RSpec.shared_context
...
MSP-13484
shared_context must be qualified as global patching is disabled in
spec_helper.
2015-12-10 21:47:22 -06:00
d4b9b8e1a4
Stub out :create_match_for_vuln on MatchSet since we already test it
...
MSP-13119
2015-09-29 16:36:59 -05:00
52e3405192
Passing report_exploit_success specs
...
MSP-13119
2015-09-23 11:12:02 -05:00
dc84b3b1ba
Passing report_exploit_failure specs
...
MSP-13119
2015-09-23 10:54:13 -05:00
359306a1a4
Add specs to exploit_attempt to cover report_exploit_failure
...
MSP-13119
2015-09-18 12:25:21 -05:00
d3a73149a2
Add specs around match result creation in exploit attempt
...
MSP-13119
2015-09-18 12:04:45 -05:00
c7f15ca940
Rework how match results get created
...
MSP-13119
* Create match result when we create vuln attempt
2015-09-14 12:18:47 -05:00
0f9032100d
Stub print_status to allow testing of workspace...
...
and other things that may use print_status rather than print line
2015-08-28 11:10:35 -07:00
68a802b980
Merge pull request #5834 from gmikeska-r7/bug/MSP-13064/SVV-validations-not-created
...
Bug/msp 13064/svv validations not created
2015-08-19 12:47:59 -05:00
f25a5da46f
Do Minor fixes
2015-08-14 12:37:49 -05:00
66148336e1
Modify tests to resolve false negative
...
MSP-13064
2015-08-14 11:48:52 -05:00
6b1e911041
Instantiate payload modules so parameter validation occurs
...
Calling .new on payload modules does not perform parameter validation, leading
to a number cached sizes based on invalid parameters. Most notably,
normalization does not occur either, which makes all OptBool params default to
true.
2015-08-14 11:35:39 -05:00
8163c3cdda
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
plugins/nessus.rb
2015-04-28 15:33:46 -05:00
6a4d63ca4f
Drop explicit IPAddr to String coercion
...
MSP-12611
2015-04-27 10:48:13 -05:00
4224008709
Delete print_debug/vprint_debug
2015-04-21 11:14:03 -05:00
5e2d6c27c3
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
db/schema.rb
lib/msf/core/db_manager/session.rb
metasploit-framework-db.gemspec
2015-04-06 11:27:00 -05:00
76bfaa6ce9
Fix dumb inverted logic. Thanks, rspec!
2015-03-31 14:28:07 -05:00
176cdcb836
Use sym-to-proc instead of reimplementing it
2015-03-31 11:21:53 -05:00
790a08a848
It's pronounced "exploit", not "assoc_exploit"
2015-03-30 16:21:17 -05:00
2394d4bae8
Merge branch 'staging/single-vuln-push' into feature/MSP-11934/refactor-report-exploit-success
...
Conflicts:
Gemfile
Gemfile.lock
spec/support/shared/examples/msf/db_manager/exploit_attempt.rb
2015-03-30 14:08:54 -05:00
6386289d80
Remove bogus spec
...
No longer necessary to check that we're instantiating an Msf::Module
because we get the same information by reusing an existing
Mdm::Module::Detail
2015-03-30 13:10:36 -05:00
7b1ac29788
Fix subject
2015-03-30 00:53:31 -05:00
283e50fd42
Check the case of having no vuln
2015-03-30 00:09:49 -05:00
2815462375
Update Mdm to staging hash
2015-03-27 15:16:33 -05:00
466ef4349e
Second verse, same as the first
2015-03-27 09:59:10 -05:00
88a8186a11
Pull up redundant hash literal
2015-03-26 19:33:53 -05:00
c26dfa263d
Ensure IP addresses are explicitly converted to strings
...
MSP-12113
2015-03-24 16:26:00 -05:00
023f47f19a
Use build instead of create
2015-03-24 13:17:42 -05:00
b9934cfd3f
Add workspace to ensure consistency with session
2015-03-24 13:14:55 -05:00
13a899b3d2
Use a named subject
2015-03-24 13:13:54 -05:00
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
f29a3f69e9
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
metasploit-framework-db.gemspec
2015-03-17 15:47:48 -05:00
cb41154712
Make a MatchResult when sessions are reported
2015-03-10 15:17:57 -05:00
60145ad9a1
Cosmetic tweaks to the specs
2015-03-09 15:08:11 -05:00
7dc0af443f
Rework specs
2015-03-09 14:41:25 -05:00
33f96f5c31
Remvoe the useless pinst variable from the previous test
2015-03-09 13:59:58 -05:00
f61c3f33bd
Validate cached_size and dynamic_size? in the payload specs
2015-03-09 13:58:18 -05:00
ff91953f92
Whitespace
2015-03-09 08:58:25 -05:00
9195479a6d
Add a context for without user_data
2015-03-09 08:56:52 -05:00
b37a975108
Use metasploit_data_models staging branch
2015-03-09 01:28:27 -05:00
8b0354b193
Fix the SSL boolean test
2015-02-23 14:29:28 -06:00
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
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
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
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
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
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
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
69043d51e0
Merge branch 'master' into feature/MSP-11147/thread-leak-detection
...
MSP-11147
2014-11-12 12:34:25 -06:00
1fd8fe57df
Merge staging/great-backport to master
...
Conflicts:
spec/lib/msf/core/module_spec.rb
2014-11-12 11:08:18 -06:00
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
2d7c517e2f
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
2014-11-04 15:34:25 -06:00
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
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
b0f1b2a1f7
Merge branch 'master' into feature/MSP-11130/metasploit-framework-spec-constants
...
MSP-11130
Conflicts:
Rakefile
2014-11-04 10:10:12 -06:00
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
0b39c2ed85
Land #4084 , prep for Ruby 2.1
2014-11-03 13:43:50 -06:00
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
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
d97bc52d8a
Complete documentation for 'Msf::Simple::Framework::Modules loading'
...
MSP-11130
2014-11-03 09:47:29 -06:00
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
c2bd75b587
Clean up leaked constants
...
MSP-11130
2014-10-29 15:50:47 -05:00
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
7e2897277b
Rename shared example file to match name
...
MSP-11130
2014-10-29 12:54:29 -05:00
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
c6bbc5bccf
Merge branch 'landing-4055' into upstream-master
2014-10-28 11:18:20 -05:00
dae114a7f3
Document how to derive reference_name from ancestors
...
MSP-11145
2014-10-27 15:59:12 -05:00
1df82ea273
Fix typo in file name
...
MSP-11145
2014-10-27 11:34:26 -05:00
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
34f29f218c
really resolve merge conflicts
2014-10-23 21:51:33 -05:00
Brent Cook
David Maloney
dmohanty-r7
James Lee
wchen-r7
Fernando Arias
Gregory Mikeska
jvazquez-r7
Luke Imhoff
Jon Hart
Matt Buck
Trevor Rosen
HD Moore
Tod Beardsley
Matt Buck
darkbushido
Joe Vennix
Joshua Smith