Luke Imhoff
249a09cd52
Update to metasploit_data_models 0.7.1
...
[#47979793 ]
2013-04-26 13:14:38 -05:00
Tod Beardsley
5e2634f155
Merge the rest of #1765
...
This merge and commit f2838ee
is for both. I was a little quick on the
draw for the last merge, didn't catch the latest commit.
2013-04-26 12:18:14 -05:00
Tod Beardsley
f2838eed92
Land #1765 , before each fixes to rspec
2013-04-26 12:09:05 -05:00
James Lee
a12dbbaee7
Use :each instead of :all here, too
2013-04-26 11:49:30 -05:00
James Lee
e2dece6f0e
Make sure xor encoders work with odd padding
2013-04-25 15:45:06 -05:00
Luke Imhoff
9207ed6532
Msf::Ui::Console::CommandDispatcher::Core#search_modules_sql spec
...
[#47979793 ]
2013-04-25 14:33:13 -05:00
James Lee
1ec6884bfa
Use before(:each) instead of :all
...
Fixes deprecation warnings in newer rspec like these
WARNING: subject accessed in a `before(:all)` hook at:
/metasploit-framework/spec/lib/rex/post/meterpreter/packet_spec.rb:455:in `block (3 levels) in <top (required)>'
This is deprecated behavior that will not be supported in RSpec 3.
Also switches to using named subjects for easier reading.
2013-04-25 10:28:30 -05:00
Luke Imhoff
24b97137ea
Msf::DBManager Mdm::Module* specs
...
[#47979793 ]
2013-04-25 09:46:53 -05:00
James Lee
93bddd9041
Improved docs and partial specs for Rex::Text
...
Conflicts:
lib/msf/core/modules/loader/base.rb
lib/rex/poly/block.rb
lib/rex/text.rb
2013-04-23 17:24:03 -05:00
Luke Imhoff
4b0e639cf1
Do not mock on nil.
...
[#47979793 ]
Using `should_not_receive` on `nil` gives `nil` a permanent
`@mock_proxy`, which causes Marshal.dump to fail in later tests (see
https://travis-ci.org/rapid7/metasploit-framework/builds/6502350 ). By,
checking there are no NoMethoErrors raised, nil can be tested as
parent_module, but works around the RSpec issue
(https://github.com/rspec/rspec-mocks/issues/274 ).
2013-04-22 10:25:01 -05:00
Luke Imhoff
be0c61a207
Change spec structure to reflect module/classes for Msf::DBManager
...
[#47979793 ]
Multiple files define Msf::DBManager, but it's better to have one spec
for Msf::DBManager, so change spec structure to reflect module and class
hierarchy instead of file hierarchy of defining files.
2013-04-20 16:51:29 -05:00
Luke Imhoff
492b081280
Msf::DBManager::Export#extract_module_detail_info spec
...
[#47979793 ]
2013-04-20 16:44:42 -05:00
Luke Imhoff
3bf3cfccc6
Use be_within to loosen tolerance for Time comparisons
...
[#47979793 ]
[#48414569 ]
Even though using Timecop locally on OS X makes the `should == <Time>`
work, it fails on travis-ci, so try using `should
be_within(1.second).of(<Time>)` instead.
2013-04-19 12:07:12 -05:00
Luke Imhoff
e5befb7094
Msf::DBManager#report_session specs
...
[#47979793 ]
2013-04-19 10:11:33 -05:00
Luke Imhoff
2c681005c0
Msf::ModuleManager::Cache spec coverage
...
[#47979793 ]
2013-04-15 13:08:12 -05:00
Luke Imhoff
0709395570
Msf::ModuleManager::Loading shared example
...
[#47979793 ]
2013-04-12 15:18:16 -05:00
Luke Imhoff
ff7a8e6351
Msf::ModuleManager::ModulePaths shared example
...
[#47979793 ]
2013-04-12 15:14:04 -05:00
Brandon Turner
e3ab2e9747
Fix specs with bundler groups
...
Also output warnings when running Rake when the db group isn't included.
2013-04-12 10:46:00 -05:00
Luke Imhoff
7d5f010e4e
Fix typo in spec let
...
[#46491831 ]
The root element was web_page in the source for example that tests that
import_msf_web_vuln_element creates an Mdm::WebVuln. The root element
name did not actually matter for the example, but it looked like an
error and was confusing to read the setup that root element was web_page
instead of the correct web_vuln.
2013-04-02 09:11:43 -05:00
Luke Imhoff
0bb79ba890
Msf::DBManager#import_msf_xml refactor
...
[#46491831 ]
Move Msf::DBManager#import_msf_xml into
Msf::DBManager::ImportMsfXml#import_msf_xml and include
Msf::DBManager::ImportMsfXml to cut down size of the infamous db.rb.
Break up #import_msf_xml to have separate methods for parsing web_forms,
web_pages, and web_vulns. The method for
web_vulns, #import_msf_web_vuln_element is needed so that it can be overridden in
Pro to handle the Pro-only changes to Mdm::WebVuln.
2013-04-01 16:06:40 -05:00
Luke Imhoff
8c6a9d5622
Turn shared prefixes into directories
...
[#46491831 ]
Change the shared msf_modules_* prefixes in spec/support/shared/* into
directories.
2013-03-28 15:39:07 -05:00
Luke Imhoff
2075a7b46c
Remove active_record patch
...
[#46141013 ]
Version 3.2.12 of activerecord contains the changes that the original
patch made so the patch is no longer needed.
2013-03-18 11:32:21 -05:00
Luke Imhoff
f1a4fd937a
Specs for activerecord patch
...
[#46141013 ]
Spec the desired behavior for ConnectionPool prior to removing the patch
to sync with upstream 3.2.12.
2013-03-18 11:01:45 -05:00
Luke Imhoff
2604fad164
Allow use of rake db tasks
...
[#46224565 ]
The following rake tasks are added and work similar to how they work in
rails apps:
* db:create
* db:drop
* db:migrate
* db:migrate:status
* db:rollback
* db:schema:dump
* db:schema:load
* db:seed (but no db seeds defined at this time)
* db:setup
* db:version
The hidden task db:test:prepare is also available, which means `rake
spec` can depend on it so that the test database is dropped and
recreated from the development database when running specs (Although
there are yet to be database tests, this branch is in preparation for
that work that will be split between multiple developers.)
2013-03-14 15:46:18 -05:00
James Lee
f321cea4cd
Slightly more readable assertion
2013-03-07 14:45:58 -06:00
James Lee
8abcc5a1d4
Whitespace
2013-03-07 14:34:44 -06:00
David Maloney
7332d31523
fix some style things for egypt
2013-03-07 11:11:48 -06:00
David Maloney
f253b28ae0
sponge left in patient
2013-03-05 07:48:07 -06:00
David Maloney
6eb334c925
a little more coverage
2013-03-05 00:01:09 -06:00
David Maloney
d909c00036
better spec coverage
2013-03-04 23:43:18 -06:00
David Maloney
3a72fa4ea0
address sslv2 issues in specs
...
the ubuntu sslv2 thing caused all kinds of issues with rspec
handling this by expecting those exceptions properly or doing away
with sslv2 where it isn't needed in the examples
2013-03-04 21:45:44 -06:00
David Maloney
3bb1b2b368
attempt to deal with specs
2013-03-04 19:25:20 -06:00
David Maloney
dc7c02e9e8
still trying to get around this sslv2 thing
2013-03-04 18:18:01 -06:00
David Maloney
246977e0cf
Address openssl sslv2 issues
...
Debian/Ubuntu ship openssl without sslv2 compiled in.
we now check for this ahead of time
2013-03-04 17:39:28 -06:00
David Maloney
13ad5cf150
Merge branch 'master' into feature/ssl/add_cipher_support
2013-03-04 15:07:32 -06:00
James Lee
cb18b81503
Add spec to ensure auth is sane
2013-03-04 11:59:30 -06:00
David Maloney
4212c36566
Fix up basic auth madness
2013-03-01 11:59:02 -06:00
James Lee
5a79fcd11e
Ensure we build only one Authorization header
...
Also fixes an issue where Host headers were generated with nil by
preferring the vhost from Client instead of the default nil from
ClientRequest.
2013-02-28 13:47:30 -06:00
James Lee
425c245771
Axe set_cgi in favor of set_uri
...
They were identical except for a couple of extra bugs in set_cgi.
Also changes ```split("/")``` to ```split("/", -1)```, which behaves
correctly when the input has a seperator at the beginning or end.
2013-02-27 19:13:05 -06:00
James Lee
16bba7a6ac
Add test for pad_get_params
2013-02-27 18:06:55 -06:00
James Lee
4edd46216f
Refactor config -> opts
...
Puts all the evasion stuff in the same place as regular HTTP options to
make it easier to deal with.
2013-02-27 17:29:26 -06:00
James Lee
5606db3f9c
Re-enable some commented tests
2013-02-27 16:28:17 -06:00
James Lee
29df20996e
Move most of the configuration into ClientRequest
...
Also fixes in-place modification of the query string which resulted in
duplication of the GET parameters when calling #to_s more than once.
2013-02-26 17:38:09 -06:00
James Lee
935304ee0c
No longer pending
2013-02-26 16:36:36 -06:00
James Lee
93537de68c
Use let and subject blocks for better readability
2013-02-26 16:27:32 -06:00
James Lee
579c11bc69
Set reasonable defaults for more things
...
All current tests are passing now
2013-02-26 14:25:46 -06:00
James Lee
c206ac4998
Set some reasonable defaults
...
Fixes a number of nil deref issues
2013-02-26 14:15:51 -06:00
James Lee
7b3a11f2f9
Axe tests that belong in client_request_spec
2013-02-26 13:28:44 -06:00
James Lee
cae030ccd7
Whitespace
2013-02-26 13:25:37 -06:00
James Lee
5ac20e1b02
Merge branch 'feature/http/authv2' of git://github.com/dmaloney-r7/metasploit-framework into dmaloney-r7-feature/http/authv2
...
Conflicts:
lib/rex/proto/http/client.rb
2013-02-26 12:08:00 -06:00
David Maloney
c104fa6d97
Add spec and a few fixes for set_uri
2013-02-26 11:01:16 -06:00
James Lee
1ce86b7adb
Whitespace
2013-02-25 14:29:10 -06:00
James Lee
904a69ba63
Move xor tests to the right filenames
...
Thanks, simplecov, for telling me that these weren't actually getting
run.
2013-02-25 13:02:03 -06:00
James Lee
b497fdb72a
Merge branch 'master' of github.com:rapid7/metasploit-framework into rapid7
2013-02-25 12:58:38 -06:00
James Lee
ff9fc02fee
Merge remote-tracking branch 'rapid7/feature/simplecov-groups' into rapid7
2013-02-25 12:54:04 -06:00
Tod Beardsley
73f6314373
Moving @cli and @ip to instance vars
2013-02-25 08:29:08 -06:00
Tod Beardsley
caed599f7d
Backed out all the fails from the auth bits
2013-02-25 08:26:02 -06:00
Tod Beardsley
6e35813d69
Pending hashes need to end w a block
2013-02-25 08:20:46 -06:00
James Lee
4a84528ecf
Move pending messages to it()'s args
2013-02-20 15:02:12 -06:00
Tod Beardsley
5a0744934e
Let's not intro functionality as testing
...
That's a bad habit to get into.
2013-02-11 21:06:52 -06:00
Tod Beardsley
ba7f5a7245
Actually run this spec.
2013-02-11 21:04:57 -06:00
Tod Beardsley
039fd2b885
Adds some light testing for Rex's HTTP client lib
...
In light ofi PR #1476 , it would be nice to have some basic, modern,
maintained testing on Rex's HTTP Client proto library.
My rspec fu is quite weak, of course, but this should cover the very
basic cases. There are lots of pending holes, but hey, it's a start.
2013-02-11 15:54:40 -06:00
David Maloney
949eb08062
In the final stages
2013-02-11 09:59:39 -06:00
David Maloney
0f9b16d07f
Scanner class finished, result needs more work
...
the result class needs a nice clean to_s method to print easily readable
output. mostly working now. a few more tweaks needed.
2013-02-09 19:06:17 -06:00
David Maloney
c25d4b4863
Test Cipher method underway
...
Trying to get a clever test plan under way to actually test the network
side of this. Not quite working yet
2013-02-09 01:07:56 -06:00
David Maloney
38d0a244fd
Beginings of the actual scanner
...
configuration and configuration validation in place with tests.
2013-02-09 00:03:58 -06:00
David Maloney
ccf18d6cb7
Finalize specsfor Result class
2013-02-08 17:20:04 -06:00
David Maloney
3295157f78
More support for various checks
2013-02-08 13:25:49 -06:00
David Maloney
dfc7ce9381
fix stupid datat structure
...
also supports a boolean value for whether the cipher is weak or not
2013-02-08 11:33:36 -06:00
David Maloney
5c9f946927
empty shells for the scanner and its specs
2013-02-07 16:16:41 -06:00
David Maloney
096360261e
De-dup cipher results
2013-02-07 16:09:47 -06:00
David Maloney
4e87bf4ab3
Add enumeration and support options
...
i lied, there's more. Adds two enumerators and methods to check for
specific ssl version support as well as a quick method to tell if the
server supports ssl at all.
2013-02-07 15:51:07 -06:00
David Maloney
10e017ae73
finish up the SSLScan::Result class
...
finishes up result class for SSLScan , compelte with tests
2013-02-07 14:56:26 -06:00
David Maloney
7036365e04
Start adding sslscan results object
...
Building out the result object for the SSlScan
2013-02-07 12:42:18 -06:00
egypt
9d4bc6bb89
Restructure a bit and add checks for doubled '//'
2013-01-31 15:34:34 -06:00
sinn3r
d8b15daaf2
Correct rspect to the correct behavior
2013-01-30 16:13:17 -06:00
Luke Imhoff
3c2c808457
Better Rubymine compatibility for .simplecov
...
Rubymine's code coverage tools separate collection from reporting so
that multiple runs can have their data merged. To separate, collecting
from reporting, SimpleCov.start is only run when not using Rubymine (as
indicated by a lack of the RM_INFO environment variable). This way,
`rake spec` will collect coverage info and generate the report as
before, but Rubymine will only collect coverage when using 'Run ... with
coverage enabled' button and will only generate a report when using
'Generate Coverage Report' as is the intended behavior in Rubymine.
2013-01-18 11:12:16 -06:00
James Lee
2ee0c0d8fb
Add simple specs for Rex::Encoding::Xor*
2013-01-15 16:59:01 -06:00
James Lee
bbb3fa25be
Allow negative values for OptInt
...
[FixRM #7540 ]
2013-01-14 14:18:56 -06:00
James Lee
0d34e0b249
Fix regex for hex numbers
2013-01-13 20:53:40 -06:00
James Lee
4703a6f737
Unbreak OptInt hex syntax
...
* Fix spec for no-longer-pending tests
* Fix regex in OptInt#valid? to allow hex syntax again
[See #1293 ][See #1296 ]
2013-01-12 14:17:29 -06:00
Tod Beardsley
f6478678ce
trailing whitespace
2012-12-27 23:08:50 -06:00
David Maloney
ee6db8794e
Basic specs for meterpreter packet parser
2012-12-27 17:19:37 -06:00
David Maloney
74e543ec5a
add spec skeleton for packet parser
2012-12-27 14:23:05 -06:00
Tod Beardsley
10511e8281
Merge remote branch 'origin/bug/fix-double-slashes'
...
Ran the new normalize_uri() specs, all passes, so I'm quite confident in
this change.
2012-12-17 13:29:19 -06:00
sinn3r
1cb067e7ae
Merge branch 'cleanup/option_specs' of git://github.com/jlee-r7/metasploit-framework into jlee-r7-cleanup/option_specs
2012-12-12 21:22:07 -06:00
David Maloney
aaa8716f5b
minor cleanup as per egypt
2012-12-12 10:12:42 -06:00
David Maloney
c952ed0f87
Add test for raw format of packets
2012-12-07 12:51:53 -06:00
David Maloney
b707f8d13a
Packet specs now complete
...
82 tests for the packet lib
2012-12-07 12:32:34 -06:00
David Maloney
89c98ebd39
Finished tests for GroupTlv ftmp
2012-12-06 17:59:07 -06:00
David Maloney
468f637efe
basics for adding tlvs to GroupTlv
2012-12-05 18:19:12 -06:00
David Maloney
5dcf573063
TLV tests down, on to GroupTlv
2012-12-05 17:55:28 -06:00
David Maloney
391ff5bbb0
basic TLV method tests
2012-12-05 15:44:03 -06:00
David Maloney
b18f5b1875
Start with the duh stuff, responds_to
2012-12-05 14:39:29 -06:00
James Lee
2cbc15a22b
Add #import_option and #from_file
2012-11-29 18:10:29 -06:00
James Lee
e298c5b9cd
Add a simple spec for DataStore
2012-11-29 17:28:15 -06:00
James Lee
cf93a81110
Add specs and pending examples for more Opt*s
...
[SeeRM #7535 ]
[SeeRM #7536 ]
[SeeRM #7537 ]
[SeeRM #7539 ]
[SeeRM #7540 ]
2012-11-29 16:35:50 -06:00
James Lee
7f803744d2
Fix typo
2012-11-29 14:42:27 -06:00
James Lee
7f34586780
Add specs for several Opt* classes
2012-11-29 14:40:25 -06:00
James Lee
3205941a59
Use a SyntaxError instead of JumpError
...
Since the 1.8.7 behavior is insane. Also adds a require for msf/core so
this spec can run by itself.
2012-11-20 19:44:55 -06:00