sinn3r
9a3e719233
Rework the naming style
2013-10-21 20:16:37 -05:00
sinn3r
5280bcf3f8
Update rspec files
...
Remove some junk code
2013-10-21 17:13:01 -05:00
sinn3r
8a94df7dcd
Change category name for base64
2013-10-18 21:20:16 -05:00
sinn3r
73b8eb0f83
Add rspec files to make sure the javascript files are loadable.
2013-10-18 15:14:26 -05:00
Tod Beardsley
b3e02d0fd8
Land #2477 , add specs for ROPDB
2013-10-10 15:05:52 -05:00
Tod Beardsley
72a35d14f1
Mark broken tests as pending
...
These tests are broken a few different ways.
[SeeRM #8463 ]
also see: https://github.com/rapid7/metasploit-framework/pull/2477
2013-10-08 11:49:42 -05:00
jvazquez-r7
8b7d241dc3
Use a named subject
2013-10-07 12:28:50 -05:00
jvazquez-r7
d8dba8ee58
Fix ropdb spec according to @limhoff-r7's comments
2013-10-07 09:51:21 -05:00
sinn3r
41e87d83a6
Add rspec for Rex::Exploitation::RopDb
2013-10-04 00:54:07 -05:00
Tab Assassin
2e8d19edcf
Retab all the things (except external/)
2013-09-30 13:47:53 -05:00
Tod Beardsley
2fb770f73e
Land #1569 , MSI payloads
...
The bins are signed by Meatballs, everything looks good here, so
landing. Thanks for your patience on these!
2013-09-27 16:29:27 -05:00
Tod Beardsley
7cc2ad55a6
Land #1770 , unattend.xml snarfing modules
2013-09-27 16:04:38 -05:00
Meatballs
8a9843cca6
Merge upstream/master
2013-09-27 20:02:23 +01:00
Tabassassin
120cca8bb3
Retab unattended_spec to avoid conflicts
2013-09-27 13:44:33 -05:00
Tod Beardsley
5bab85fcda
Use a context for #parse
2013-09-27 13:04:18 -05:00
Tod Beardsley
6345fb2788
Use described_class
2013-09-27 12:59:10 -05:00
Tod Beardsley
7d9d98c9eb
Land #2421 , update to cookie parsing specs
2013-09-27 11:45:33 -05:00
Tod Beardsley
8f957a5394
Add spec for new #to_h method
2013-09-27 11:27:31 -05:00
Tod Beardsley
103a64a32a
Indent like a sane person.
2013-09-27 10:22:46 -05:00
Tod Beardsley
623aeb367f
Set a context for #get_cookies
2013-09-27 10:12:11 -05:00
Tod Beardsley
467c503fb9
DRY with a cookie_sanity_check method
2013-09-27 10:07:28 -05:00
Tod Beardsley
5e95df1370
Convert local variables to HEREDOC methods
2013-09-27 10:02:22 -05:00
Tod Beardsley
57862125b9
Use shuffle and *splat operator to test arrays
...
Also, move the local variables to inside the describe block to avoid any
future scope issues.
2013-09-27 09:53:04 -05:00
Tod Beardsley
0aa2556dfc
Use described_class, not a new constant
2013-09-27 09:32:15 -05:00
FireFart
3d28003285
updated get_cookies rspecs
2013-09-25 22:56:13 +02:00
Meatballs
695fdf836c
Generate NonUAC MSIs
2013-09-21 13:13:18 +01:00
Meatballs
85ea9ca05a
Merge branch 'master' of github.com:rapid7/metasploit-framework into msi_payload
2013-09-21 12:49:38 +01:00
Meatballs
11bdf5d332
New pull
2013-09-19 19:57:38 +01:00
David Maloney
e80cda4ace
Merge branch 'master' into spike/exe_generation
2013-09-12 12:36:10 -05:00
David Maloney
5773a009f5
Merge branch 'spike/exe_generation' of github.com:/dmaloney-r7/metasploit-framework into spike/exe_generation
2013-09-09 12:17:36 -05:00
David Maloney
d6e4e46d86
better validation of buffer register
2013-09-09 12:16:15 -05:00
Brandon Turner
35ec21cc97
Update test gems
...
This should not affect core Metasploit Framework as it only updates gems
in the test group (and dependencies of those gems).
2013-09-06 09:34:05 -05:00
Brandon Turner
cf69577433
Remove rpsec should_not raise_error deprecations
...
Checking that a specifc error is not raised is deprecated in rspec:
https://github.com/rspec/rspec-expectations/pull/244
2013-09-06 09:34:05 -05:00
Brandon Turner
4760000bca
Replace mock with double in specs
...
mock is deprecated - https://www.relishapp.com/rspec/rspec-mocks/docs
2013-09-06 09:34:05 -05:00
Tab Assassin
269c1a26cb
Merge for retab
2013-09-05 14:57:32 -05:00
Tab Assassin
63612a64e9
Merge for retab
2013-09-05 14:08:09 -05:00
Meatballs
53c3f6b2db
Deconflict
2013-08-30 10:52:42 +01:00
James Lee
eba6762977
Land #2270 , Util::EXE refactor
...
With a minor rebase to fix a commit message
[Closes #2270 ]
Conflicts:
spec/support/shared/contexts/msf/util/exe.rb
2013-08-28 21:49:59 -05:00
Meatballs
fbbfb0a26d
Merge and rescue ex correctly
2013-08-28 21:39:56 -05:00
David Maloney
5a424ab4df
Allow user supplied buffer register
...
let the user pick, otherwise default to edx
2013-08-26 13:15:12 -05:00
David Maloney
369535b4e3
Some more specs
...
added a few specs to validate the generated exe.
could use some more love, but it's a start
2013-08-25 13:25:31 -05:00
Meatballs
239fd4840e
Update spec
2013-08-25 19:21:05 +01:00
David Maloney
8f47aa6dcb
Basic Injector class
...
create a class for injecting payloads
into an exe template as a new section
2013-08-24 16:11:00 -05:00
Meatballs
9ea17ef1e1
Merge upstream
2013-08-24 03:34:02 +01:00
Meatballs
3fae6c51c8
Initial exe-service
2013-08-24 03:28:47 +01:00
Meatballs
ffc575dcc2
Whitespace in spec
2013-08-24 00:47:16 +01:00
Meatballs
9e2d9da017
Make spec exercise non-exes
2013-08-24 00:33:06 +01:00
sinn3r
92d57ef37d
Fix merge conflict
...
Conflicts:
msfvenom
2013-08-13 00:00:16 -05:00
Tod Beardsley
81defe8113
Add the string_list.txt fixture back
2013-08-09 15:39:40 -05:00
Tod Beardsley
02f460287b
Revert "OptString specs and better validation"
...
This reverts commit d66779ba4c
.
Specifically, this commit was causing trouble when a datastore was
getting an Integer. For some reason (as yet undiscovered), the option
normalizer wasn't trying to Integer#to_s such arguments.
This kind of thing is going to happen a lot. For now, I'd rather just
end up with the ducktype, and attack the normalizer in a seperate fix.
2013-08-09 15:30:42 -05:00
James Lee
55147d9bde
Fix regex to work on OSX's file(1)
2013-08-06 14:00:35 -05:00
sinn3r
3c8bc6b522
More coverage for msfcli spec
2013-07-31 04:37:36 -05:00
sinn3r
18c0f879fa
More code coverage for msfcli_spec
2013-07-30 21:31:53 -05:00
sinn3r
97adb2a49e
Move get_stdout inside 'describe Msfcli' statement
2013-07-28 23:37:33 -05:00
sinn3r
f274a9605a
Change path for msfcli rspec, and use spec_helper
2013-07-28 23:33:46 -05:00
sinn3r
ed51d284fa
Change name, change how data is passed, fix rspec
2013-07-24 17:15:56 -05:00
William Vu
d493346691
Land #2137 , fixes and specs for Opt containers
2013-07-23 15:58:09 -05:00
jvazquez-r7
b0c17fdebc
Land #2002 , @jlee-r7's patch for better handling uri resources
2013-07-23 15:49:21 -05:00
William Vu
86ab942435
Land #2146 , Unix and Windows path normalization
2013-07-23 15:23:41 -05:00
Tod Beardsley
bb16683415
Land #2087 , @egypt's random ID generator
2013-07-23 13:52:08 -05:00
sinn3r
8b0aac2d3c
Add another test case for having a trailing slash for unix path
...
If a trailing path exists in the original input, should keep it.
This test case should verify that.
2013-07-22 23:23:40 -05:00
sinn3r
2be0b84ba8
Not Windows format, Unix.
2013-07-22 22:37:36 -05:00
sinn3r
4ea176b5ee
Add another test case
2013-07-22 22:35:19 -05:00
sinn3r
958a4edd73
Keep the trailing slash if the user wishes
2013-07-22 20:46:18 -05:00
sinn3r
359009583f
Drop support for UNC path parsing in normalize_win_path
...
Not really a good idea to try to parse UNC format. Confuses the
purpose of the function.
2013-07-22 20:20:45 -05:00
sinn3r
8656fcf5e0
Update the test description a little better
2013-07-22 19:35:52 -05:00
sinn3r
4b3fce9349
Add functions to normalize Winodws & Unix paths
...
The purpose of these functions is to be able to join file/dir paths
safely without trailing slashes, basically for the same reason as
normalize_uri. Some modules are really buggy when merging paths,
so instead of letting them do it, it's better to use these functions.
2013-07-22 19:26:04 -05:00
William Vu
b0c74dbb8b
Land #2120 , specs for command_dispatcher
2013-07-22 16:33:19 -05:00
lsanchez-r7
03cd3ff4eb
adding new lines to the end of files.
2013-07-22 16:26:45 -05:00
David Maloney
943dde5c6c
OptRegexp specs
2013-07-20 18:44:55 -05:00
David Maloney
2fc397b251
OptRaw specs
2013-07-20 17:57:52 -05:00
David Maloney
d66779ba4c
OptString specs and better validation
2013-07-20 17:49:03 -05:00
David Maloney
d6f2b28708
More opt specs
2013-07-20 17:37:39 -05:00
lsanchez-r7
18200c8490
passing all of my changes into rubymines formatter
...
this should convert everything over to tabs
fixing a filename error and some white space at the EOL
2013-07-20 17:32:05 -05:00
David Maloney
7c8f7329e9
integrate with egypt's already better specs
2013-07-20 16:46:16 -05:00
David Maloney
ec82644bd3
mo fixes mo specs
...
SEERM #7536
SEERM #7537
2013-07-18 15:00:57 -05:00
Joe Vennix
7b05ac2036
Remove inapplicable comment.
2013-07-18 13:42:55 -05:00
Joe Vennix
f8b5f1b284
Adds specs for different ref types.
2013-07-18 13:35:04 -05:00
David Maloney
57dd525714
More optaddressrange specs and fixes
...
SEERM #7536
2013-07-18 13:03:32 -05:00
lsanchez-r7
49bb484d14
Adding in specs for ui command dispatchers
...
SEERM #4821
while looking into what it would take to fix bug 4821, I found that there are no specs
for any of the other methods in command dispatcher. I have attempted to add stubs for a
few of the methods and tested a few of the help outputs.
2013-07-18 12:56:21 -05:00
Joe Vennix
f4b0ab8184
Adds 141 passing specs to Msf::Module#search_filter.
...
* tests exclusion functionality, type: matching, port: matching, app: matching,
platform: matching, author: matching, text: matching, name: matching, and
path: matching.
[RM #4790 ]
2013-07-18 12:47:08 -05:00
David Maloney
22e4db04e0
opening specs and fixes for OptAddressRange
2013-07-18 12:44:48 -05:00
David Maloney
27e2469d8e
Specs and code changes for OptAddress
...
handles wierness around Optaddress.
Still need to address isues in optaddressRange
FIXRM #7537
2013-07-17 20:21:24 -05:00
James Lee
273046d8f0
Add a class for generating random identifiers
...
Will be useful for all kinds of things, but brought about in discussions
specifically for Util::EXE in #2037 .
2013-07-09 02:06:44 -05:00
James Lee
00c7581099
Fix constant names and 'exe-only'
...
That'll teach me to commit before the specs finish.
Really [FixRM #8149 ]
2013-07-06 12:39:15 -05:00
James Lee
1b504197be
Check equality instead of regex
...
Thanks, @Meatballs1 for finding the cause of this bug!
[FixRM #8149 ]
2013-07-06 12:29:37 -05:00
James Lee
60a7ad551e
Derp, missed file
2013-07-05 17:02:45 -05:00
James Lee
d10f082741
Maybe fix travis? Works on my box
2013-07-05 16:58:19 -05:00
James Lee
8e2df73f2c
Add spec for case-insensitive options
...
See #2027
2013-07-05 16:06:00 -05:00
James Lee
da5a321be2
Derp, wrong method name
2013-07-05 15:39:52 -05:00
James Lee
4432894401
Abstract the dumper tests
2013-07-05 15:35:08 -05:00
James Lee
2841624fdd
Refactor spec and add more docs
2013-07-05 15:18:17 -05:00
James Lee
40a3da2b32
Reorganize spec a bit
2013-07-05 14:44:44 -05:00
James Lee
819c275e4b
Make comment a little clearer
2013-07-05 12:23:27 -05:00
James Lee
5ff8a58bc5
Make sure linux payloads produce /bin/sh
2013-07-03 17:04:11 -05:00
James Lee
8a13dc5a62
Add a couple more tests
2013-07-03 15:59:21 -05:00
James Lee
e330916744
Pull out common stuff in Util::EXE/MsfVenom tests
2013-07-03 12:25:15 -05:00
James Lee
ffb28feaa9
Add spec for #dump_nops
2013-07-02 02:53:30 -05:00
James Lee
95451862d6
More msfvenom refactoring
...
* Make @framework into a caching method instead
* Allow instantiating with streams for where payloads and comments
should go. This allows us to capture std{out,err} when running specs
* Specs are still woefully under-representative
* Get rid of all the calls to exit
2013-07-02 02:02:11 -05:00
James Lee
4b2ae4ef6a
Refactor msfvenom into a class
...
Also adds some minimal testing... which is super slow because it doesn't
cache the framework object across tests.
Conflicts:
msfvenom
Hopefully picked up all the relevant fixes from #2027
2013-07-01 17:51:12 -05:00
James Lee
0d78a04af3
Clean up exe spec a bit
2013-07-01 17:36:58 -05:00
James Lee
3ad5dede26
Add spec for elf mips* and exe-only formats
...
Also a rudimentary test for win32_rwx_exec
2013-07-01 17:36:38 -05:00
James Lee
e483fe444d
Add spec for HttpServer#hardcoded_uripath
2013-06-21 15:59:15 -05:00
James Lee
e8a92eb196
Keep better track of resources
...
[See #1623 ]
[SeeRM #7692 ]
2013-06-21 14:51:47 -05:00
Tod Beardsley
d7e3c5cdb3
Rspec: Ensure PacketFu is actually still available
...
PacketFu should be required from the gem, not from the shipped msf
library. Several modules depend on it being available, so this rspec
test mostly just ensures that Msf::Exploit::Capture mixin is still
around.
2013-06-10 16:02:50 -05:00
James Lee
5955397882
Use a more descriptive subject
...
Also removes the unnecessary (and now broken in 2.0) checks for
respond_to? on accessors.
2013-06-07 13:27:40 -05:00
James Lee
0f2ea755c5
Add encoding comment to spec files for 2.0 compat
2013-06-07 13:27:39 -05:00
David Maloney
64bc6b5c2b
Migrate factories to mdm
...
let mdm handle msot of the factories
2013-06-01 14:25:30 -05:00
Luke Imhoff
e0e348a17e
Specs to ensure File.mtime error is caught.
...
[#47720609 ]
2013-05-30 13:09:40 -05:00
Luke Imhoff
4ba571346e
Spec Msf::Simple::Framework#init_module_paths
...
[#47720609 ]
2013-05-24 12:33:42 -05:00
Luke Imhoff
1a487e476d
Merge branch 'master' into bug/module-load-cache-update
2013-05-23 14:23:14 -05:00
Luke Imhoff
2b70ec2e08
Payload compatible cache_in_memory
...
[#47720609 ]
Msf::PayloadSet#add_module does NOT return an annotated module class as
Msf::ModuleSet#add_module does because a payload module is defined as a
ruby Module instead of a ruby Class. Since add_module doesn't always
return an annotated_class, the logic in
Msf::ModuleManager#on_module_load needed to change to NOT use
annotated_class and create #add_module as return [void]. Thus, it is
necessary to pass in all the metasploit module metadata to
Msf::ModuleManager#cache_in_memory instead of assuming they can be
derived from the (payload) Module or (other) Class.
2013-05-22 16:06:02 -05:00
Luke Imhoff
57576de85f
Update in-memory cache to fix file_changed?
...
[#47720609 ]
Msf::ModuleManager#module_info_by_path was not being updated when a
module was loaded, so if a load_module was called again, say during
start up of prosvc, the module would reload even though there was no
change in the file because file_changed? couldn't find an entry for the
module's path in module_info_by_path.
2013-05-22 12:28:42 -05:00
Luke Imhoff
eede80509f
Reuse appropriate terminology in docs
...
[#47720609 ]
Fix some docs and variable names to make it clearer when methods are
expecting module instance and module classes. Change some 'name'
variables to 'reference_name' since that's the proper terminology.
2013-05-21 08:19:47 -05:00
Luke Imhoff
a70d63ebad
Spec Msf::ModuleManager#on_module_load
...
[#47720609 ]
2013-05-20 14:52:37 -05:00
Luke Imhoff
89bd5b4791
Reset column information after running migrations
...
[#50179803 ]
[SeeRM #7967 ]
[SeeRM #7870 ]
Because metasploit-framework runs migrations with the same process and
with the same connection as it later accesses the database, the column
information can become cached prematurely and be incorrect by the end of
the migrations. Fix the bad cache by automatically resetting the column
information for all model classes after the migrations have run.
2013-05-20 13:08:07 -05:00
Luke Imhoff
398dcfa8cb
Merge branch 'master' into bug/migrations
2013-05-20 12:49:33 -05:00
Luke Imhoff
0e435d378c
Move Msf::DBManager#migrate(d) to module
...
[#50179803 ]
Move Msf::DBManager#migrate and the migrated attribute to
Msf::DBManager::Migration module to lower complexity of db_manager.rb
and in preparation for more migration related code on this branch.
2013-05-20 12:45:17 -05:00
Luke Imhoff
1df08cfa49
Add specs to prevent dupe migrations_paths regression
...
[#50099107 ]
Add specs to verify that the duplicate migrations_paths protection
works.
2013-05-17 15:15:57 -05:00
Luke Imhoff
c8657fb46b
Fix Mdm::Module::Detail#stance bug
...
[#49858419 ]
[SEERM #7958 ]
metasploit_data_models 0.14.3 relaxes the validation on
Mdm::Module::Detail#stance so it only needs to be in
Mdm::Module::Detail::STANCES if Mdm::Module::Detail#mtype is 'auxiliary'
or 'exploit' as framework only supplies a stance for those types when
using Mdm::Module::Detail.
2013-05-17 11:58:10 -05:00
Luke Imhoff
bc92b43408
Update to metasploit_data_models 0.11.0
...
[#47979793 ]
2013-05-09 13:25:26 -05:00
Luke Imhoff
a5648a8830
Merge branch 'master' into feature/mdm-module-namespace
...
Conflicts:
Gemfile
Gemfile.lock
lib/msf/core/db_manager.rb
2013-05-08 13:22:41 -05:00
sinn3r
1d9a695d2b
Landing #1772 - Adds phpMyadmin Preg_Replace module (CVE-2013-3238)
...
[Closes #1772 ]
2013-04-28 12:17:16 -05:00
Meatballs
de5c856188
get_cookies spec
2013-04-26 21:21:11 +01:00
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
Meatballs
590b8a3e26
Added rspec
2013-04-26 00:50:29 +01: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