Commit Graph

51 Commits (d3d920b8103e6f9876514ba23b9891410c3d345e)

Author SHA1 Message Date
HD Moore 376d05f797 Avoid instantiating the module during recalculate 2015-03-12 01:02:37 -05:00
HD Moore d46635ff8b Restore a comment lost in the code churn 2015-03-07 21:25:35 -06:00
HD Moore 853bf1b569 Accidental carry over from stale master 2015-03-07 20:48:22 -06:00
HD Moore 2e49791bef This implements payload size caching, speeding up framework loads 2015-03-07 20:44:19 -06:00
sinn3r 31191bef39 Fix #4865, undef method 'ancestors' in lib/msf/core/payload_set.rb
Fix #4865
2015-03-05 12:49:51 -06:00
Luke Imhoff 0c00c7cc50
Fully-qualifiy Msf::MODULE_TYPES constants
MSP-11126

Fully-qualify `Msf::MODULE_TYPES`, `Msf::MODULE_ANY`,
Msf::MODULE_ENCODER`, `Msf::MODULE_EXPLOIT`, `Msf::MODULE_NOP`,
`Msf::MODULE_AUX`, `Msf::MODULE_PAYLOAD`, `Msf::MODULE_POST` so that
their usage isn't dependent on nested lexical scoping.
2014-10-17 12:43:40 -05:00
Tab Assassin 7e5e0f7fc8 Retab lib 2013-08-30 16:28:33 -05:00
Luke Imhoff 2b70ec2e08 Payload compatible cache_in_memory
[#47720609]

Msf::PayloadSet#add_module does NOT return an annotated module class as
Msf::ModuleSet#add_module does because a payload module is defined as a
ruby Module instead of a ruby Class.   Since add_module doesn't always
return an annotated_class, the logic in
Msf::ModuleManager#on_module_load needed to change to NOT use
annotated_class and create #add_module as return [void].  Thus, it is
necessary to pass in all the metasploit module metadata to
Msf::ModuleManager#cache_in_memory instead of assuming they can be
derived from the (payload) Module or (other) Class.
2013-05-22 16:06:02 -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
James Lee f4476cb1b7 Really fix payload recalculation
Instead of deleting all non-symbolics before the re-adding phase of
PayloadSet#recalculate, store a list of old module names, populate a
list of new ones during the re-adding phase, and finally remove any
non-symbolic module that was in the old list but wasn't in the new list.

Also includes a minor refactoring to make ModuleManager its own thing
instead of being an awkard subclass of ModuleSet. Now PayloadSet doesn't
need to know about the existence of framework.modules, which makes the
separation a little more natural.

[FixRM #7037]
2012-12-03 22:23:40 -06:00
HD Moore 0230ef60f6 Cosmetic 2012-07-15 15:46:54 -05:00
HD Moore d6c6a3d0c5 Correct an issue with payload recalc during iteration 2012-07-15 15:45:25 -05:00
HD Moore d656e3185f Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
HD Moore 8425c8438d Switch to a MDM/SQL-based module cache 2012-06-16 14:51:09 -05:00
James Lee 63934c34ec check for a ancestors instead of a straight comparison of classes when matching payloads for generics, fixes #3477
git-svn-id: file:///home/svn/framework3/trunk@11585 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 17:15:43 +00:00
HD Moore b460843929 Fixes #574. Uses compatible_payloads as the initial list for finding a match
git-svn-id: file:///home/svn/framework3/trunk@7604 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 02:24:41 +00:00
HD Moore d09d151f31 Disable stager + single chaining, it causes confusion and often breaks.
git-svn-id: file:///home/svn/framework3/trunk@7400 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-07 22:13:04 +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 bf935736b6 fix flushing to account for suffix
git-svn-id: file:///home/svn/framework3/trunk@5078 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-13 01:32:32 +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
Matt Miller ea06abe5bb support for generic payloads
git-svn-id: file:///home/svn/framework3/trunk@3843 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-26 02:13:25 +00:00
Matt Miller e22b38ee8c one other change
git-svn-id: file:///home/svn/incoming/trunk@3555 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-07 07:07:00 +00:00
Matt Miller 8b4ddab401 fix for module caching issues with rexploit
git-svn-id: file:///home/svn/incoming/trunk@3554 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-07 07:05:41 +00:00
Matt Miller 3a37749de6 support for demand-loading of modules to improve load speed, expect problems
git-svn-id: file:///home/svn/incoming/trunk@3534 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-21 03:10:58 +00:00
bmc 553144418a * two tiny optimizations:
* Platform is far more frequently the reason for skipping, so make that first.
  * compact!, the builtin for deleting nil entries in an array


git-svn-id: file:///home/svn/incoming/trunk@3532 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-19 04:09:18 +00:00
Matt Miller be449c54a5 stagers stat works
git-svn-id: file:///home/svn/incoming/trunk@3183 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-06 19:37:59 +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 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 1c3fc58349 updated logging levels and defined guidelines
git-svn-id: file:///home/svn/incoming/trunk@3002 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-02 00:27:59 +00:00
Matt Miller 712f7ef776 more docs
git-svn-id: file:///home/svn/incoming/trunk@2974 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-19 03:37:22 +00:00
Matt Miller b06a2ca030 initial support for compat filtering, may be buggy
git-svn-id: file:///home/svn/incoming/trunk@2971 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-19 01:48:10 +00:00
Matt Miller 7cdf02d8da support for module reloading
git-svn-id: file:///home/svn/incoming/trunk@2956 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-10 00:30:14 +00:00
Matt Miller 17a596186e added the concept of payload convention
git-svn-id: file:///home/svn/incoming/trunk@2925 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-01 06:09:46 +00:00
Matt Miller 203f185ad7 rockin 32 windows payloads, fixed some bugs, other cool shit, OptInt, what what what
git-svn-id: file:///home/svn/incoming/trunk@2796 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 23:32:34 +00:00
Matt Miller 11724ac797 fixed stager merging, made things a bit more pimply
git-svn-id: file:///home/svn/incoming/trunk@2774 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-17 06:01:11 +00:00
Matt Miller f1691c5470 worked on payload encoding, exploit driver wrapper, platforms updates, spoon would probably hate it
git-svn-id: file:///home/svn/incoming/trunk@2744 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-13 18:06:12 +00:00
Matt Miller 41b656d45e commenting
git-svn-id: file:///home/svn/incoming/trunk@2738 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-12 14:32:44 +00:00
Matt Miller 5342128907 some readline stuff, tab completion, add spoon's hashed payload stuff
git-svn-id: file:///home/svn/incoming/trunk@2736 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-12 05:39:44 +00:00
Matt Miller 4c1129a962 reverse include, weird, don't get it yet
git-svn-id: file:///home/svn/incoming/trunk@2735 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 23:10:48 +00:00
Matt Miller 9e48b1393e changed payload names around so little spoony can get his way
git-svn-id: file:///home/svn/incoming/trunk@2734 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 22:51:25 +00:00
Matt Miller 521dd0194b spoonfu rocking the non-eval
git-svn-id: file:///home/svn/incoming/trunk@2732 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 20:48:13 +00:00
Matt Miller 2d66aeaeaf removing opts
git-svn-id: file:///home/svn/incoming/trunk@2731 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 20:32:56 +00:00
Matt Miller 1237b31617 win32 add user, need a way to hide options
git-svn-id: file:///home/svn/incoming/trunk@2722 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 05:15:30 +00:00
Matt Miller 1be7b9337e implemented a single payload for grins, spoon will hate it
git-svn-id: file:///home/svn/incoming/trunk@2721 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 04:24:11 +00:00
Matt Miller f1aba8e7ba introducing handlers to the mix
git-svn-id: file:///home/svn/incoming/trunk@2719 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 04:07:52 +00:00
Matt Miller 8dc1128b3c more cool shit
git-svn-id: file:///home/svn/incoming/trunk@2711 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 19:21:40 +00:00
Matt Miller 62c50e6b04 yea, stuff
git-svn-id: file:///home/svn/incoming/trunk@2701 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 04:56:33 +00:00
Matt Miller bbcc7d3abf made merging of info better
git-svn-id: file:///home/svn/incoming/trunk@2699 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 00:16:48 +00:00
Spoon M 7bbae355d6 mass require moving of /lib
git-svn-id: file:///home/svn/incoming/trunk@2690 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-09 21:18:49 +00:00
Matt Miller 21f440028c stuff
git-svn-id: file:///home/svn/incoming/trunk@2683 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-09 19:35:29 +00:00