Commit Graph

1668 Commits (969f38e26518881388c0430a92fa0bef344f8c09)

Author SHA1 Message Date
wchen-r7 d4b89edf9c Fix #6398, Missing Content-Length header in HTTP POST
RFC-7230 states that a Content-Length header is normally sent in
a POST request even when the value (length) is 0, indicating an
empty payload body. Rex HTTP client failed to follow this spec,
and caused some modules to fail (such as winrm_login).

Fix #6398
2016-04-28 11:44:10 -05:00
wchen-r7 47d52a250e Fix #6806 and #6820 - Fix send_request_cgi! redirection
This patch fixes two problems:

1. 6820 - If the HTTP server returns a relative path
   (example: /test), there is no host to extract, therefore the HOST
   header in the HTTP request ends up being empty. When the web
   server sees this, it might return an HTTP 400 Bad Request, and
   the redirection fails.

2. 6806 - If the HTTP server returns a relative path that begins
   with a dot, send_request_cgi! will literally send that in the
   GET request. Since that isn't a valid GET request path format,
   the redirection fails.

Fix #6806
Fix #6820
2016-04-25 14:30:46 -05:00
wchen-r7 6c5886afba Resolve #6736, Add rspec for login_scanner/redis lib
Resolve #6736
2016-04-08 11:41:08 -05:00
wchen-r7 f7dd326b16
Land #6455, Fix dns labels/names size limits for lib/net/dns/names/names 2016-04-01 21:57:09 -05:00
wchen-r7 46d4b533f3 Add rspec for lib/net/dns/names/names.rb 2016-03-31 11:29:30 -05:00
wchen-r7 c4735bd72a Fix rspec pull_request_finder_spec.rb 2016-03-24 20:56:46 -05:00
wchen-r7 57984706b8 Resolve merge conflict with Gemfile 2016-03-24 18:13:31 -05:00
James Lee 1375600780
Land #6644, datastore validation on assignment 2016-03-17 11:16:12 -05:00
Adam Cammack 32fe9ae55d
Remove dead version check in db_manager.rb
The check appears to have been orphaned in the db_manager refactor, but
I can't track down the exact commit.
2016-03-16 15:24:55 -05:00
Brent Cook 903807d039 update spec for pre-check 2016-03-15 14:21:01 -05:00
wchen-r7 860159fa00 Update rspec 2016-03-08 11:37:25 -06:00
wchen-r7 58b8c35146 Escape HTML for KB and update rspec 2016-03-08 10:10:10 -06:00
Christian Mehlmauer 3123175ac7
use MetasploitModule as a class name 2016-03-08 14:02:44 +01:00
Brent Cook a2c3b05416
Land #6405, prefer default module base class of simply 'Metasploit' 2016-03-06 17:10:55 -06:00
Brent Cook e1db3ef369
Land #6388, Update msftidy to error when module super class is incorrect 2016-03-06 16:53:11 -06:00
wchen-r7 bff4b4d5fc Fix #6609 and #6587 - Change Content-Length behavior in Rex HTTP
This patches changes two things:

1. If a module has a custom Content-Length, it will respect that
   instead of forcing its own.

2. If a request does not have anything in the body, the
   Content-Length header will not be set.

