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

75 Commits (f7562c09b2e508f609f4b5d0a7d81008b64265ce)

Author SHA1 Message Date
jvazquez-r7 d85412b0fb
Complete fix for generation of nop sleds 2015-10-16 14:01:00 -05:00
root 51dd88114b Fix grammer in comments 2015-04-13 13:21:41 +05:00
Brent Cook e5443e74ed Merge branch 'upstream-master' into land-3950-chain-encoders 2015-04-03 15:18:06 -05:00
HD Moore e65ac57d1b Fix a logic check in EncodedPayload, which unbreaks stageless testing 2015-03-29 19:08:35 -05:00
HD Moore 744b1a680e Reworks how payload prepends work internally, see #1674 2015-03-12 02:30:06 -05:00
HD Moore 95f67dba7a Tell payloads and encoders how much space they have to work with 2015-03-04 19:25:04 -06:00
agix 24bd814376 Missing iterations when encoder not setted 2015-01-05 16:46:29 +01:00
agix 2eace2b78a Forget to reset raw with encoded payload 2015-01-05 16:46:29 +01:00
agix ba5161753a Allow multiple encoding syntax in Encoder variable 
From msfconsole using set Encoder or set StageEncoder
it is possible to set multiple encoders with this syntax :
<encoder>:<iteration>, <encoder2>:<iteration
This should not break compatibility
 2015-01-05 16:46:29 +01:00
HD Moore f67a32ef9c
Add missing commits from #3770, lands #4393 2014-12-13 17:36:26 -06:00
HD Moore 8aecd5e4a5 Address the two open comments from @jlee-r7 2014-11-03 12:33:11 -06:00
James Lee 3329aa68ad
Fix baffling comment 
See 9d759146
 2014-10-06 18:55:52 -05:00
James Lee e9f341fd6c
Rename to more intention-revealing name 2014-10-06 16:33:21 -05:00
agix 7485d9172a Rescue only NoEncodersSucceededError to pass the tests 2014-09-12 13:30:03 +02:00
agix 28e61edef4 Unblock when invalid encoder is selected and allow multiple encoder 2014-09-12 12:48:09 +02:00
HD Moore 6c0dae953d Stage encoding is now SaveRegister aware 2014-09-09 14:21:51 -05:00
Joe Vennix 6313b29b7a
Add #arch method to Msf::EncodedPayload. 
This allows exploits with few one automatic target to support many
different architectures.
 2014-08-24 02:22:15 -05:00
jvazquez-r7 9fd635d645 Favor \! vs == false 2014-02-24 08:47:25 -06:00
jvazquez-r7 8af992e083 Use same coding style 2014-02-21 16:02:27 -06:00
jvazquez-r7 0c44cc5ae4 Allow Exploits to provide Encoder Compat options 2014-02-21 15:49:39 -06:00
jvazquez-r7 4ca4d82d89
Land #2939, @Meatballs1 exploit for Wikimedia RCE and a lot more... 2014-02-18 17:48:02 -06:00
Meatballs 0a3cb3377f
AppendEncoder 2014-02-04 15:41:10 +00:00
James Lee b9e234f62d
Log the size if it doesn't fit 2014-02-02 22:28:23 -06:00
William Vu f5d1d8eace chmod -x .rb files without #! in modules and lib 
It wasn't just cmdstager_printf.rb. :/
 2013-10-30 19:51:25 -05:00
Tab Assassin 7e5e0f7fc8 Retab lib 2013-08-30 16:28:33 -05:00
James Lee f4498c3916 Remove $Id tags 
Also adds binary coding magic comment to a few files
 2013-05-20 16:21:03 -05:00
James Lee db676f1a88 Whitespace at EOL 2013-03-07 18:20:08 -06:00
James Lee d36e38fca6 Move encoding into handle_connection 
* Allows payloads that override generate_stage to still take advantage
  of stage encoding
* Also adds doc comments for a few methods
 2013-01-15 10:34:31 -06:00
HD Moore d656e3185f Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
James Lee 4181fd9709 Add support for EXE::Custom in EncodedPayload#encoded_exe 
Fixes an issue with java_signed_applet (and probably others) not
honoring EXE::Custom settings.
 2012-04-16 12:09:25 -06:00
