Commit Graph

697 Commits (c2c352c2acefe350fb251d19a07abee04cdee4e5)

Author SHA1 Message Date
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 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 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 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 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
wchen-r7 f2a33cb1ad The word "should" is not needed. 2015-12-08 11:18:36 -06: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
bigendian smalls d53be873dc Updating master to metasploit/master 2015-10-26 09:24:24 -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
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 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
Jon Hart 49bb3f2e3f
Complete tests for capture_sendto 2015-09-28 13:27:58 -07:00
Jon Hart e1c3d3e277
Stub unit tests for capture_sendto. Unsure if these will be possible 2015-09-27 15:51:40 -07: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
Brent Cook 70b5336356 Merge branch 'upstream-master' into land-5890-android-post-api 2015-09-03 09:51:35 -05: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
wchen-r7 25dde141d6 fix rspec 2015-07-24 15:24:18 -05: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 88e58cbdc5 Better performance 2015-06-27 12:19: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
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
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
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 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
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
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
Brent Cook 9bf897a829
Land #4744, refactor powershell for msfvenom psh-cmd 2015-04-16 15:44:57 -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
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 88031c9a87 Update spec 2015-04-09 16:25:04 -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
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
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
jvazquez-r7 464a6df5e0
Add specs for Msf::Java::Rmi::Client::Registry 2015-03-24 18:42:35 -05:00
jvazquez-r7 0fe98bc023
Delete old JMX mixin specs 2015-03-24 17:30:37 -05:00
jvazquez-r7 e20398a70a
Add specs for Msf::Java::Rmi::Client::Jmx::Server::Parser 2015-03-24 17:30:06 -05:00
jvazquez-r7 0a352fc7d4
Finish specs for Msf::Java::Rmi::Client::Jmx::Connection::Builder 2015-03-24 17:06:05 -05:00
jvazquez-r7 115c4e5a06
Add first specs for Msf::Java::Rmi::Client::Jmx::Connection::Builder 2015-03-24 16:37:05 -05:00
jvazquez-r7 82d545850e
Add specs for Msf::Java::Rmi::Client::Jmx::Server::Builder 2015-03-24 16:04:18 -05:00
jvazquez-r7 87cac6fd55
Complete specs for Msf::Java::Rmi::Util 2015-03-24 15:41:32 -05:00
jvazquez-r7 48026da35f
Fix RMI specs 2015-03-24 15:14:36 -05:00
Christian Mehlmauer 7bf00f8f47
Land #4789, @rastating WPLMS wordpress module 2015-03-24 20:46:38 +01:00
sinn3r 3c4da5c3ff Update BES rspec 2015-03-24 00:10:18 -05:00
HD Moore c7da9d6f79 Move file: prefix checks out of option class specs (would need to go into console test specs at some point) 2015-03-23 15:09:22 -05:00
jvazquez-r7 79068c8ec2
Delete JMX discovery stream 2015-03-23 10:21:37 -05:00