Commit Graph

59 Commits (7ef79e3ca5d16ad62c50dec700c85bf0434a8570)

Author SHA1 Message Date
Tod Beardsley 1c58943edd Backing out r11616 since OptFloat will surely cause problems with RPC. Nothing to see here. Verified that all OptInt options are now actually Ints and not Floats with a grep -r "OptInt" trunk | grep "[0-9]\.[0-9]"
git-svn-id: file:///home/svn/framework3/trunk@11648 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 15:29:26 +00:00
Tod Beardsley 63f893dd90 Adds an OptFloat option class, for when people actually want floats and not integers.
git-svn-id: file:///home/svn/framework3/trunk@11616 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 17:21:42 +00:00
James Lee f0cc6ff596 big commit for converting meterpreter scripts to modules, see #3377. also fixes payload tab-completion and 'show payloads' after TARGET has changed
git-svn-id: file:///home/svn/framework3/trunk@11421 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 17:46:42 +00:00
Joshua Drake fe9710b836 add a rand: special case for OptAddress options
git-svn-id: file:///home/svn/framework3/trunk@11071 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 18:31:14 +00:00
HD Moore cf70f322d0 This minor syntax change allows rubinius to at least start the console
git-svn-id: file:///home/svn/framework3/trunk@10921 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-05 21:16:33 +00:00
James Lee f1c7fc79de remove to_s methods that reference a non-existent attribute. fixes .inspect on instances of Opt*. I have no idea how this bug never showed up before
git-svn-id: file:///home/svn/framework3/trunk@9649 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 21:52:30 +00:00
Joshua Drake 7039bc3461 change "local port" to "listen port", see #2005
git-svn-id: file:///home/svn/framework3/trunk@9395 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-02 16:23:46 +00:00
James Lee 5952e29040 modify address range specification (for e.g. RHOSTS) to use nmap notation, fixes #182
git-svn-id: file:///home/svn/framework3/trunk@7705 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:37:14 +00:00
HD Moore 9b1935eb2a Fixes #522. Allow RHOSTS to contain hostnames with dashes
git-svn-id: file:///home/svn/framework3/trunk@7547 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 23:20:59 +00:00
HD Moore 737dc327a3 Fixes #435. Resolves a long-standing issue where datastore entries with a default of 'false' were being ignored.
git-svn-id: file:///home/svn/framework3/trunk@7334 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 18:09:05 +00:00
HD Moore 526012462e Fix IPv6 targets
git-svn-id: file:///home/svn/framework3/trunk@6233 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-17 21:10:02 +00:00
HD Moore f1789fc1b2 Adds the check() method and scanner module to ms08-067, massively upgrades the smb/version scanner, with better SP detection and remote language pack detection.
git-svn-id: file:///home/svn/framework3/trunk@5823 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-03 09:17:08 +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
HD Moore 37d9c3db1d Corrects an issue where a scope ID is passed to IPv4 addresses, cleans up the parsing.
git-svn-id: file:///home/svn/framework3/trunk@5687 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 05:39:06 +00:00
HD Moore 1fa95d6050 This patch adds support for IPv6 scope_ids to AddressRange parameters. Ranges consisting of a single address are not expanded
git-svn-id: file:///home/svn/framework3/trunk@5640 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-23 07:05:38 +00:00
HD Moore b21fb10f75 Fixes #120. Applies a one-line patch from egypt[at]nmt.edu
git-svn-id: file:///home/svn/framework3/trunk@5053 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-16 13:52:11 +00:00
HD Moore 83a8ece022 This patch adds IPv6 support to most feartures of the framework. The major missing component is IPv6-enabled payloads.
git-svn-id: file:///home/svn/framework3/trunk@4814 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-29 23:43:39 +00:00
HD Moore c79d200729 Typos
git-svn-id: file:///home/svn/framework3/trunk@4784 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-24 13:47:46 +00:00
HD Moore 1cfa033ad9 Woops, Raw and String should not mangle their params
git-svn-id: file:///home/svn/framework3/trunk@4778 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-24 06:37:23 +00:00
HD Moore 4d1c274387 Merging all of the auxilliary/scanner related features
git-svn-id: file:///home/svn/framework3/trunk@4749 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-24 06:27:39 +00:00
HD Moore 4d3a91f63b Add support for hexadecimal values for OptInt options
git-svn-id: file:///home/svn/framework3/trunk@4652 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-05 05:00:55 +00:00
Matt Miller c61e0e8931 change the behavior of nil non-required options, fixes #49
git-svn-id: file:///home/svn/framework3/trunk@4509 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-09 06:12:28 +00:00
HD Moore 1d1f55f9e9 Added CHOST/CPORT as advanced options. Split out uncommon SMB options as advanced
git-svn-id: file:///home/svn/framework3/trunk@4429 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 07:02:47 +00:00
HD Moore 845f80af59 Bug fix to AddressRange option
Reworked TCP/UDP exploit mixins to allow the source of rhost/rport/etc to be overloaded
Reworked Scanner mixin to deregister RHOST and overflow self.rhost