Fix #6609
Fix #6587
2016-02-29 10:50:21 -06:00
wchen-r7 814d53aee0 Add rspec for Msf::Util::DocumentGenerator::PullrequestFinder 2016-02-24 15:13:04 -06:00
wchen-r7 753e0f7693 Add rspec for Msf::Util::DocumentGenerator::DocumentNormalizer 2016-02-23 15:34:34 -06:00
OJ 44eb2d6a80
Merge branch 'upstream/master' into default-xor 2016-02-11 14:30:18 +10:00
Brian Patterson 4dcbd7c1ae
Add a nokogiri xml stream parser for Burp issue xml and rename original burp parser to burp session parser so both are supported. 2016-02-04 10:30:56 -06:00
Jon Hart 53d4e31844
Allow OptPath to valid symbolic paths that need expansion 2016-02-03 14:12:03 -08:00
Brent Cook c0ed57db43
Land #6267, the rest of the rspec3 updates 2016-01-29 11:36:58 -06:00
Brent Cook d35d0993c1 should -> expect 2016-01-29 11:36:38 -06:00
Brent Cook ac822943b1
Land #6267, update to rspec3 2016-01-29 11:33:30 -06:00
Brent Cook 8c94d3c1bd adjust namespec for rspec3 2016-01-29 11:32:22 -06:00
Brent Cook b6bc862c1b
Land #6267, fix Rex::Parser::Ini#each_group 2016-01-29 11:19:40 -06:00
wchen-r7 6187354392
Land #6226, Add Wordpress XML-RPC system.multicall Credential BF 2016-01-23 00:12:46 -06:00
wchen-r7 781ff4bb7d Rspec is deprecated. Use RSpec instead. 2016-01-22 20:39:40 -06:00
wchen-r7 6bbfc5a869 Fix rspec 2016-01-22 20:27:45 -06:00
wchen-r7 0f9cf812b7 Bring wordpress_xmlrpc_login back, make wordpress_multicall as new 2016-01-22 18:54:20 -06:00
Christian Mehlmauer e6147d60e2 fix rspecs 2016-01-22 23:43:13 +01:00
Christian Mehlmauer f92f59a4c8 remove corresponding spec files 2016-01-22 23:38:44 +01:00
wchen-r7 216986f7af Do API documentation, rspec, and other small changes 2016-01-21 17:22:14 -06:00
OJ ac0b489a90 Revert bad merge and include expect calls 2016-01-21 10:28:38 +10:00
OJ 18fe9bd96f
Merge branch 'upstream/master' into default-xor 2016-01-13 10:05:59 +10:00
Brent Cook 7f9b804060
Land #6410, remove JtR binaries, update for independent framework releases 2016-01-06 14:16:49 -06:00
Brent Cook 388bfec46c
Land #6415, update rspec3 conventions 2016-01-06 12:14:15 -06:00
wchen-r7 92503c0ff6 Remove extra check_setup call 2016-01-06 11:01:35 -06:00
wchen-r7 480913cb32 Add rspec 2016-01-06 01:41:13 -06:00
David Maloney 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
Chris Doughty 8090bbc750 Changes to support framework as a gem 2015-12-30 11:00:45 -06:00
Jon Hart 46a3c839b4
Refactor existing tests that had been duplicating get_std* 2015-12-24 11:03:11 -08:00
wchen-r7 7d8ecf2341 Add Joomla mixin 2015-12-18 21:14:04 -06:00
Brent Cook eccf61bec5 ensure that the metasploit database environment variable is unset 2015-12-14 14:29:25 -06:00
Brent Cook 6551df6446 update bitlocker for rspec3 2015-12-10 21:52:15 -06:00
Brent Cook fb578e9063 use explicit exceptions for raise_error 2015-12-10 21:47:22 -06:00
Brent Cook f59446851f update namespace 2015-12-10 21:47:22 -06:00
Greg Mikeska b29459747b stub out private meterpreter accessor method net 2015-12-10 21:47:22 -06:00
Greg Mikeska 2a6db4092d fix stub on Database specs 2015-12-10 21:47:22 -06:00
Greg Mikeska d0d09097d5 stub out name on foo_inst in the option_container_spec 2015-12-10 21:47:22 -06:00
Greg Mikeska 9a59671330 switch expect to allow on runas_spec cases 2015-12-10 21:47:22 -06:00
Greg Mikeska e8440f9798 remove deprecated syntax from text_spec 2015-12-10 21:47:22 -06:00
Greg Mikeska 1a36bcb525 Replace expect with allow the directory_spec 2015-12-10 21:47:22 -06:00
Greg Mikeska cd0d774db6 replace deprecated unsub, and replace expecations with allows
in base_spec
2015-12-10 21:47:22 -06:00
Greg Mikeska c5d77c3476 change stubs from expect to allow on directory_spec 2015-12-10 21:47:22 -06:00
Greg Mikeska 5b568f2e4b added missing expectation wrapper 2015-12-10 21:47:22 -06:00
Greg Mikeska 1521fd0a95 remove unnecessary message chain call 2015-12-10 21:47:22 -06:00
Greg Mikeska b84bd0327d fix MSSQL test stubs 2015-12-10 21:47:22 -06:00
Greg Mikeska 5c733a3b6d fix stub on module loader test 2015-12-10 21:47:22 -06:00
Greg Mikeska 69bb683d0a fix typo in runas spec and change some more expects to allow 2015-12-10 21:47:22 -06:00
Greg Mikeska 93d4be2301 replace stubbing expects with allow statements 2015-12-10 21:47:22 -06:00
Greg Mikeska bf9da1440e change module_manager to allow from expect 2015-12-10 21:47:22 -06:00
Greg Mikeska 605756a500 and receive needed to be and_return 2015-12-10 21:47:22 -06:00
jvazquez-r7 aca4c6a986 Change include_context on jmx specs 2015-12-10 21:47:22 -06:00
jvazquez-r7 d5d177b782 Use Msf::StringIO on query_spec 2015-12-10 21:47:22 -06:00
jvazquez-r7 2dbb610d99 Use Msf::StringIO on find_spec 2015-12-10 21:47:22 -06:00
jvazquez-r7 5600119fca Use Msf::StringIO on trans2_spec 2015-12-10 21:47:22 -06:00
jvazquez-r7 07ab7bac9c Use Msf::StringIO on query_path_information_spec 2015-12-10 21:47:22 -06:00
jvazquez-r7 21ea110aef Use Msf::StringIO on query_file_information_spec 2015-12-10 21:47:22 -06:00
jvazquez-r7 6405c8102d Use Msf::StringIO on find_first2_spec 2015-12-10 21:47:22 -06:00
jvazquez-r7 eeca2f4b8a Use Msf::StringIO on session_setup_and_spec 2015-12-10 21:47:22 -06:00
jvazquez-r7 692a3cb24c Use Msf::StringIO on read_andx_spec 2015-12-10 21:47:22 -06:00
jvazquez-r7 87a189d990 Use Msf::StringIO on nt_create_andx_spec 2015-12-10 21:47:22 -06:00
jvazquez-r7 7933fa5356 Use Msf::StringIO on negotaite_spec 2015-12-10 21:47:22 -06:00
jvazquez-r7 60de01432c Use Msf::StringIO in close_spec 2015-12-10 21:47:22 -06:00
jvazquez-r7 085598f6d2 Use lets 2015-12-10 21:47:22 -06:00
jvazquez-r7 2beb42a734 Use msf_data attribute 2015-12-10 21:47:22 -06:00
jvazquez-r7 b61a7f43ef Use Msf::StringIO context on registry_spec 2015-12-10 21:47:22 -06:00
jvazquez-r7 bc80bf7fdb use Msf::StringIO on client_spec 2015-12-10 21:47:22 -06:00
jvazquez-r7 046a73b3b3 Use set_msf_data on connection_spec 2015-12-10 21:47:22 -06:00
jvazquez-r7 3d0fcdf84d Add set_msf_data 2015-12-10 21:47:22 -06:00
jvazquez-r7 2041149d54 Use Msf::StringIO in connection_spec 2015-12-10 21:47:22 -06:00
jvazquez-r7 4872628ff5 Try to make it generic 2015-12-10 21:47:22 -06:00
jvazquez-r7 236c28b6fb Add shared context 2015-12-10 21:47:22 -06:00
Brent Cook 11ea7ee5b9 update mocks for smb specs 2015-12-10 21:47:22 -06:00
Luke Imhoff c3e2615a23 Implement stub methods instead using allow which verifies
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff bb7c463c44 Remove operators after .to with matchers
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 76d1f6ba0a Fix Rex::Psot::Meterpreter::PacketParser spec
MSP-13484