HD Moore 1a364df37e Pull payload/exploit options into nop modules as well 2012-03-12 23:28:47 -05:00
HD Moore 606ca82432 Share the datastore with encoders 2012-03-12 23:23:15 -05:00
scriptjunkie 9d7591467f Fix "failed to generate" error when passing a preferred encoder to "payload.generate" method using RPC from, for example, the GUI on Windows. 
framework.encoders[reqs['Encoder']] returns nil when, for example, reqs['Encoder'] is in UTF-8 encoding and the corresponding key of the framework.encoders hash in US-ASCII encoding.
 2012-01-20 21:06:53 -06:00
Mario Ceballos a7d95fad73 typo.. was working on some java sploit and found it. 
git-svn-id: file:///home/svn/framework3/trunk@13667 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-30 22:23:00 +00:00
James Lee 4188db3a6d honor the Spawn option when creating a jar 
git-svn-id: file:///home/svn/framework3/trunk@13215 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-19 02:54:38 +00:00
James Lee 7581ce0153 try the payload's arch/platform if we don't have an associated exploit 
git-svn-id: file:///home/svn/framework3/trunk@11116 4d416f70-5f16-0410-b530-b9f4589650da
 2010-11-23 20:37:32 +00:00
James Lee b3b43bbb8b fix a bug in arch detection when an EncodedPayload's pinst is an EncodedPayload instead of a Payload 
git-svn-id: file:///home/svn/framework3/trunk@11115 4d416f70-5f16-0410-b530-b9f4589650da
 2010-11-23 20:34:27 +00:00
James Lee 9df192497b make sure we're not turning nil into [nil], since it breaks the arch detection 
git-svn-id: file:///home/svn/framework3/trunk@11098 4d416f70-5f16-0410-b530-b9f4589650da
 2010-11-22 17:48:35 +00:00
James Lee 326dc42bca add EncodedPayload#encoded_exe, encoded_jar, and encoded_war. simplifies exploits that need java and native payloads. see #406 and #3009 
git-svn-id: file:///home/svn/framework3/trunk@10999 4d416f70-5f16-0410-b530-b9f4589650da
 2010-11-11 23:01:35 +00:00
James Lee 27cc50f29a missed this in the java payload updates, r10781 
git-svn-id: file:///home/svn/framework3/trunk@10786 4d416f70-5f16-0410-b530-b9f4589650da
 2010-10-22 20:40:25 +00:00
James Lee 5d95f48848 add preliminary support for the new java payloads. Working meterpreter and shell stages with tcp bind and reverse stagers, see #406 
git-svn-id: file:///home/svn/framework3/trunk@10073 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-20 07:01:23 +00:00
Joshua Drake d7a4cd2096 fix next/break handling inside new loop -- fixes #2310 
git-svn-id: file:///home/svn/framework3/trunk@9951 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-03 16:00:45 +00:00
James Lee 9a583b9e09 fix encoding. =/ 
git-svn-id: file:///home/svn/framework3/trunk@9918 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-24 01:04:58 +00:00
James Lee e957a7a90e add support for doing everything msfpayload does into msfconsole and xmlrpc, fixes #589. Thanks, Ryan Linn for the patch 
git-svn-id: file:///home/svn/framework3/trunk@9914 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-23 20:22:36 +00:00
HD Moore 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
James Lee 21ff66996a make logging a little more useful when encoding 
git-svn-id: file:///home/svn/framework3/trunk@7051 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-22 06:45:58 +00:00
HD Moore 6e773891de Fixes #167. Remove the EncoderDontFallThrough option, make this the normal behavior if an encoder is specified 
git-svn-id: file:///home/svn/framework3/trunk@5862 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-09 22:23:29 +00:00
Ramon de C Valle 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
Matt Miller 30ae3af6fb experimental: stages encoded by default, set DisableStageEncoding 1 to disable 
git-svn-id: file:///home/svn/framework3/trunk@5511 4d416f70-5f16-0410-b530-b9f4589650da
 2008-05-26 07:59:03 +00:00
Matt Miller aad6a6868b added EncoderDontFallThrough option, fixes #155 
git-svn-id: file:///home/svn/framework3/trunk@5132 4d416f70-5f16-0410-b530-b9f4589650da
 2007-10-02 03:36:45 +00:00