Commit Graph

82 Commits (50d90defbc4a5af267c9cddc65f1543be03f31ad)

Author SHA1 Message Date
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
Tod Beardsley cad281494f
Minor caps, grammar, desc fixes 2014-08-18 13:35:34 -05:00
Samuel Huckins 149c3ecc63
Various merge resolutions from master <- staging
* --ask option ported to new location
* --version option now works
* MSF version updated
* All specs passing
2014-08-15 11:33:31 -05:00
James Lee eee72a86ba
Fix the case when john cracks only half of LM 2014-07-23 15:25:32 -05:00
James Lee 917d2c718b
Use All4 instead of LanMan
... Which was the original behavior. A full incremental LanMan can take
many hours instead of the few seconds this module was intended to run.
2014-07-21 18:24:35 -05:00
David Maloney 5534599cfc
fix for jtr warnings
remmove include for Jtr mixin in deprecated jtr_unshadow module

remove deprecated postgres_crack module
2014-07-16 12:52:29 -05:00
James Lee 48e93b7fc2
Merge branch 'feature/MSP-9715/linux_hashcracker' into staging/electro-release 2014-06-25 16:15:44 -05:00
David Maloney 34c57f51b1 Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework-private into staging/electro-release 2014-06-25 15:02:35 -05:00
David Maloney ac61a8fe4f
deprecate jtr_unshadow 2014-06-25 15:01:35 -05:00
James Lee 75be200b97
Merge branch 'feature/MSP-9714/jtr_aix' into staging/electro-release 2014-06-25 14:34:41 -05:00
James Lee 70fd3344fd
Merge branch 'feature/MSP-9713/jtr_crack_fast' into staging/electro-release 2014-06-25 14:15:50 -05:00
David Maloney 61d8597a00
missing require 2014-06-25 10:13:41 -05:00
David Maloney 5b0a356045
properly strip extra colons 2014-06-25 10:04:48 -05:00
David Maloney 560fc93834
jtr_aix refactor
updated the aix cracker for jtr
2014-06-24 15:34:28 -05:00
David Maloney 6651af2d9b
refactor jtr_linux cracker 2014-06-23 16:27:28 -05:00
David Maloney 57c4ed51e9
fix mssql incremental modes 2014-06-23 15:37:37 -05:00
David Maloney 1cbc324774
fix up incremental modes
those incrmenetal rules don't exist
in all versions. All and Alnum are too long
for a 'fast-mode' crack. We wwill do Digits though
which does all digits 0-8 and gets us blank passwords
for free.
2014-06-23 15:36:17 -05:00
David Maloney 520c82d7fc
deal with blank password in ntlm 2014-06-23 15:32:50 -05:00
David Maloney c5f2efda18
fixed up casing 2014-06-23 15:26:12 -05:00
David Maloney b246e66eb8
successfully cracking ntlm hashes
still need to handle casing for lm
2014-06-23 14:40:32 -05:00
David Maloney 57cc390681
fix how we save mssql hashes
since the 0x prefix is neccisary, just save the hash that way in the first place
2014-06-23 12:38:36 -05:00
David Maloney dadd959c6a
refactor postgres hash cracking
refactored postgres_hashdump to report the creds
it logged in with. added a new jtr module for
dealing with postgres hashes instead of the
crappy old md5 one we had before
2014-06-23 12:02:39 -05:00
David Maloney 8cfba5770a
missing require 2014-06-20 15:22:37 -05:00
David Maloney d80f4d9e67
refactor jtr_mysql_fast and mysql_hashdump
have mysql_hashdump report the cred it logged in with
refactor jtr_mysql to use the new jtr cracker
2014-06-20 15:21:35 -05:00
David Maloney a929a55404
fix show command parsing
this ius better than a regex and handles special charachters
in usernames and passwords far better than the previous way
2014-06-20 10:48:42 -05:00
David Maloney 93da4dc561
account for mssql12 format
mssql2012 and later uses a new format. some versions
of john support this and some do not yet
2014-06-19 16:11:14 -05:00
David Maloney aca532b994
making egypt happy
it's a full time job
2014-06-19 15:07:33 -05:00
David Maloney 0ff8708e6d
some minor fixes 2014-06-19 13:08:43 -05:00
David Maloney 20f7cde9cc
add incremental and single modes
make sure we run single mode and incremnetal modes
during our runs through these hashes.
2014-06-19 12:38:01 -05:00
David Maloney d3c77b345c
report cracked credentials
also makes mssql_hashdump report the credentials it logged in with
2014-06-19 12:16:49 -05:00
David Maloney 62f4054858
startring refactor on jtr_mssql
started work on the mssql hash cracker
fixed some minor bugs with the underlying mixin
crackers now runs. still have to have the cred objects created
2014-06-18 14:50:08 -05:00
James Lee f54654a326
More refactor on jtr_linux
Reducing complexity in `run` makes modules easier to read
2014-04-09 19:26:34 -05:00
James Lee 7f900c2628
Micro optimizations for jtr_linux 2014-04-09 19:26:23 -05:00
James Lee 46038d58b7
Refactor jtr_linux copy pasta
Move it to a nifty method
2014-04-09 19:26:11 -05:00
William Vu fd1586ee6a
Land #2515, plaintext creds fix for John
[FixRM #8481]
2014-02-28 09:53:47 -06:00
Tod Beardsley ba2c52c5de
Fixed up some more weird splat formatting. 2013-10-16 16:25:48 -05:00
James Lee 96deda5499 Don't ignore the Wordlist option 2013-10-15 15:31:03 -05:00
Tod Beardsley 23d058067a
Redo the boilerplate / splat
[SeeRM #8496]
2013-10-15 13:51:57 -05:00
Tab Assassin 41e4375e43 Retab modules 2013-08-30 16:28:54 -05:00
sinn3r d89932bfd8 Use the correct variable 2013-08-19 14:33:01 -05:00
sinn3r 4cef4e88a6 If exception hits, make sure it's closed. 2013-08-19 13:21:53 -05:00
sinn3r 11ef366818 Properly close hashlist 2013-08-19 13:14:13 -05:00
sinn3r 89d4f0180d Make sure we close hashlist 2013-08-19 12:54:27 -05:00
sinn3r abaec32ad6 What Luke said.
"You cannot, in general, place a variable declaration in a begin
scope and use it in the ensure scope unless you use nil?. It is
better to swap line 35 and line 34."
2013-08-18 23:54:04 -05:00
sinn3r 86d6bce8c4 [FixRM #8312] - Fix file handle leaks
Fix file handle leaks for [SeeRM #8312]
2013-08-18 20:31:13 -05:00
Christian Mehlmauer 95948b9d7c msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
Christian Mehlmauer ca890369b1 msftidy: remove $Id$ 2013-01-03 00:54:48 +01:00
HD Moore 93a69ea62e Fix instances of invalid lower-case datastore use 2012-11-29 00:05:36 -06:00
David Maloney f75ff8987c updated all my authour refs to use an alias 2012-09-19 21:46:14 -05:00