2ac0d25413
Fixes e-mail format, also a whitespace
2013-05-31 18:47:46 -05:00
05916c079e
Inline unit tests are so last decade
...
Aside from codebase-wide changes, nearly all of these tests haven't been
touched since before 2010, and there is no effort to maintain this style
of testing. We've moved on to (correctly) seperating out our tests from
our codebase.
2013-05-23 12:41:14 -05:00
e48cea432c
added add_sub encoder for x86 payloads
2013-04-08 20:51:39 +03:00
2160718250
Fix file header comment
...
[See #1555 ]
2013-03-07 17:53:19 -06:00
4085fa73c5
Merge branch 'stephenfewer-master'
2013-02-27 11:13:10 -06:00
b3b68c1b90
Make stage encoding possible
...
* Fixes a bug in shikata where input greater than 0xffff length would
still use 16-bit counter
* Short circuits finding bad xor keys if there are no bad characters to
avoid
* Fixes huge performance issue with large inputs to xor-based encoders
due to the use of String#+ instead of String#<< in a loop. It now
takes ~3 seconds on modern hardware to encode a 750kB buffer with
shikata where it used to take more than 10 minutes. The decoding side
takes a similar amount of time and will increase the wait between
sending the second stage and opening a usable session by several
seconds.
I believe this addresses the intent of pull request 905
[See #905 ]
2013-01-13 21:07:39 -06:00
8e6e1bc164
open up the bloxor encoder.
2013-01-10 17:39:40 +00:00
8f2dd8e2ce
msftidy: Remove $Revision$
2013-01-04 00:48:10 +01:00
25aaf7a676
msftidy: Remove $Id$
2013-01-04 00:41:44 +01:00
93a69ea62e
Fix instances of invalid lower-case datastore use
2012-11-29 00:05:36 -06:00
e9f7873afc
Version cleanup
...
Remove all values that are neither 0 nor $Revision$.
2012-10-22 20:57:02 +02:00
b46fb260a6
Comply with msftidy
...
*Knock, knock!* Who's there? Me, the msftidy nazi!
2012-08-07 15:59:01 -05:00
cc90a60a1b
Correct the use of the platform argument
...
The platform argument is meant to be a PlatformList object, not as an array:
http://dev.metasploit.com/redmine/issues/6826
This commit undoes the last change to init_platform() in alpha_mixed and modifies msfvenom to use it as intended.
2012-06-26 17:32:55 +02:00
1d121071f3
Prepend nops to raw payload in encoder if needed
2012-06-15 09:59:10 +02:00
091b3bbbd9
Added module plus encoder for CVE-2012-2329
2012-06-15 00:29:52 +02:00
605e1929e4
Fixed msfvenom NoMethodError with alpha_mixed encoder.
...
The issue was reported on Github[1] and Redmine[2].
The error consisted of trying to use the supports?() method
on an Array instead of a PlatformList.
[1] https://github.com/rapid7/metasploit-framework/issues/357
[2] http://dev.metasploit.com/redmine/issues/6826
Reported by: Brandon Perry
Signed off by: Silviu Popescu <silviupopescu1990@gmail.com>
2012-05-03 17:47:25 +03:00
aeb691bbee
Massive whitespace cleanup
2012-03-18 00:07:27 -05:00
3a33434867
Fix a couple of typos that throw off module authors
2012-03-05 13:28:46 -07:00
ceb4888772
Fix up the boilerplate comment to use a better url
2012-02-20 19:40:50 -06:00
6f5961db52
don't dump a stack trace when it's a normal encoding failure.
...
git-svn-id: file:///home/svn/framework3/trunk@13532 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-11 21:29:53 +00:00
a9d429d09a
make printf_php_mq ManualRanking to avoid using it in situations where it will definitely fail. fixes opera_historysearch
...
git-svn-id: file:///home/svn/framework3/trunk@12671 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-20 09:59:01 +00:00
4b4ed6edbe
un-truncate a comment and make sure we didn't append a . to the buffer
...
git-svn-id: file:///home/svn/framework3/trunk@11788 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-22 01:59:17 +00:00
d2670d52ec
add BufferRegister and BufferOffset support for shikata_ga_nai. see #3563 . tested this pretty extensively. /me crosses fingers
...
git-svn-id: file:///home/svn/framework3/trunk@11646 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 04:24:41 +00:00
bd7f6eec10
Typo.
...
git-svn-id: file:///home/svn/framework3/trunk@11045 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-14 23:39:29 +00:00
2d6b995623
rename/clarify PrintfUtil encoder, fixes #2308
...
git-svn-id: file:///home/svn/framework3/trunk@10729 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 15:41:13 +00:00
4590844871
tons of indentation fixes, some other style tweaks
...
git-svn-id: file:///home/svn/framework3/trunk@10394 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 08:06:27 +00:00
d4e5f17d62
reduce the rank of the php encoder so it is no longer the default for msfencode. kind of a hacky solution, should probably default the arch to x86 directly, but i'm afraid of breaking something in msfencode
...
git-svn-id: file:///home/svn/framework3/trunk@9884 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 06:27:14 +00:00
8ba9d6254a
prioritize the base64 encoder over chr()
...
git-svn-id: file:///home/svn/framework3/trunk@9661 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 01:53:35 +00:00
0882838491
ensure binary mode when opening files, whitespace fixes
...
git-svn-id: file:///home/svn/framework3/trunk@9653 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 23:33:07 +00:00
f0a4812644
add special encoder for piranha_passwd_exec vuln (rh62)
...
git-svn-id: file:///home/svn/framework3/trunk@9613 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 22:36:51 +00:00
dcc52ff3f0
add a last-ditch effort in case alphanums are badchars
...
git-svn-id: file:///home/svn/framework3/trunk@9592 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-23 08:23:00 +00:00
d8609b85e3
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@9460 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-09 18:41:58 +00:00
74a68138fc
Add new context-keyed encoders from Dimitris Glynos ( http://census-labs.com/news/2010/06/04/athcon-2010-update/ )
...
git-svn-id: file:///home/svn/framework3/trunk@9457 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-09 16:43:46 +00:00
0e72894e58
more cleanups
...
git-svn-id: file:///home/svn/framework3/trunk@9212 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 17:13:09 +00:00
0ea6eca4bc
big module whitespace/formatting cleanup pass
...
git-svn-id: file:///home/svn/framework3/trunk@9179 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-30 08:40:19 +00:00
4ccfc076f9
ruby 1.8 compat fix
...
git-svn-id: file:///home/svn/framework3/trunk@8014 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 22:53:39 +00:00
a247de77ec
add the SingleStaticBit for the CVE-2008-4193 exploit - comments welcome
...
git-svn-id: file:///home/svn/framework3/trunk@8011 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 20:39:43 +00:00
e35ac1822a
fix formatting
...
git-svn-id: file:///home/svn/framework3/trunk@7956 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 04:23:56 +00:00
a49a48bff4
fix formatting
...
git-svn-id: file:///home/svn/framework3/trunk@7943 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-22 00:18:53 +00:00
d5afd6c670
fixed typo/formatting in description
...
git-svn-id: file:///home/svn/framework3/trunk@7941 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 23:05:44 +00:00
7e4d03be86
This adds support for the old exe format to msfencode using -t exe-small and allows encoder modules to change preferences based on the platform, which fully solves #430 .
...
git-svn-id: file:///home/svn/framework3/trunk@7840 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:03:35 +00:00
8e5d2b98b0
prefer the echo encoder over the simpler and more error prone ifs encoder
...
git-svn-id: file:///home/svn/framework3/trunk@7679 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 08:39:22 +00:00
61e233df91
Keywords on all modules, plugins, and scripts
...
git-svn-id: file:///home/svn/framework3/trunk@7550 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 00:05:19 +00:00
0150e7a4de
add a simple encoder for sh payloads that only replaces spaces. fixes #525
...
git-svn-id: file:///home/svn/framework3/trunk@7549 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 00:00:08 +00:00
06372f3c40
See #430 . This adds the AllowWin32SEH option to the upper/mixed alphanumeric encoders, providing 100% alphanumeric payloads for Windows platforms
...
git-svn-id: file:///home/svn/framework3/trunk@7405 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-08 00:45:51 +00:00
53e3f166f8
make x86/nonupper raise the right exception type, prettify some formatting
...
git-svn-id: file:///home/svn/framework3/trunk@7083 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-28 05:23:23 +00:00
bbf2aca050
Something about the poly code in jmp_call_additive is busted. Go back to the old static decoder stub until we can figure it out.
...
git-svn-id: file:///home/svn/framework3/trunk@7082 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-28 04:56:21 +00:00
5972666f63
See #339 . Massive cleanup of author names, make them consistent across modules
...
git-svn-id: file:///home/svn/framework3/trunk@7075 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-27 21:30:45 +00:00
cf10a62dcc
Merge in the beginnings of x64 support from Stephen Fewer
...
git-svn-id: file:///home/svn/framework3/trunk@6972 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-23 23:47:33 +00:00
7d866442f0
Skip encoding when there are no badchars -- temporary solution until the encoders also look at the Compat -> RequiredCmds field.
...
git-svn-id: file:///home/svn/framework3/trunk@6957 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-17 17:42:39 +00:00
7fb18d6e11
Add coverage for the new nagios3 cmd execution bug
...
git-svn-id: file:///home/svn/framework3/trunk@6936 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-04 19:27:50 +00:00
01953f7c16
improved unix cmd encoder
...
git-svn-id: file:///home/svn/framework3/trunk@6738 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-03 06:35:13 +00:00
f78482d3f5
Indicate lack of support for ruby 1.9.0, indicate experimental support for ruby 1.9.1
...
git-svn-id: file:///home/svn/framework3/trunk@6661 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 21:30:56 +00:00
c08bc4f10b
fix a potential problem with the base64 encoder
...
git-svn-id: file:///home/svn/framework3/trunk@6511 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-30 06:11:56 +00:00
ba3627aa9b
fix some potential problems with the base64 encoder
...
git-svn-id: file:///home/svn/framework3/trunk@6492 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-19 02:31:34 +00:00
37c2e301ed
replacing defunct framework URL in header comments in most modules and pcap_log
...
git-svn-id: file:///home/svn/framework3/trunk@6479 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-13 14:33:26 +00:00
c66d6c4e46
Set property 'svn:keywords'
...
git-svn-id: file:///home/svn/framework3/trunk@5783 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-23 02:43:21 +00:00
f124597a56
Code cleanups
...
git-svn-id: file:///home/svn/framework3/trunk@5773 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 21:03:39 +00:00
fd256ec4a1
This massive commit changes the metasploit 3 module format. The new syntax allows for greater scalability and future improvements to the metasploit module loader. This change also makes it easier for users to add new modules, since the class name no longer needs to match the directory structure.
...
git-svn-id: file:///home/svn/framework3/trunk@5709 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-02 05:23:59 +00:00
6772685f3e
Merge patch from Julien TINNES for MIPS support (LE/BE)
...
git-svn-id: file:///home/svn/framework3/trunk@5658 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-15 18:50:34 +00:00
8800372e46
initial commit of browser_autopwn;
...
revamp php payloads;
socks5 for IPv6 (untested)
git-svn-id: file:///home/svn/framework3/trunk@5546 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-01 01:44:56 +00:00
f61cde59c4
initial support for context encoding
...
git-svn-id: file:///home/svn/framework3/trunk@5081 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-31 04:01:30 +00:00
457b4eb8f3
added some comments and better handling of payloads with invalid sizes
...
git-svn-id: file:///home/svn/framework3/trunk@5028 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-04 06:24:45 +00:00
c844826266
use exploit base class method
...
git-svn-id: file:///home/svn/framework3/trunk@5007 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-29 00:29:53 +00:00
bf16736e59
shikata improvements from vlad902
...
git-svn-id: file:///home/svn/framework3/trunk@4721 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-21 02:10:22 +00:00
0aaad5f9c2
off
...
git-svn-id: file:///home/svn/framework3/trunk@4720 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-21 01:53:49 +00:00
f0fcedf728
raw encoder type wasn't being enforced
...
git-svn-id: file:///home/svn/framework3/trunk@4599 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-01 21:00:51 +00:00
abbeb2e87e
Adding an Id tag and a standard header to all modules
...
git-svn-id: file:///home/svn/framework3/trunk@4419 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 00:10:39 +00:00
2822ef3c4c
added support for manual ranking
...
git-svn-id: file:///home/svn/framework3/trunk@3867 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-12 05:35:07 +00:00
ef6bbb649c
Bug fix, thanks MC
...
git-svn-id: file:///home/svn/framework3/trunk@3865 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-10 16:18:35 +00:00
47039ff3fa
First round of bugfixes for encoders. Alphanumeric encoders no longer default the BufferRegister option, since this can lead to non-compatible exploits falling through to these encoders, selecting them, and then crashing. The new method uses a dynamic (not quite poly) geteip generator, that while not yet alphanumeric compatible, it handles most of the known use cases. Remaining items:
...
1) Figure out how to handle unicode geteip (unicode encoded, alphanum probably)
2) Add keys to the unicode payloads to force a corresponding keyu on the exploit side to enable
git-svn-id: file:///home/svn/framework3/trunk@3863 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-10 05:10:48 +00:00
e0465b92aa
Bug fix
...
git-svn-id: file:///home/svn/framework3/trunk@3852 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-01 19:45:00 +00:00
a724d42aa0
added mcafee mcsubmgr exploit, added functional avoid utf8 encoder
...
git-svn-id: file:///home/svn/framework3/trunk@3830 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-14 08:55:37 +00:00
c02749067f
Add nonupper encoder, like nonalpha, but with badchar support instead of lowercase char range
...
git-svn-id: file:///home/svn/incoming/trunk@3641 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-08 15:04:50 +00:00
d086a1bedf
BSD license the default for non-msfdev created modules.
...
git-svn-id: file:///home/svn/incoming/trunk@3636 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-06 16:34:39 +00:00
07e157efdf
Working on encoder fixes
...
git-svn-id: file:///home/svn/incoming/trunk@3618 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-26 05:14:55 +00:00
bc9cc35f3e
Fix offset for table
...
git-svn-id: file:///home/svn/incoming/trunk@3613 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-24 15:42:05 +00:00
003c3444eb
Change to reflect lib change
...
git-svn-id: file:///home/svn/incoming/trunk@3612 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-24 15:01:53 +00:00
f678425f07
Add non-alpha encoder (not quite done, but passes tests with \xcc)
...
git-svn-id: file:///home/svn/incoming/trunk@3604 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-20 21:11:33 +00:00
e249d9ebe5
Massive update to tab indentation (used ./dev/tabify.rb)
...
git-svn-id: file:///home/svn/incoming/trunk@3450 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 05:00:35 +00:00
1bffccf605
New licensing terms, revision bump to v3
...
git-svn-id: file:///home/svn/incoming/trunk@3425 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-21 22:10:20 +00:00
5cee818623
poly encoder fixes
...
git-svn-id: file:///home/svn/incoming/trunk@3406 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-18 15:43:48 +00:00
423b023de8
patch for badchar stuff
...
git-svn-id: file:///home/svn/incoming/trunk@3404 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-18 15:21:41 +00:00
68a8a5262b
change unknown license to GPL
...
git-svn-id: file:///home/svn/incoming/trunk@3379 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-16 03:48:36 +00:00
2e19a86843
added license to all modules
...
git-svn-id: file:///home/svn/incoming/trunk@3377 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-16 02:59:47 +00:00
4a14fa7e02
Merged them into one
...
git-svn-id: file:///home/svn/incoming/trunk@3376 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-16 02:32:30 +00:00
9c5f4776b8
Some generic encoders for commands
...
git-svn-id: file:///home/svn/incoming/trunk@3375 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-15 22:43:44 +00:00
04f13dc167
Rename
...
git-svn-id: file:///home/svn/incoming/trunk@3374 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-15 21:26:20 +00:00
3b72122932
remove superfluous unit test
...
git-svn-id: file:///home/svn/incoming/trunk@3350 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-08 20:23:11 +00:00
4434198b02
rename block
...
git-svn-id: file:///home/svn/incoming/trunk@3338 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-08 01:17:06 +00:00
9fda1582f8
rename block
...
git-svn-id: file:///home/svn/incoming/trunk@3337 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-08 01:16:49 +00:00
1eead1a5e9
increase ranking
...
git-svn-id: file:///home/svn/incoming/trunk@3336 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-08 01:12:34 +00:00
43495bd398
more poly
...
git-svn-id: file:///home/svn/incoming/trunk@3334 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-08 01:10:45 +00:00
c35e687659
jmp/call additive is no polyified
...
git-svn-id: file:///home/svn/incoming/trunk@3332 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-07 23:38:55 +00:00
b5b9e2ac1f
added to_native for unicode
...
git-svn-id: file:///home/svn/incoming/trunk@3319 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-06 15:34:51 +00:00
90175dd5ce
minor fixup
...
git-svn-id: file:///home/svn/incoming/trunk@3317 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-06 09:03:34 +00:00
cd4d7a6ff8
updates to alpha/unicode encoders
...
git-svn-id: file:///home/svn/incoming/trunk@3314 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-06 02:25:23 +00:00
f9d058887b
initial import of alpha2 from pusscat
...
git-svn-id: file:///home/svn/incoming/trunk@3313 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-06 00:57:14 +00:00
f468b10cff
Tweaks
...
git-svn-id: file:///home/svn/incoming/trunk@3286 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-31 18:03:02 +00:00
076442ceda
Add assembly comments
...
git-svn-id: file:///home/svn/incoming/trunk@3282 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-30 20:38:13 +00:00
sinn3r
Tod Beardsley
Melih SARICA
James Lee
sinn3r
Stephen Fewer
Christian Mehlmauer
HD Moore
Michael Schierl
jvazquez-r7
Silviu-Mihai Popescu
James Lee
Mario Ceballos
Joshua Drake
kris
Ramon de C Valle
Matt Miller