Commit Graph

1849 Commits (e9350986a485a679186e96618854a791e0515891)

Author SHA1 Message Date
Brent Cook 6eda702b25
Land #6292, add reverse_tcp command shell for Z/OS (MVS) 2015-12-23 14:11:37 -06: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
Gregory Mikeska 99931aff44 Call stance only if module implements stance 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 a96445b302 switch out expect with a proper mock by allow 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 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
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 71ce9b377a change module manager stub from expect to allow 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 2fc0c0b326 switch expect stubs
in ui_driver shared context to allows
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 164f24ef8a Fix stubbing on class instead of instance
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 53f5c019f9 Fix doubles
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 337be4355d Fix Msf::DBManager spec upgrade problems
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
Luke Imhoff ed1e984b6a Update spec_helper with all rspec 3 features
MSP-13484

Copied from metasploit-cache.
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
Spencer McIntyre 6483eca00a Update payloads_spec for pymet stageless reverse http 2015-11-30 11:28:36 -05:00
Bigendian Smalls 9bcbd12407
Updated spec for mainframe rev shell 2015-11-26 21:34:27 -06: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
Brent Cook be23da1c1f Merge branch 'upstream-master' into land-6120-python-stageless 2015-10-30 17:26:26 -05: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
Spencer McIntyre 810665847b Add stageless python meterpreter to the payloads spec 2015-10-22 08:40:50 -04: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
wchen-r7 f57f0991ab Update rspec 2015-10-06 15:42:31 -05:00
wchen-r7 bc46b41bbe Change tools structure 2015-10-05 22:34:47 -05:00
jvazquez-r7 5a7ac8c29a
Land #6030, @wchen-r7's Microsoft Patch Finder 2015-10-02 13:33:27 -05:00
jvazquez-r7 33ea5fdd12
Use named subjects 2015-10-02 13:32:32 -05:00
jvazquez-r7 5862a66221
Pass specs again 2015-10-02 11:50:41 -05:00
jvazquez-r7 69f3d88ea6
Ensure uniq on #find_msb_numbers 2015-10-02 11:38:36 -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
wchen-r7 39dc181588 Update rpsec 2015-10-01 00:26:07 -05:00
wchen-r7 e2098822eb Update msu_finder and rspec 2015-09-30 23:00:46 -05:00
wchen-r7 c92f65838e rspec for TechnetMsbSearch 2015-09-30 20:52:32 -05:00
wchen-r7 764c9c88a6 More work on rspec 2015-09-29 21:56:40 -05:00
wchen-r7 bc1be7f213 some progress with rspec 2015-09-29 17:20:30 -05:00
Fernando Arias d4b9b8e1a4
Stub out :create_match_for_vuln on MatchSet since we already test it
MSP-13119
2015-09-29 16:36:59 -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
wchen-r7 4fe0aede3d Add rspec 2015-09-29 14:50:56 -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
Fernando Arias 52e3405192
Passing report_exploit_success specs
MSP-13119
2015-09-23 11:12:02 -05:00
Fernando Arias dc84b3b1ba
Passing report_exploit_failure specs
MSP-13119
2015-09-23 10:54:13 -05:00
Mo Sadek fb051edc2e Changed the rspec 2015-09-18 12:48:30 -05:00
Fernando Arias 359306a1a4
Add specs to exploit_attempt to cover report_exploit_failure
MSP-13119
2015-09-18 12:25:21 -05:00
Fernando Arias d3a73149a2
Add specs around match result creation in exploit attempt
MSP-13119
2015-09-18 12:04:45 -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