infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,794 Commits
7 Branches
556 Tags
419 MiB
Commit Graph

26794 Commits (fa502c9c69e2b4a1df0b4dadb9528fe4cf55164b)

Author SHA1 Message Date
Tom Sellers fa502c9c69 Minor adjustments 2014-08-24 17:39:13 -05:00
Tom Sellers 1fa43bfe64 Rework for Credential lib update 2014-08-23 10:53:55 -05:00
jvazquez-r7 3bbe9bf074
Land #3540, JBoss refactoring with @us3r777 2014-08-22 17:06:28 -05:00
jvazquez-r7 0737d0dbd5 Refactor auxiliary module 2014-08-22 17:05:45 -05:00
jvazquez-r7 0031913b34 Fix nil accesses 2014-08-22 16:19:11 -05:00
jvazquez-r7 8945f04ffd Add specs for Msf::HTTP::JBoss::BeanShell 2014-08-22 16:13:38 -05:00
jvazquez-r7 f57dd9a224 Add specs for #generate_bsh 2014-08-22 15:39:58 -05:00
jvazquez-r7 2b3058869f Add Msf::HTTP::JBoss::BeanShellScripts specs 2014-08-22 15:36:29 -05:00
jvazquez-r7 7ee5423310 Add specs for Msf::HTTP::JBoss::Base 2014-08-22 15:11:27 -05:00
William Vu 5d708b65b4
Land #3676, updated Meterpreter bins! 
For KB2871997.
 2014-08-22 14:33:27 -05:00
jvazquez-r7 4742dbad91 Fix YARD documentation 2014-08-22 14:18:13 -05:00
jvazquez-r7 9ef09a7725 Pass msftidy 2014-08-22 13:24:59 -05:00
jvazquez-r7 38e6576990 Update 2014-08-22 13:22:57 -05:00
jvazquez-r7 da0950df24
Land #3674, @todb-r7's patch for RangeWalker spec 2014-08-22 11:57:14 -05:00
jvazquez-r7 e93fbbd904
Land #3685, @pedrib's exploit for CVE-2014-3996 2014-08-22 11:45:41 -05:00
jvazquez-r7 cf147254ad Use snake_case in the filename 2014-08-22 11:44:35 -05:00
jvazquez-r7 823649dfa9 Clean exploit, just a little 2014-08-22 11:43:58 -05:00
jvazquez-r7 9815b1638d Refactor pick_target 2014-08-22 11:31:06 -05:00
Joe Vennix 95fbb8f1b7
Land PR #3672, dmaloney-r7's login scanner credential rework. 2014-08-22 11:15:32 -05:00
jvazquez-r7 ecace8beec Refactor check method 2014-08-22 11:05:36 -05:00
Brandon Turner 05f0d09828
Merge branch staging/electro-release into master 
On August 15, shuckins-r7 merged the Metasploit 4.10.0 branch
(staging/electro-release) into master.  Rather than merging with
history, he squashed all history into two commits (see
149c3ecc63 and
82760bf5b3).

We want to preserve history (for things like git blame, git log, etc.).
So on August 22, we reverted the commits above (see
19ba7772f3).

This merge commit merges the staging/electro-release branch
(62b81d6814) into master
(48f0743d1b).  It ensures that any changes
committed to master since the original squashed merge are retained.

As a side effect, you may see this merge commit in history/blame for the
time period between August 15 and August 22.
 2014-08-22 10:50:38 -05:00
jvazquez-r7 ced65734e9 Make some datastore options advanced 2014-08-22 10:26:04 -05:00
dmaloney-r7 6ee39f89de Merge pull request #13 from jvennix-r7/update-gemfile-lock-so-travis-can-run 
Update lockfile in msf repo after `bundle install`
 2014-08-22 10:24:10 -05:00
jvazquez-r7 b4e3e84f92 Use CamelCase for target keys 2014-08-22 10:23:36 -05:00
jvazquez-r7 b58550fe00 Indent description and fix title 2014-08-22 10:21:08 -05:00
Brandon Turner 19ba7772f3
Revert "Various merge resolutions from master <- staging" 
This reverts commit 149c3ecc63.

