Commit Graph

1981 Commits (56aed7a998fade6c23c2e95aa60e5a20f3d155dd)

Author SHA1 Message Date
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
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 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
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
Dev Mohanty 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
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
jvazquez-r7 f25a5da46f
Do Minor fixes 2015-08-14 12:37:49 -05:00
Greg Mikeska 66148336e1
Modify tests to resolve false negative
MSP-13064
2015-08-14 11:48:52 -05:00
Brent Cook 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
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
Samuel Huckins 60444c208b
Land #5658, MSF version includes git hash now 2015-07-14 09:21:25 -05:00
Brent Cook a2bdd0bab9
Land #5541, add more compat fixed-cmd 64-bit BSD payloads
Merge branch 'land-5541-bsd-shellcode' into upstream-master
2015-07-13 21:01:55 -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 f59c99e2ff Remove msfcli, please use msfconsole -x instead
msfcli is no longer supported, please use msfconsole.

Announcement on SecurityStreet:
Weekly Metasploit Wrapup
Posted by Tod Beardsley in Metasploit on Jan 23, 2015 11:57:05 AM
2015-07-09 12:50:02 -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 9da99a8265
Merge branch 'upstream-master' into bapv2 2015-06-19 11:36:27 -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
root a99b001bd7 payloads_spec.rb modified, payloads added 2015-06-16 05:33:30 -04:00
root aef3a17b20 payloads added to payload_spec.rb 2015-06-16 04:43:08 -04:00
g0tmi1k a53ca53a6a Fix inconstancy - multi/handler 2015-06-12 21:23:51 +01: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 1f11cd5470
Lands #5446, support for 64-bit native powershell payloads 2015-06-07 14:16:19 -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
benpturner dddbf3886b Updated payload spec to be in the correct order and updated payload cached size 2015-06-02 18:33:06 +01:00
OJ e103b2365a Update payload sizes and add new payloads to spec 2015-05-25 11:31:15 +10:00
OJ 820727e24d Add missing payloads to spec 2015-05-18 22:21:08 +10:00
OJ 28abceaec5 Update payload sizes and specs 2015-05-18 21:22:54 +10:00
OJ e41ae93524 Payload sizes, specs and more 2015-05-18 14:58:10 +10:00
OJ bf2b113abb
Merge branch 'upstream/master' into update-x64-stagers 2015-05-18 13:28:36 +10:00
Brent Cook 1653acd527
Land #5344, print payload size from msfvenom 2015-05-15 09:49:05 -05:00
OJ 7b2aee2a60
Merge branch 'upstream/master' into update-x64-stagers 2015-05-15 12:27:40 +10:00
OJ 83fbd41970 Merge branch 'upstream/master' into multi-transport-support
Conflicts:
	Gemfile.lock
	modules/payloads/singles/cmd/windows/powershell_bind_tcp.rb
2015-05-14 14:50:25 +10: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
OJ 0dbfc1e02b
Merge the stager size work from mult-transport-support 2015-05-12 07:50:56 +10:00
OJ fe51f552b8 Make stageless, and reverse_tcp x64 non-dynamic 2015-05-12 07:37:12 +10:00
OJ d9068b7719 Fix up payload cache sizes, and powershell include 2015-05-11 17:43:51 +10:00
OJ b922da8f80 Add support for x64 reverse_http
Still need to bake in support for proxies in the stagers, but wer'e
getting there.
2015-05-11 17:24:31 +10:00
OJ fd827db6dd Fix up bind stager payload sizes 2015-05-07 10:13:27 +10:00
Brent Cook 78c58088fe
Land #5314, set snmp defaults for constrained values 2015-05-06 16:27:41 -05:00
OJ 9d7a7cb68d Merge branch 'upstream/master' into multi-transport-support
Conflicts:
	lib/msf/core/payload/linux/bind_tcp.rb
2015-05-07 07:24:22 +10: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
Brent Cook 0493f58834 Reenable metasm bind_tcp stager 2015-05-06 09:34:35 -05:00
Brent Cook 3c2e6bb698 rollback linux bind_tcp stager metasm port
The new metasm port of the linux bind_tcp stager doesn't yet generate valid
executables. While we're debugging the problem, this reverts the bind_tcp.rb
stager to use the static ASM again.
2015-05-06 09:26:04 -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
Matt Buck 6a4d63ca4f Drop explicit IPAddr to String coercion
MSP-12611
2015-04-27 10:48:13 -05:00
HD Moore 1fd601510c
Lands #5194, merges in PowerShell session support & initial payloads 2015-04-26 16:01:51 -05:00
benpturner 1cc167a7fb Inserted ARCH_X86 payloads, removed interactive_powershell and updated base powershell session 2015-04-26 18:50:42 +01:00
benpturner 19d26da11e updated to remove powershell stand-alone payloads 2015-04-25 08:15:48 +01:00
benpturner 7afb6e1aa6 Removed stand-alone payloads and will push these as a seperate fork request. 2015-04-25 07:57:43 +01:00
benpturner 996cf9bf5c Dynamic payloads 2015-04-25 07:43:48 +01:00
benpturner de09b6e330 Typo in payload spec 2015-04-25 07:30:09 +01:00
benpturner d7bc050e96 updates to payload spec 2015-04-25 07:16:17 +01:00
Brent Cook ff96101dba
Land #5218, fix #3816, remove print_debug / DEBUG 2015-04-24 13:41:07 -05:00
Brent Cook 27f6adcd81
Land #5110, teach Http::Response to extract hidden form inputs 2015-04-24 13:30:57 -05:00
OJ 9ecb3cc634 Fixed specs, though they did run fine locally! 2015-04-23 10:09:58 +10:00
benpturner 4bbf3b722c added payload types 2015-04-22 22:15:11 +01: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 4224008709
Delete print_debug/vprint_debug 2015-04-21 11:14:03 -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 3fbd4e2fe6
Land #5172, x64 BSD shell_{bind,reverse}_tcp 2015-04-20 15:37:29 -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
joev 46d53a216f Alphabetize the specs. 2015-04-16 13:28:40 -05:00
joev fa506ef046 Add bsd payloads to payloads_spec. 2015-04-16 13:28:00 -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
William Vu 8d1126eaa5
Land #5129, x64 BSD prepend stubs 'n' stuff 2015-04-14 01:24:50 -05:00
joev 2d3614f647 Implement x64 BSD exec and exe template.
- Fixes bug in CachedSize due to all options being set
- Adds new payload to payload_spec.
2015-04-12 12:17:25 -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
OJ 5ab0204b24 Update spec for new payloads 2015-04-07 11:32:00 +10: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 cb08e5b8da
Fix specs 2015-04-03 16:00:28 -05:00
sinn3r c33a4a7fd9 rspec for jsobfu 2015-04-03 15:27:35 -05: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