5054840165
Overwrite the local datastore with the normalized option, even if it
...
came from a global datastore due to a fall-through
2012-03-07 07:37:36 -06:00
31dea3844e
Reintroduces chao-mu's OptRegexp
...
Revert "Revert "Merge pull request #101 from chao-mu/master""
[See #101 ]
This reverts commit c5ce575543
2012-01-23 14:21:19 -06:00
c5ce575543
Revert "Merge pull request #101 from chao-mu/master"
...
Reverting the OptRegexp commit from chao-mu. Before committing to
master, this option type needs to be tested on the various mainstream
UI's (Metasploit Pro, msfgui, and Armitage) to see if they behave
as reasonably as msfconsole. Each UI tends to handle option setting,
passing, and display in their own special way.
This should make it back in by Wednesday, assuming all goes well.
[See #101 ]
This reverts commit 84db5a21fc24aaf85a1b
2012-01-17 15:33:47 -06:00
b23b7b8a88
Adds support for a regular expression based Option (RegexpOpt). Also introduced a method to OptBase called display_value which returns the value to be displayed to the user.
2012-01-10 09:22:14 -05:00
e33ca5a7ba
Small typo fix
2011-12-10 13:26:47 -06:00
e3f121929c
Accept IPv6 addresses in the return if getaddress
2011-12-10 13:24:58 -06:00
e7a545c483
spaces at EOL in core stuff
2011-11-20 12:10:08 +11:00
0818a856b6
Some fixups for some new AuthBrute hotness.
...
git-svn-id: file:///home/svn/framework3/trunk@13075 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 06:52:52 +00:00
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
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
6bdf2a4e2b
Proactively wrap each() in other Hash based classes to avoid situations that trigger modification during enumeration
...
git-svn-id: file:///home/svn/framework3/trunk@12479 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 04:59:27 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
c79d200729
Typos
...
git-svn-id: file:///home/svn/framework3/trunk@4784 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-24 13:47:46 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
HD Moore
Tod Beardsley
chao-mu
HD Moore
James Lee
Tod Beardsley
James Lee
Joshua Drake
Ramon de C Valle
Matt Miller
bmc