Conflicts:
	lib/metasploit/framework/command/base.rb
	lib/metasploit/framework/common_engine.rb
	lib/metasploit/framework/require.rb
	lib/msf/core/modules/namespace.rb
	modules/auxiliary/analyze/jtr_postgres_fast.rb
	modules/auxiliary/scanner/smb/smb_login.rb
	msfconsole
 2014-08-22 10:17:44 -05:00
joev 05afe416a9
Update lockfile to pull in new msf-cred versions. 2014-08-21 15:44:16 -05:00
Pedro Ribeiro da752b0134 Add exploit for CVE-2014-3996 2014-08-21 15:30:28 +01:00
David Maloney 48f0743d1b
remove crappy basedir method 
this method is no lopnger needed
 2014-08-20 15:28:36 -05:00
David Maloney 6bc55bf8cc
change is_apt method 2014-08-20 15:27:11 -05:00
David Maloney b547f7fc75
fix msfbasedir for go_pro 
go_pro uses the wrong base director y for starting
up metasploit pro when using the go_pro command
this caused errors
 2014-08-20 15:22:18 -05:00
Tod Beardsley f9b902c6cc
Land #3681, restore rake and rspec functionality 
Since this is a more complete fix than #3678 and #3679, this merge
closes #3678 and closes #3679. Lets see if that magic syntax works!
 2014-08-20 11:27:09 -05:00
James Lee cef4ddf535
Fix a crash when msfconsole is a symlink 2014-08-20 11:03:41 -05:00
James Lee c3e8bc8fa0
Fix a crash when we can't connect to PG, again 2014-08-20 11:02:46 -05:00
James Lee fa27def41f Revert "Fix a crash when we can't connect to PG" 
This reverts commit b6deb6a342.
 2014-08-20 11:01:29 -05:00
OJ a6b7262611 Updated to meterpreter_bins version 0.0.7 
This has been a long time coming! Kiwi has been broken for a while and
this updated fixes that problem.

Details of the binaries build date/commits are in the gemspec in the
main meterpreter_bins repo.
 2014-08-20 12:30:34 +10:00
William Vu f0f5772217
Land #3675, firefox_svg_plugin un-deprecation 2014-08-19 17:52:41 -05:00
sinn3r e2e2dfc6a3 Undo FF 2014-08-19 17:47:44 -05:00
sinn3r 777efb5e48
Land #3669 - Deprecate ff 17 svg exploit 2014-08-19 17:42:31 -05:00
sinn3r c73ec66c7a
Land #3659 - Add HybridAuth install.php PHP Code Execution 2014-08-19 17:19:01 -05:00
Tod Beardsley a4c6a10edb
The .foo domain is live now. 
I still kinda hate these tests, though, since they fail in wildcard DNS
environments (like OpenDNS).
 2014-08-19 16:47:30 -05:00
dmaloney-r7 0c9dafff54 Merge pull request #3673 from jlee-r7/bug/MSP-11061/crash-without-postgres 
Fix a crash when we can't connect to PG
 2014-08-19 16:16:30 -05:00
James Lee b6deb6a342
Fix a crash when we can't connect to PG 
MSP-11061

No Postgres, no cry
 2014-08-19 15:30:24 -05:00
Tod Beardsley 08430ee7ac
Land #3616, cred gem for imap from @TomSellers 2014-08-19 15:26:12 -05:00
Tom Sellers 74920d26a4 Update to server/capture/imap.rb for new Credential system 2014-08-19 15:25:31 -05:00
Tod Beardsley 170c8b699a
Land #3617 from @TomSellers, ftp anon scanner 2014-08-19 13:22:30 -05:00
sinn3r 311cc5befb
Land #3668 - Add specs for Rex::Exploitation::HeapLib 2014-08-19 13:14:24 -05:00
Tom Sellers 3fdad4dc91
Update auxillary/scanner/ftp with Credential Gem 2014-08-19 13:13:05 -05:00
sinn3r 7bf637716a
Land #3663 - Add specs for Rex::Exploitation::EncryptJS 2014-08-19 13:08:14 -05:00
William Vu dc95b01cc5
Land #3670, smb_login private_type fix 
[FixRM #8841]
 2014-08-19 11:30:23 -05:00