Commit Graph

24169 Commits (f46b4ab8f36d50eb785e7ca0c2bd3044346424f3)

Author SHA1 Message Date
Tod Beardsley f46b4ab8f3
Land #3258, undoing the aggressive vars_post check 2014-04-14 22:30:04 -05:00
William Vu 66cc050876
Land #3256, SMTP RFC compliance for Heartbleed 2014-04-14 17:52:56 -05:00
William Vu f3f31005d8
Revert inadvertent fix for vars_get in msftidy 2014-04-14 14:51:52 -05:00
William Vu 0a4c10876d
Land #3257, errant whitespace fix 2014-04-14 14:33:04 -05:00
Tod Beardsley 66a50b33fd
Errant whitespace 2014-04-14 13:34:39 -05:00
Tom Sellers 634a03a852 Update to openssl_heartbleed to deal with SMTP RFC
Added CR character in order to have the commands match SMTP RFC 5321 2.3.8 for line termination. Some SMTP services, such as the Symantec Mail Gateway, require strict compliance or the connection will be dropped with the response  '550 esmtp: protocol deviation'

Reference:
   http://www.symantec.com/business/support/index?page=content&id=TECH96829
   http://tools.ietf.org/html/rfc5321#section-2.3.8
2014-04-14 13:27:33 -05:00
sinn3r 1f5f697037
Land #3255 - Adds history collection module for FF privileged JS 2014-04-14 12:45:03 -05:00
joev 5f0d723588 Adds history collection module for FF privileged JS. 2014-04-14 12:27:18 -05:00
sinn3r 61196b4793
Land #3246 - Firefox Gather Passwords from Privileged Javascript Shell 2014-04-14 11:37:55 -05:00
David Maloney c537aebf0f
Land #3228, JtR colon Seperation 2014-04-14 11:19:16 -05:00
David Maloney 5074529647
Land #3253, Fix to exe-only format
Lands pull request to fix nil issue with
the to_winpe_only method call in Msf::Util::EXE
2014-04-14 11:04:03 -05:00
agix ac63e84d02 Fix little bug when using msfencode and exe-only
When arch is not defined, arch is null so it crashs.
It should be 'x86' by default
2014-04-14 01:02:31 +02:00
sinn3r 7b6b94acd5
Land #3247 - Revert #3224 jsobfu string size fixes 2014-04-12 00:58:27 -05:00
joev 1715cf4650 Add base64 to prevent potential encoding issues. 2014-04-11 17:30:04 -05:00
joev e09f887c4c Revert "Fixes large-string expansion in JSObfu."
This reverts commit 14fed8c610.
2014-04-11 16:51:47 -05:00
joev 4cb04b6b9a Revert "Use implicit return for assignment."
This reverts commit 49139cc07f.
2014-04-11 16:51:40 -05:00
joev 21b2697b95 Revert "Use tiny var names by default."
This reverts commit 52432ef482.
2014-04-11 16:51:34 -05:00
joev 0b23fc2c40 Revert "Use actual vars so that jsobfu can randomize."
This reverts commit b9284c5635.
2014-04-11 16:51:29 -05:00
joev d41b3467f8 Revert "Re-add the #random_string(len) method to pass specs."
This reverts commit bd8918e4e1.
2014-04-11 16:51:21 -05:00
joev 65d267032d
Fix wrong DisclosureDate. 2014-04-11 16:17:22 -05:00
joev 197a7e556b Add password colletion post module for Firefox shells. 2014-04-11 16:15:48 -05:00
William Vu 6599999b8a
Land #3232, Heartbleed memory dump filtering 2014-04-11 12:46:01 -05:00
Sebastiano Di Paola a63f020a68 Fixing coding style 2014-04-11 19:39:57 +02:00
Sebastiano Di Paola 3a41819b1f Merge branch 'master' of https://github.com/abes975/metasploit-framework into heartbleed 2014-04-11 19:34:45 +02:00
Sebastiano Di Paola 4acacb005d Fixed a bug...referring to wrong variable after filtering with regexp 2014-04-11 19:33:23 +02:00
Sebastiano Di Paola 9cbb86a815 fixed conflict while merging from heartbleed branch 2014-04-11 19:28:32 +02:00
Sebastiano Di Paola 83fe1cec65 Cleaned up Array.join call 2014-04-11 19:24:32 +02:00
Sebastiano Di Paola 55ec969bd9 Renamed FILTER -> DUMPFILTER, more intuitive and coherent 2014-04-11 19:07:57 +02:00
Sebastiano Di Paola 8268009b36 Renamed PATTERN_FILTER -> FILTER 2014-04-11 19:03:25 +02:00
Sebastiano Di Paola c378fe95c1 Added missing space in comment 2014-04-11 19:01:01 +02:00
Sebastiano Di Paola f8f710547c Fixed call to String.match with regexp pattern 2014-04-11 18:59:59 +02:00
Sebastiano Di Paola 638cb41a3f Remove Spaces at EOL, fixed if test on pattern variable 2014-04-11 18:58:05 +02:00
Sebastiano Di Paola 5f973558ce Merge branch 'master' of https://github.com/abes975/metasploit-framework
Conflicts:
	modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
2014-04-11 18:38:59 +02:00
Sebastiano Di Paola ea70abe98d Conflicts resolution should be ok now 2014-04-11 18:33:03 +02:00
Sebastiano Di Paola cc836c0496 Restored FTP option 2014-04-11 18:31:30 +02:00
Sebastiano Di Paola 39320f12a7 - Rubbish that was left dangling here around 2014-04-11 18:31:30 +02:00
Sebastiano Di Paola 139358dc8a fixed conflicts, used OptRegexp for pattern 2014-04-11 18:31:29 +02:00
Sebastiano Di Paola 9331f88dd8 Added feature to dump to file leaked memory 2014-04-11 18:31:29 +02:00
Sebastiano Di Paola 34fa4e29d9 Restored FTP option 2014-04-11 18:16:19 +02:00
Sebastiano Di Paola eb0e35bf25 Fixed store on file option 2014-04-11 18:07:14 +02:00
sinn3r b69662fa42
Land #3233 - eScan Password Command Injection 2014-04-11 11:05:48 -05:00
sinn3r e54a348bd4
Land #3237 - Reconcile test_old_rubies with the other checks 2014-04-11 10:49:23 -05:00
sinn3r eb8e9523ff
Land #3236 - Correct check_vars_get to check_request_vars 2014-04-11 10:47:59 -05:00
jvazquez-r7 0c8f5e9b7d Add @Firefart's feedback 2014-04-11 10:21:33 -05:00
Sebastiano Di Paola c4029ea582 - Rubbish that was left dangling here around 2014-04-11 17:20:54 +02:00
Sebastiano Di Paola 1808fe470a fixed conflicts, used OptRegexp for pattern 2014-04-11 17:16:06 +02:00
Sebastiano Di Paola 4315ad2987 Fixed conflict and used OptRegexp type for pattern 2014-04-11 17:15:39 +02:00
jvazquez-r7 813e0eab89
Land #3233, @wvu-r7's improvements fort heartbleed modules 2014-04-11 09:33:57 -05:00
jvazquez-r7 e2ec53272e Fix also negative numbers 2014-04-11 09:33:27 -05:00
jvazquez-r7 fb5881d8e2
Land #2324, @sensepost and @Firefart's sftp support for heartbleed 2014-04-11 08:47:22 -05:00