Commit Graph

72 Commits (dbad1a5e4c7abcbea3f33d97778495a8ec5f19af)

Author SHA1 Message Date
James Lee 9843dc4cb4 Land #1708, android meterpreter
Conflicts:
	data/meterpreter/ext_server_stdapi.jar
2013-05-28 12:19:45 -05:00
James Lee 0d9b120bac Get rid of the suffix
This makes blob cache a little cleaner

[FixRM #7898]
2013-05-02 16:55:14 -05:00
Raphael Mudge 21f8e19d55 Single Payloads Cache Assembled Payload Improperly
An earlier change to the framework (prepend_migrate) forced single
payloads to use the internal_generate method of payload.rb.

internal_generate calls build which has a cache to track assembled
payloads. This method assumes that a payload only needs to be
assembled once, with optional values patched in later.

Single payloads do not work this way. Each time they are generated
new assembly source is created with the options hardcoded in.

This fix updates build to use the hashcode of the assembly code as
part of the cache key.

This fixes #7898 -- a bug that prevents a user from generating
multiple variations of a single payload without a restart.
2013-04-29 11:54:53 -04:00
timwr 32bd812bdb android meterpreter 2013-04-12 18:57:04 +01:00
scriptjunkie 52251867d8 Ensure Windows single payloads use payload backend
This means the singles that define their own assembly will use the payload backend to generate it.
2013-01-18 16:34:39 -06:00
HD Moore d656e3185f Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
James Lee 62a54e0ad6 Account for stagers that use Assembly
Since staged payloads end up with an array of architectures, this was
failing to find a cpu and causing uncaught exceptions that crashed
msfconsole at startup. This only occurred when a stager contained an
Assembly directive. None of the default paylaods do this, so users
should generally not have been affected.
2012-03-30 17:57:56 -06:00
Maciej Kotowicz f91b894375 added posibilities for generating payload from asm to more arch's
added linux/x64/shell_find_port payload
2012-03-14 22:39:56 +01:00
James Lee e7a545c483 spaces at EOL in core stuff 2011-11-20 12:10:08 +11:00
HD Moore 9ce47c01bd Reverting the autoload changes until we can upgrade to a new ActiveSupport library or find a workaround
git-svn-id: file:///home/svn/framework3/trunk@12600 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 20:03:55 +00:00
Joshua Drake fd4e6db85d Fixes 4373, Migrates lib/msf to use autoload instead of require (first try)
git-svn-id: file:///home/svn/framework3/trunk@12596 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 19:07:35 +00:00
HD Moore 78a2558142 Apply patch from chao-mu, fixes #4414
git-svn-id: file:///home/svn/framework3/trunk@12591 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 14:59:44 +00:00
James Lee 06779bc8c0 remove unnecessary requires for stuff in rex. autoload and a high-level require 'rex' in lib/msf/core.rb should take care of everything. see #4371, #4373, r12587, and r12554.
git-svn-id: file:///home/svn/framework3/trunk@12588 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 00:53:33 +00:00
HD Moore b8bcc2fedb Continue processing even if the exploit's on_new_session override triggers an exception
git-svn-id: file:///home/svn/framework3/trunk@10413 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 03:05:55 +00:00
Joshua Drake 09af63c1fb generate returning nil in payload.size
git-svn-id: file:///home/svn/framework3/trunk@10087 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 20:35:48 +00:00
Joshua Drake 198cc37f8a load java payload mixin, fixes #2432
git-svn-id: file:///home/svn/framework3/trunk@10081 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 18:04:48 +00:00
Joshua Drake 7d560e9c18 rescue NoCompatiblePayloadError inside size method, fixes #1604
git-svn-id: file:///home/svn/framework3/trunk@10051 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 00:10:06 +00:00
Joshua Drake 17bd4b8b7d fixed aix payloads to REALLY do variable substitution
git-svn-id: file:///home/svn/framework3/trunk@8418 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 22:41:36 +00:00
HD Moore 32f7d742b3 Fixes #328. Crafty little bug -- if asm was "" vs nil, the stage would try to compile as metasm instead of using the raw payload.
git-svn-id: file:///home/svn/framework3/trunk@7278 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 17:44:43 +00:00
HD Moore e27691c543 Performance and debugging improvements from Yoann Guillot
git-svn-id: file:///home/svn/framework3/trunk@6712 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-25 17:59:51 +00:00
Ramon de C Valle c2362ec409 All your POWER are belong to us.
git-svn-id: file:///home/svn/framework3/trunk@6698 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-23 03:49:25 +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
Ramon de C Valle 4c847e0d44 Fixed typo
git-svn-id: file:///home/svn/framework3/trunk@5772 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 20:38:07 +00:00
Ramon de C Valle c34bbae344 Added payload advanced packing types for 16/16 and 22/10 bits substitution
git-svn-id: file:///home/svn/framework3/trunk@5770 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 20:32:14 +00:00
HD Moore 0f25d98fb2 Fixes a typo with IPv4->IPv6 address translation
git-svn-id: file:///home/svn/framework3/trunk@5652 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-05 16:23:34 +00:00
HD Moore fcaa218548 Fix IPv4 payloads, dont commit past midnight anymore.
git-svn-id: file:///home/svn/framework3/trunk@5638 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-22 22:06:14 +00:00
HD Moore d53dd66701 Adds initial support for IPv6, including two stager. Tested Meterpreter over IPv6 stages on XP and Vista. Using this is still tricky, I will add a wiki page tomorrow to explain the ScopeID stuff for link-local testing. This commit also includes the raw (oversized) assembler for the stagers as well as the entire old metasploit assembly set (useful for development).
git-svn-id: file:///home/svn/framework3/trunk@5635 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-22 06:34:57 +00:00
HD Moore 06aa636126 Payload patch from toto
git-svn-id: file:///home/svn/framework3/trunk@5450 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-18 16:01:15 +00:00
HD Moore 6677beb174 Merged revisions 5366-5377 via svnmerge from
svn+ssh://metasploit.com/home/svn/framework3/branches/framework-3.1

........
  r5366 | hdm | 2008-01-26 20:30:53 -0600 (Sat, 26 Jan 2008) | 2 lines
  
  Update version information
........
  r5367 | hdm | 2008-01-26 21:10:57 -0600 (Sat, 26 Jan 2008) | 3 lines
  
  Updated for version 3.1
........
  r5369 | hdm | 2008-01-26 21:13:31 -0600 (Sat, 26 Jan 2008) | 3 lines
  
  Wipe the private directories from the branch. 
........
  r5371 | hdm | 2008-01-27 17:24:24 -0600 (Sun, 27 Jan 2008) | 5 lines
  
  Timeout options added for dcerpc connect and read times. Addition of novell netware as a supported target platform. Inclusion of the serverprotect exploit (still works on the latest version). Addition of the first remote netware kernel exploit that leads to a shell, addition of netware stager and shell, and first draft of the release notes for 3.1
........
  r5372 | hdm | 2008-01-27 17:30:08 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  Formatting, indentation, fixed the static IP embedded in the request
........
  r5373 | hdm | 2008-01-27 20:02:48 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  Correctly trap exploit errors in a way that works with all of the UIs
........
  r5374 | hdm | 2008-01-27 20:23:25 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  More last-minute bug fixes
........
  r5375 | hdm | 2008-01-27 20:37:43 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  Force multi-bind off in netware, correct label display in gtk gui labels
........
  r5376 | hdm | 2008-01-27 20:50:03 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  More exception handling fun
........


git-svn-id: file:///home/svn/framework3/trunk@5378 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-28 03:06:31 +00:00
Matt Miller 7b65a56d65 initial support for metasm integration, ported sample payload to use it
git-svn-id: file:///home/svn/framework3/trunk@5076 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-11 00:37:50 +00:00
Ramon de C Valle f60810d00c Added more advanced payload options and advanced payload options support for Solaris.
git-svn-id: file:///home/svn/framework3/trunk@5060 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-25 03:24:51 +00:00
Ramon de C Valle f3dd74cfc9 Added advanced payload options for *BSD, improved solaris targets of lsa_transnames_heap.rb, some code cleanups.
git-svn-id: file:///home/svn/framework3/trunk@5044 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-11 03:19:28 +00:00
Ramon de C Valle 99f806b0e9 Added OSX payloads advanced options and improved Samba exploit module.
git-svn-id: file:///home/svn/framework3/trunk@5033 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-06 01:22:54 +00:00
Matt Miller d33675d870 framework now properly handles using singles without handlers as both stages and singles, fixes #115
git-svn-id: file:///home/svn/framework3/trunk@4994 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-16 05:04:03 +00:00
HD Moore 40511cffb7 This adds a Linux-payload specific mixin which allows for new advanced options, such as setuid/chroot prepends.
git-svn-id: file:///home/svn/framework3/trunk@4984 4d416f70-5f16-0410-b530-b9f4589650da
2007-06-09 02:25:31 +00:00
Matt Miller df10ee412d typos
git-svn-id: file:///home/svn/framework3/trunk@4349 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 03:16:08 +00:00
Matt Miller fa14510b78 starting integration of kernel-mode payloads
git-svn-id: file:///home/svn/framework3/trunk@4043 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-16 21:40:38 +00:00
Matt Miller c12e3f2992 better implementation
git-svn-id: file:///home/svn/framework3/trunk@4042 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-16 19:04:39 +00:00
Matt Miller 34f388d0e5 added code to support HEX var substitution
git-svn-id: file:///home/svn/framework3/trunk@4041 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-16 18:51:34 +00:00
Matt Miller e7ffef974c fix to make it so there aren't errors with Msf::Payload::Generic
git-svn-id: file:///home/svn/framework3/trunk@3845 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-27 06:56:32 +00:00
Matt Miller 237af88317 update to encoder and exploit classes to support target/exploit specific encoder type/encoder options
git-svn-id: file:///home/svn/incoming/trunk@3315 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-06 02:25:47 +00:00
Matt Miller 5a42b1d86b msfd fixes
git-svn-id: file:///home/svn/incoming/trunk@3150 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-28 20:41:11 +00:00
HD Moore 9340ecdeab IIS exploits ported
Added on_new_session callback and session_created? flag to exploit
Fixed socket fd leak in Comm::Local


git-svn-id: file:///home/svn/incoming/trunk@3135 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-27 18:42:44 +00:00
Matt Miller 96d75dcbb4 support for aborting sockets once a remote, non-find exploit succeeds
git-svn-id: file:///home/svn/incoming/trunk@3082 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-24 18:50:33 +00:00
Matt Miller 0e9c5bab5b logging fix, meterpreter multi-load fixed, advanced option display, meterpreter optino to autoload stdapi
git-svn-id: file:///home/svn/incoming/trunk@3052 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-19 15:09:41 +00:00
Matt Miller fc42fef941 exploits now pass context when creating sockets
git-svn-id: file:///home/svn/incoming/trunk@3034 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-15 21:25:23 +00:00
Matt Miller 5676117bff last of normalized docs from last night
git-svn-id: file:///home/svn/incoming/trunk@3030 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-15 15:11:43 +00:00
Matt Miller b89a92f28f payloads now display multiple stages
git-svn-id: file:///home/svn/incoming/trunk@3025 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-12 05:11:56 +00:00
Matt Miller 6a5870ddcd updated comments to be more uniformed in class definition
git-svn-id: file:///home/svn/incoming/trunk@3004 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-02 16:49:45 +00:00
Matt Miller 81c8cf3104 documentation fixes, code cleanup
git-svn-id: file:///home/svn/incoming/trunk@2973 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-19 03:20:20 +00:00