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

26736 Commits (5efaf7d4cf386db1be47ad43d6ec80f69fe3ca95)

Author SHA1 Message Date
Joe Vennix 5efaf7d4cf
rename module, handle asyncness. 2014-09-07 23:25:08 -05:00
Joe Vennix 1bf89fb6bd Add Android <= 4.3 AOSP UXSS module. 2014-09-07 20:44:03 -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
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
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
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
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
William Vu b748cee760
Land #3664, enum_osx dump_hash removal 2014-08-19 11:29:23 -05:00
jvazquez-r7 325c05d0e0
Land #3671, @wchen-r7's fix for RangeWalker spec 2014-08-19 11:01:14 -05:00
sinn3r f3528c929f geez, glassfish gtf outta there 2014-08-19 10:40:52 -05:00
sinn3r ad241910d0 This is more invalid than the other one 2014-08-19 10:39:50 -05:00
sinn3r 17b03e7d34 Fix rspec due to an invalid dns becoming valid 2014-08-19 10:28:30 -05:00
OJ e0df664656
Land #3653 : NETAPI x64 fixes 2014-08-19 11:40:43 +10:00
James Lee f169b8dff3
Fix hashes being stored as passwords 2014-08-18 15:52:13 -05:00
joev b93fda5cef
Remove browser_autopwn hook from deprecated FF module. 2014-08-18 15:33:43 -05:00
joev 87aa63de6e
Deprecate FF17 SVG exploit. 
This exploit needs flash, the tostring_console injection one does not.
 2014-08-18 15:32:51 -05:00
cdoughty-r7 5fac1510bc Merge pull request #3667 from todb-r7/fix-release 
Release fixes: Minor caps, grammar, desc fixes
 2014-08-18 14:06:01 -05:00
Brendan Coles 564431fd41 Use arrays in refs for consistency 2014-08-18 18:54:54 +00:00
jvazquez-r7 f812d2619c Fix load_js when opts[:newobfu] and add specs 2014-08-18 13:50:19 -05:00
Tod Beardsley 6792ded714
Land #3666, fix msfconsole start w/out database 2014-08-18 13:44:20 -05:00
Tod Beardsley cad281494f
Minor caps, grammar, desc fixes 2014-08-18 13:35:34 -05:00
James Lee b9e449f5e2
Fix crash when database.yml doesn't exist 2014-08-18 12:40:57 -05:00
jvazquez-r7 3dae6ee934 Not prefixing the class when describing method 2014-08-18 12:19:30 -05:00
jvazquez-r7 2dc579d467 Add template for specs 2014-08-18 12:16:20 -05:00
jvazquez-r7 75df32b1d3 Use single quoted strings out of the spec strings 2014-08-18 11:43:54 -05:00
joev 5654370316
Remove hashdump functionality from enum_osx. 
There is a specific hashdump module that is more up-to-date, no need to duplicate
functionality (and code).
 2014-08-18 11:40:11 -05:00
sinn3r 7c1605efe4
Land #3662 - Fix android payload issue when running browser_autopwn 2014-08-18 11:38:28 -05:00
jvazquez-r7 4ffd166918 Add specs for Rex::Exploitation::EncryptJS 2014-08-18 11:31:36 -05:00
joev 5bfbb7654e
Add android meterpreter to browser autopwn. 2014-08-18 11:09:16 -05:00
William Vu c5c63f44e9
Land #3661, binary coding for libs 2014-08-17 18:01:19 -05:00
HD Moore 5e123e024d Add 'coding: binary' to all msf/rex library files 
This fixes a huge number of hard-to-detect runtime bugs
that occur when a default utf-8 string from one of these
libraries is passed into a method expecting ascii-8bit
 2014-08-17 17:31:53 -05:00
HD Moore d8e82b9394 Lands #3655, fixes pack operators 
the commit.
he commit.
 2014-08-17 17:25:52 -05:00
Brendan Coles b8b2e3edff Add HybridAuth install.php PHP Code Execution module 2014-08-16 23:31:46 +00:00