Commit Graph

1709 Commits

Author SHA1 Message Date
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
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
jvazquez-r7 0a07bb4d17 Add a couple of specs for Rex::Proto::Rmi::Model::ReturnValue 2015-03-24 15:08:59 -05:00