Use allow instead of expect because call count isn't important.
2015-12-10 21:47:22 -06:00
Luke Imhoff 04ea44e76b eq {} -> eq({})
So that the `{}` isn't interpreted as a block to `eq`.
2015-12-10 21:47:22 -06:00
Luke Imhoff f31e578780 Add missing RSpec. before describe 2015-12-10 21:47:22 -06:00
Luke Imhoff bde4f8bbe7 Fix allows in Exploit::Remote::Java::Rmi::Client::Jmx::Server spec
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff e3f2db8f09 Fix allows in Exploit::Remote::Java::Rmi::Client::Jmx::Connection
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff c754dca48b fix allows in Exploit::Remote::JAva::Rmi::Client spec
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 61e1dc2363 Fix allows in FirefoxAddonGenerator spec
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 2d8d876eaa Fix allow errors in BrowserAutopwn2 specs
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 00ad6afd4f Fix typo shoftname -> shortname
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff fbddd4cc47 Fix IO stubbing
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff db42c9f760 Fix service double stubbing
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff c46b97cef9 =~ <Array> -> match_array
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 99eaa8efb3 Change some expects back to allows to match old stubs
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff f48f8c1540 Use `be` before operators
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 4f23b83fa3 .should\n -> expect().to
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 3d64c52c9a it { should_not -> it { is_expected.not_to
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 6f71810010 it { should -> it { is_expected.to
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff ba88de84ec Fix mocking errors
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 910b630d96 it { should == -> it { is_expected.to eq
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff a8f766ffbd Fix unimplemented method allows
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 05585acb89 .should_not -> expect().not_to
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 64a870aac0 Fix not implemented error by using double
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff d1f64363b1 .any_instance -> *_any_isntance_of()
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff d7d484a862 Use double to properly expect unimplemented methods
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff cd57ed289f Fix mistaken substitution
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 0eb68ef16c .should_not_receive -> expect().not_to receive
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 4cec58d78c .stub_chain -> expect().to receive_message_chain
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 4870909afc .should -> expect().to
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 2534b18f4c .stub -> expect().to receive
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 03c649bb91 should_receive -> expect().to receive
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 6f29e9a4cf .should == -> expect().to eq
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 3fff6cabce should_not == -> expect().not_to eq
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff 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
Luke Imhoff 2b02b9e081 shared_examples -> RSpec.shared_examples
MSP-13484
2015-12-10 21:47:22 -06:00
Luke Imhoff d6bf0fd781 decribe -> RSpec.describe
MSP-13484

Disabled expose_dsl_globally in spec_helper, so need to qualify
top-level describe.
2015-12-10 21:47:22 -06:00
Jon Hart 39da306b1d
Land #6057, @danilbaz's module for dumping Bitlocker master key (FVEK) 2015-12-08 18:16:39 -08:00
wchen-r7 080ec26afb
Land #4489, Update SMB admin modules to use Scanner & fixes 2015-12-08 14:49:26 -06:00
wchen-r7 f2a33cb1ad The word "should" is not needed. 2015-12-08 11:18:36 -06:00
OJ c747ffc05a Implement support for TLV packet XORing, and RECV removal 2015-12-08 16:37:10 +10:00
Jon Hart f37adf9ff8
Add incomplete spec for Rex::Parser::Ini 2015-11-20 15:18:14 -08:00
BAZIN-HSC c2483faec8 Add Bitlcoker spec file 2015-11-20 19:28:08 +01:00
Jon Hart 4a707b33a2
Add rspec coverage for cowsay. Achievement unlocked 2015-11-13 10:26:47 -08:00
Jon Hart 15eb135295
Resolve merge conflicts 2015-11-09 18:15:40 -08:00
dmohanty-r7 a71d7ae2ae
Land #6089, @jvazquez-r7 Fix HTTP mixins namespaces 2015-11-05 16:56:41 -06:00
Louis Sato 9c347fbaae
Land #6195, remove ff buildid from os.js 2015-11-05 15:01:15 -06:00
jvazquez-r7 00d09744fb
Land #6118, @wchen-r7's new methods for Rex HTTP response 2015-11-03 10:42:42 -06:00
bigendian smalls d53be873dc Updating master to metasploit/master 2015-10-26 09:24:24 -05:00
wchen-r7 f6b9f38326 This method is not needed because Nokogiri does that already 2015-10-23 19:38:17 -05:00
wchen-r7 12cdd786a6 Add more Nokogiri and RKelly support for Rex::Proto::Http::Response
These new methods allow the module writer to being able to parse
HTML/XML/JSON responses properly without using regex first.
2015-10-21 16:26:31 -05:00
jvazquez-r7 28ca34c40a
Fix conflicts 2015-10-16 15:38:59 -05:00
jvazquez-r7 773b523d27
Fix namespaces in specs 2015-10-15 11:54:36 -05:00
jvazquez-r7 1c4686eff0
Move specs folder 2015-10-15 11:50:10 -05:00
jvazquez-r7 8057b3edae
Fix specs to pass again 2015-10-15 09:40:39 -05:00
jvazquez-r7 fa9a33cae8
Move specs to the correct folder 2015-10-15 09:19:43 -05:00
Brent Cook 30d2a3f2a9
Land #5999, teach PSH web delivery to use a proxy 2015-10-14 11:05:45 -05:00
HD Moore cd2e9d4232 Move Msf::Java to the normal Msf::Exploit::Remote namespace 2015-10-09 13:24:34 -07:00
jvazquez-r7 5e9faad4dc Revert "Merge branch using Rex sockets as IO"
This reverts commit c48246c91c, reversing
changes made to 3cd9dc4fde.
2015-10-09 14:09:12 -05:00
jvazquez-r7 3aa7b513d5
Delete safe_get_once 2015-10-09 13:34:38 -05:00
jvazquez-r7 3cd9dc4fde
Fix JMX Server specs 2015-10-09 12:17:44 -05:00
jvazquez-r7 62272e64ed
Fix RMI Registry specs 2015-10-09 12:16:59 -05:00
jvazquez-r7 12d2594095
Add StringIO stub to Msf::Java::Rmi::Client::Jmx::Connection 2015-10-09 12:00:35 -05:00
jvazquez-r7 3d1ec54f02
Stub has_read_data? 2015-10-09 11:36:24 -05:00
bigendian smalls 6549f48d4e
Added new class MainframeShell for mainframe(z/os)
This class is built upon and overrides certain methods in the generic
CommandShell class.  Primarily it is here to control when and if bytes
sent to/from mainframe (z/os) targets get encoded/decoded from cp1047
(ebcdic<->ascii).  This would be the default shell for upcoming
mainframe based payloads.
2015-10-08 17:11:31 -05:00
Brent Cook 55f6fe7037
Land #5510, update x86/alpha* encoders to be SaveRegister aware 2015-10-01 15:07:10 -05:00
Brent Cook d551f421f8
Land #5799, refactor WinSCP module and library code to be more useful and flexible 2015-10-01 14:35:10 -05:00
Brent Cook 0b9e4b33ed update spec to ignore -a 2015-10-01 14:11:29 -05:00
Fernando Arias 393a71cf46 Merge branch 'master' of github.com:rapid7/metasploit-framework into bug/MSP-13119/rework-match-result-creation
Conflicts:
	Gemfile.lock
2015-09-29 15:00:22 -05:00
Brent Cook 54f9a3b25a
Land #6013, add mainframe as a platform and architecture 2015-09-29 13:28:23 -05:00
Jon Hart 49bb3f2e3f
Complete tests for capture_sendto 2015-09-28 13:27:58 -07:00
bigendian smalls aa8c4e2792
Added rspec tests for zarch and ebcdic(cp1047)
Basic tests for zarch (64bit BE) and ebcdic<->ascii conversion required
to communicate with mainframes.
2015-09-28 13:31:30 -05:00
Jon Hart e1c3d3e277
Stub unit tests for capture_sendto. Unsure if these will be possible 2015-09-27 15:51:40 -07:00
Meatballs 66c9222968
Make web_delivery proxy aware 2015-09-23 20:45:51 +01:00
Mo Sadek fb051edc2e Changed the rspec 2015-09-18 12:48:30 -05:00
Fernando Arias 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
jvazquez-r7 eaf51a2113
Land #5722, @vallejocc's busybox work 2015-09-04 13:36:44 -05:00
jvazquez-r7 05e1a69fe5
Add specs for prepend 2015-09-04 11:14:53 -05:00
James Lee 3d428ef33d
Fix spec like I shoulda done before landing #5736 2015-09-03 14:23:30 -05:00
James Lee 7665747d1c
Land #5736, certutil cmdstager
Ferreal this time.
2015-09-03 14:21:21 -05:00
James Lee 82b27c9038 Revert "Land #5736, certutil cmdstager"
This reverts commit 93eb42dfa3.

Conflicts:
	spec/lib/rex/exploitation/cmdstager/certutil_spec.rb
2015-09-03 14:18:28 -05:00
James Lee 956c8e550d
Fix spec like I shoulda done before landing #5736 2015-09-03 13:53:21 -05:00
James Lee 93eb42dfa3
Land #5736, certutil cmdstager 2015-09-03 13:13:24 -05:00
Brent Cook 70b5336356 Merge branch 'upstream-master' into land-5890-android-post-api 2015-09-03 09:51:35 -05:00
HD Moore 9f9bbce034
Land #5840, add LLMNR & mDNS modules 2015-09-02 18:30:29 -05:00
Meatballs 8e1a0e039e
Add spec 2015-09-01 22:04:35 +01:00
Jon Hart 779ece3096
Correct workspace unit tests 2015-08-28 12:19:42 -07:00
jvazquez-r7 06712817cf
Fix specs 2015-08-28 14:06:04 -05:00
jvazquez-r7 54243d411e
Change spec file name 2015-08-28 13:28:34 -05:00
Jon Hart 52a11cc383
Use correct calls to cmd_workspace 2015-08-28 11:03:47 -07:00
Jon Hart fc7a93ac30
Fix syntax and style 2015-08-28 10:51:57 -07:00
Jon Hart aaa8b2c907
Add rspec coverage for the rest of workspace while here 2015-08-28 10:47:51 -07:00
Jon Hart 3f7c8e03e2
Update workspace command to support deleting all workspaces 2015-08-28 10:23:41 -07:00
wchen-r7 ad3e37fda2 Fix rspec 2015-08-26 02:38:13 -05:00
wchen-r7 3f994e964d Change method name and update rspec 2015-08-25 23:23:26 -05:00
wchen-r7 3412f31f85 Add Android POST API 2015-08-24 18:37:25 -05:00
jvicente b37efd29b0 Modified module busybox_pingnet.rb to avoid sending an ash script but executing each ping command separately. Added some fixes. Modified spec file for busybox.rb. 2015-08-23 12:17:17 +02:00
jvazquez-r7 83ca4e984f
Land #5772, @wchen-r7's fixes #5753, support Origin for the creds command 2015-08-21 16:07:45 -05:00
jvazquez-r7 0a7ac2d758
Delete another debug puts 2015-08-17 15:28:48 -05:00
jvazquez-r7 09c888bc49
Fix minor things 2015-08-17 15:27:26 -05:00
James Lee c52da9f50d Add regression spec for #5856 2015-08-17 14:32:20 -05:00
Jon Hart 3a7cea51b4
Merge master and fix Net::DNS::RR merge conflicts 2015-08-13 08:53:25 -07:00
wchen-r7 25dde141d6 fix rspec 2015-07-24 15:24:18 -05:00
xistence 844b47e8ce Additional changes 2015-07-18 14:10:46 +07:00
wchen-r7 0929b54cd3 Update spec for notes help menu 2015-07-16 00:43:08 -05:00
jvazquez-r7 886ca47dfb
Land #5650, @wchen-r7's browser autopwn 2 2015-07-15 10:21:44 -05:00
wchen-r7 4f8f640189 Rename autopwnv2 to just autopwn2 2015-07-14 17:38:51 -05:00
wchen-r7 2276e355aa Fix a typo 2015-07-14 10:51:15 -05:00
wchen-r7 88a00b1ed8 We don't use MessagePack anymore 2015-07-12 14:45:46 -05:00
wchen-r7 a7424c93a0 Update BES rspec 2015-07-12 01:26:43 -05:00
wchen-r7 eabf561a1f Fix some BES rspec 2015-07-11 22:16:10 -05:00
wchen-r7 5a858d68a5 Add rspec for browser_profile_manager 2015-07-11 21:11:31 -05:00
wchen-r7 b2d723e4a3 Rspec 2015-07-11 19:13:20 -05:00
wchen-r7 b1208e1337 Pending rspec 2015-07-11 00:16:48 -05:00
Brent Cook 8349a274ea use and include git hash of Framework as part of the version
Because we do not always update the version number, multiple releases have
shown version string, which is not useful for helping debug issues, or for
knowing what features are enabled.

This adds the git hash or reads from a file a copy of the git hash (useful for
doing packaged builds without git) so that it is clear the origin of a
particular metasploit-framework version.
2015-07-10 18:03:37 -05:00
wchen-r7 c8c3e1a258 Fix rspec 2015-07-10 13:42:25 -05:00
wchen-r7 fdb715c9dd
Merge branch 'upstream-master' into bapv2 2015-07-07 13:45:39 -05:00
wchen-r7 6d30dfd93e Remove the parts that are not broken for BES spec 2015-07-06 23:28:52 -05:00
wchen-r7 a9eeae56cb Remove the broken parts in browser_autopwnv2_spec 2015-07-06 22:24:32 -05:00
Brent Cook 653c4808b2 update framework version spec 2015-07-06 10:42:48 -05:00
HD Moore b9a8308138 Replace BAP profiles with a framework-instance hash 2015-07-02 12:53:24 -05:00
wchen-r7 9bd920b169
Merge branch 'upstream-master' into bapv2 2015-06-27 12:19:55 -05:00
wchen-r7 88e58cbdc5 Better performance 2015-06-27 12:19:07 -05:00
jvazquez-r7 bf7e0695d0
Land #5570, @todb-r7 Removes references to Iconv gem, since it's deprecated 2015-06-19 17:19:03 -05:00
wchen-r7 bd097e3264
Land #5497, Refactor LoginScanner::SNMP to be fast and less buggy 2015-06-19 14:57:36 -05:00
Tod Beardsley 66fecb2832
Add some specs around changed methods
See #4525
2015-06-19 13:23:07 -05:00
wchen-r7 5fa864b097 done with rspec 2015-06-17 16:23:39 -05:00
wchen-r7 b1f68556f9 More testcases 2015-06-17 02:52:59 -05:00
wchen-r7 089579e354 This is how much rspec I have so far for browser_autopwnv2_spec.rb 2015-06-16 23:04:12 -05:00
wchen-r7 ed69e5f902 Redo BES rspec 2015-06-09 23:45:41 -05:00
wchen-r7 6eb25743e3
Merge branch 'upstream-master' into bapv2 2015-06-09 10:10:00 -05:00
wchen-r7 1fe2361e12 Add rspec for BrowserProfileManager 2015-06-09 02:23:27 -05:00
jvazquez-r7 101c5a29ed
Add x86 specs 2015-06-08 16:47:26 -05:00
jvazquez-r7 34d83f3881
Add specs for Rex AlphaMixed mods 2015-06-08 16:01:29 -05:00
jvazquez-r7 3fb0a5f23e
Add specs for Rex AlphaUpper mods 2015-06-08 15:53:11 -05:00
HD Moore 6b05302059 Fixes #5459, refactors LoginScanner::SNMP 2015-06-06 00:50:55 -05:00
William Vu c003602993 Remove report_store_local from the spec 2015-06-04 18:54:15 -05:00
wchen-r7 018833a326 Fix rspec 2015-05-13 20:48:52 -05:00
Brent Cook 9549d572cc
Land #5280, update to Ruby on Rails 4.0
This upgrades a number of other gems as a side-effect.
2015-05-12 16:48:49 -05:00
Brent Cook 5b2627c027 switch 2015-05-06 16:15:21 -05:00
Brent Cook 5573c6c7e8 remove hardcoded defaults from spec
ensure that we test for there being defaults in the underlying scanner
2015-05-06 15:57:14 -05:00
William Vu 013781fb9c
Land #5292, WordPress custom file version check 2015-05-05 11:21:18 -05:00
William Vu 18791ce933 Clean up code 2015-05-05 11:19:40 -05:00
darkbushido 26e7fe15f9
Merge branch 'upstream' into staging/rails-4.0
Conflicts:
	Gemfile.lock
2015-05-05 11:00:38 -05:00
Brent Cook 05e4af8162
Land #5214, initial meterpreter session recovery support 2015-05-04 16:25:27 -05:00
Brent Cook e6ea5511ca update linux and windows meterpreters to use metasploit-payloads 2015-05-04 09:44:36 -05:00
Christian Mehlmauer 55967172be
allow custom regex 2015-05-02 21:06:15 +02:00
Christian Mehlmauer 9678479abb
check version from custom file 2015-05-02 18:34:10 +02:00
jvazquez-r7 c6806b4e5f
Land #5102, @wchen-r7's ManageEngine Desktop Central Login Utility 2015-05-01 15:20:21 -05:00
jvazquez-r7 b037560c90
Do minor style fixes 2015-05-01 15:01:13 -05:00
jvazquez-r7 9f0b2d4f0f
One expectation for every example 2015-05-01 14:57:48 -05:00
jvazquez-r7 d880f50b98
Normalize 2015-05-01 14:54:42 -05:00
jvazquez-r7 213d34ce61
Delete unnecessary let 2015-05-01 14:54:12 -05:00
Matt Buck 8163c3cdda Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	plugins/nessus.rb
2015-04-28 15:33:46 -05:00
jvazquez-r7 59d6ad5a6d Restore specs 2015-04-27 17:00:19 -05:00
HD Moore c3f18aa899 Complete the #4989 revert 2015-04-27 16:26:34 -05:00
Brent Cook 27f6adcd81
Land #5110, teach Http::Response to extract hidden form inputs 2015-04-24 13:30:57 -05:00
jvazquez-r7 b6df023c99
Land #4989, @hmoore-r7's change to file: handling
Datastore options with file: are handled at set time
2015-04-21 23:21:22 -05:00
Trevor Rosen 8f5d222e53
Land #5156 - module ranking properly handles nil 2015-04-21 14:40:01 -05:00
jvazquez-r7 57df5c4f4f
Solve conflics 2015-04-20 23:38:34 -05:00
jvazquez-r7 831e65261d
Add lengths specs 2015-04-20 17:37:41 -05:00
William Vu c7129e063c
Land #5069, breaking up with old options 2015-04-20 16:23:44 -05:00
James Lee d7fc9294f0
Add require 2015-04-20 15:54:41 -05:00
James Lee 2a3ed890d2
Add specs for Msf::Opt 2015-04-20 15:54:40 -05:00
James Lee 3a5af3939d
Split all the option classes into their own files 2015-04-20 15:54:40 -05:00
William Vu 79ca0a56f9
Land #4171, Steam protocol support 2015-04-20 15:35:06 -05:00
wchen-r7 3493d25ff9 Move all this to Rex 2015-04-16 21:07:23 -05:00
Brent Cook 9bf897a829
Land #4744, refactor powershell for msfvenom psh-cmd 2015-04-16 15:44:57 -05:00
William Vu 42ff0decc7
Land #4722, timing options for snmp_login 2015-04-16 02:25:29 -05:00
Luke Imhoff 16234feeed
Red rank_modules ranks unloadable as Manual
MSP-12557
2015-04-15 16:09:19 -05:00
Luke Imhoff 87d1770bac
Green rank_modules with loaded without Rank is NormalRanking
MSP-12557
2015-04-15 15:51:42 -05:00
Luke Imhoff bae581046b
Green module_ranks with loaded with Rank
MSP-12557
2015-04-15 15:49:19 -05:00
Luke Imhoff 65a40a994b
Green rank_modules use NormalRanking without Rank in loaded modules
MSP-12557
2015-04-15 15:45:21 -05:00
Luke Imhoff d57cf8f09f
Green rank_modules with Rank
MSP-12557

Test that modules that need to be loaded are ranked using Rank after
loading.
2015-04-15 15:41:16 -05:00
Matt Buck e82fb5f836
Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	lib/msf/ui/console/command_dispatcher/db.rb
	metasploit-framework-db.gemspec
	metasploit-framework.gemspec
2015-04-15 14:04:35 -05:00
Luke Imhoff 7a14618481
Red Msf::ModuleSet#rank_modules with create -> nil
MSP-12557

Msf::ModuleSet#rank_modules does not handle Msf::ModuleSet#create
returning `nil`.
2015-04-15 11:59:34 -05:00
Matt Buck 9f15824e2a
Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
2015-04-10 15:35:27 -05:00
sinn3r 284ef5bbbb
Land #5112, Nessus REST Login Module 2015-04-10 13:32:53 -05:00
sinn3r 90d525088c Green rspec 2015-04-10 11:36:23 -05:00
root 7e6461aea0 Travis error correction 2015-04-10 15:48:48 +05:00
root 8c0d5d66d0 Add spec file 2015-04-10 15:32:03 +05:00
William Vu 88031c9a87 Update spec 2015-04-09 16:25:04 -05:00
sinn3r 3fc25a00d8 Make sure we are only grabbing hidden inputs 2015-04-09 01:09:00 -05:00
sinn3r 717120b8c5 Add #get_hidden_inputs for Metasploit::Framework::LoginScanner::HTTP 2015-04-09 00:34:09 -05:00
Brent Cook e03f2df691
Land #5002, RMI/JMX improvements 2015-04-08 15:23:29 -05:00
sinn3r f51eaef765 Add rspec 2015-04-08 02:33:27 -05:00
Matt Buck 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
HD Moore 9145b6d717 Fix specs for uri_checksum 2015-04-05 22:56:59 -05:00
jvazquez-r7 261ef51813
Add Rex::Java::Serialization exceptions 2015-04-05 18:43:03 -05:00
Meatballs ebf77cd02d
Merge remote-tracking branch 'upstream/master' into msfvenom_psh_squash
Conflicts:
	lib/msf/util/exe.rb
2015-04-05 00:24:48 +01:00
jvazquez-r7 e3bbb7c297 Solve conflicts 2015-04-03 14:57:49 -05:00
Fernando Arias 6455862484 Merge branch 'staging/rails-4.0' of github.com:rapid7/metasploit-framework into staging/rails-4.0
Conflicts:
	Gemfile.lock
	metasploit-framework.gemspec
2015-04-03 13:56:38 -05:00
OJ d02a4cc197
Land #5066 : EncodedPayload#generate specs 2015-04-03 20:59:00 +10:00
James Lee a1b4cf375f
Add some minimal specs for #generate 2015-04-03 00:11:41 -05:00
OJ fd043d4842 Fix up build and missing uri_checksum stuff
Somehow this made it into a merge when it shouldn't have. This fix moves
the URI checksum module to where it needs to be and updates all the
references where required. This will result in a class with the dynamic
transport branch, but I can fix that after.
2015-04-03 13:42:25 +10:00
Brent Cook f4977bf606
Land #5006 @jlee-r7 adds meterpreter specs 2015-04-01 11:05:47 -05:00
James Lee dfaf1b3a8f
Stub monitor_sock so we don't leak threads 2015-03-30 22:03:39 -05:00
James Lee 2ab4584079
Merge remote-tracking branch 'upstream/master' into staging/single-vuln-push 2015-03-30 13:50:52 -05:00
HD Moore a1c755161a Add spec coverage for appender, fix injector 2015-03-29 11:52:06 -05:00
Meatballs 9eca3a0ab5
Impersonation spec 2015-03-29 00:52:27 +00:00
Meatballs 10029eedb9
Add command specs 2015-03-29 00:05:44 +00:00
Meatballs f7e3abf760
sqlcmd specs and fixes 2015-03-28 23:23:00 +00:00
Meatballs 3b651aecdc
Specs for sqlserver check and fixes 2015-03-28 22:59:00 +00:00
sinn3r 9cfafdd8b8
Land #4649, improve post/windows/manage/run_as and as an exploit 2015-03-27 17:31:30 -05:00
Trevor Rosen 2815462375
Update Mdm to staging hash 2015-03-27 15:16:33 -05:00
jvazquez-r7 d84c48cb7d
Use newer hash syntax 2015-03-25 13:39:34 -05:00
jvazquez-r7 72a0909e9b
Land #4992, @wchen-r7's support for multiple ActiveX controls on BrowserExploitServerMerge 2015-03-25 13:30:36 -05:00
James Lee 95d70e7211
Remove respond_to check for protected method
Fails on Ruby 2.x, and doesn't really gain us anything anyway.
2015-03-25 12:50:46 -05:00
James Lee 8f0c434faa Add specs for the new method 2015-03-25 12:34:10 -05:00
jvazquez-r7 0540e25db2
Calculate the java/rmi/registry/RegistryImpl_Stub hash dinamically 2015-03-25 11:29:07 -05:00
sinn3r 6e3e696262 Use symantec_web_gateway as an example of using send_request 2015-03-25 10:55:46 -05:00
sinn3r 111e3fcb88 Add rspec for #send_request 2015-03-25 01:45:03 -05:00
jvazquez-r7 a5c39db6c3
Use mocks like a boss... 2015-03-24 19:30:59 -05:00
jvazquez-r7 0b671d5210
Add specs for Msf::Java::Rmi::Client::Jmx::Connection 2015-03-24 19:15:25 -05:00
jvazquez-r7 356e8c727c
Add specs for Msf::Java::Rmi::Client::Jmx::Server 2015-03-24 18:56:58 -05:00