Commit Graph

1277 Commits

Author SHA1 Message Date
bigendian smalls d53be873dc Updating master to metasploit/master 2015-10-26 09:24:24 -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
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