git-svn-id: file:///home/svn/framework3/trunk@3823 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-12 23:08:20 +00:00
HD Moore c5542fd347 Major reworking of the recon stuff, there is a new mixin called Auxiliary::Scanner that
supports per-range, per-host, and per-batch requests. The reporting stuff has been moved
into a new mixin for it. The old recon stuff was pulled out and sample modules for the
scanner mixin were added. Almost time to re-import skape's old recon foo using Scanner :-)




git-svn-id: file:///home/svn/framework3/trunk@3820 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-12 08:31:38 +00:00
HD Moore b4ad4a5d75 Tabs vs Spaces
git-svn-id: file:///home/svn/incoming/trunk@3453 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 05:33:08 +00:00
bmc 7f9baa9744 * update OptEnum so that desc displays the valid options, less duplication of data
* add OptEnum to the test suite


git-svn-id: file:///home/svn/incoming/trunk@3442 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-25 19:15:09 +00:00
HD Moore de9452dc34 Enum fix
git-svn-id: file:///home/svn/incoming/trunk@3396 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-16 23:32:51 +00:00
HD Moore 374f7f0c11 Added Enum
git-svn-id: file:///home/svn/incoming/trunk@3395 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-16 23:30:59 +00:00
HD Moore d0c8775f56 Adds a new 'evasion' option type
git-svn-id: file:///home/svn/incoming/trunk@3309 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-05 03:57:12 +00:00
Matt Miller 2baa7687fe only user-defined options are saved now
git-svn-id: file:///home/svn/incoming/trunk@3249 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-21 02:51:23 +00:00
HD Moore 7a26ec55bf Proxy chaining patch from bmc
git-svn-id: file:///home/svn/incoming/trunk@3244 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-18 02:19:21 +00:00
Matt Miller 32c471498a more msfweb action
git-svn-id: file:///home/svn/incoming/trunk@3089 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-24 20:41:56 +00:00
Matt Miller cbbce06ee0 fix for multiple exploit
git-svn-id: file:///home/svn/incoming/trunk@3046 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-18 00:26:19 +00:00
Matt Miller 07328a0841 partial fix
git-svn-id: file:///home/svn/incoming/trunk@3045 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-17 23:03:53 +00:00
HD Moore 3150bd2f3a SMB mixin is mostly working now
git-svn-id: file:///home/svn/incoming/trunk@3037 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-15 23:02:17 +00:00
Matt Miller 510669e7ef option normalization
git-svn-id: file:///home/svn/incoming/trunk@3035 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-15 21:50:10 +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 05a84cc7da bug fixes in x86 asm, jmp call additive, payload generation, and new exploit
git-svn-id: file:///home/svn/incoming/trunk@3021 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-11 01:22:03 +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 501d7da9f9 aim goaway exploit ported, fixed a few bugs in sled gen
git-svn-id: file:///home/svn/incoming/trunk@2888 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-24 19:17:07 +00:00
HD Moore 66ae46394a Typo fix
git-svn-id: file:///home/svn/incoming/trunk@2848 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-15 07:16:03 +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 97ec0cf7d8 fixed port regex
git-svn-id: file:///home/svn/incoming/trunk@2777 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-17 08:03:54 +00:00
Matt Miller d62566a68f lots of changes, making the simple wrapper better, lots of improvements
git-svn-id: file:///home/svn/incoming/trunk@2750 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-14 06:34:58 +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 0e357337a5 started working on exploit stuff, changed aliases a bit for windows payloads, pimped targets to the max, added wrappers to exploit for payload stuff
git-svn-id: file:///home/svn/incoming/trunk@2729 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 15:34:31 +00:00
Matt Miller 543dce4684 added option deregistration, kinda lame, need to think of a better way
git-svn-id: file:///home/svn/incoming/trunk@2723 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 05:21:19 +00:00
Matt Miller 5d6c67ee69 started working on handlers
git-svn-id: file:///home/svn/incoming/trunk@2718 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 02:03:48 +00:00
Matt Miller ddb75822ad dump dump dump
git-svn-id: file:///home/svn/incoming/trunk@2700 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 00:49:12 +00:00