Commit Graph

92 Commits (611b8a1b6d8a90779d1bfa9e844a4256dd53d14c)

Author SHA1 Message Date
David Maloney 97d08a081a
reverting port 0 behaviour in portspec
a change was made to protspec that allowed port 0
when we explicitly dissallowed port 0. This change caused
other code that depended on this behaviour to break
2014-06-25 13:07:22 -05:00
Lutz Wolf fc5436417b Simplification 2014-05-24 23:45:21 +02:00
Lutz Wolf 4fc6e402dc Allow port 0 2014-05-24 23:44:50 +02:00
Lutz Wolf 66252ba9e5 support negation in portspec 2014-05-08 21:35:35 +02:00
James Lee ba252ec0c3
Use 'unless' instead of 'if not' 2014-01-09 16:01:58 -06:00
James Lee 7cb6836209
Replace unused var with purpose-revealing comment 2014-01-09 15:07:04 -06:00
James Lee 27133257a4 Better docs, more accurate var names 2014-01-09 15:05:19 -06:00
James Lee 1519af33f5
Refactor `getaddress` in terms of `getaddresses` 2014-01-09 11:03:24 -06:00
James Lee 01f350964f
Add specs for some stuff in Rex::Socket 2014-01-09 10:19:19 -06:00
Tab Assassin 7e5e0f7fc8 Retab lib 2013-08-30 16:28:33 -05:00
James Lee c3fa62cd59 Whitespace at EOL 2013-03-07 18:16:57 -06:00
HD Moore 0d6acad1a0 Updates for PR #981 (cleanup) 2012-11-02 15:47:52 -05:00
HD Moore d656e3185f Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
James Lee fb1bf0b356 Work around a bug in rubinius 2012-05-31 16:48:34 -06:00
James Lee 916f23fe4e Add IPv6 support for bit2netmask 2012-03-16 01:50:26 -06:00
James Lee 6b9a21936e Whitespace at EOL 2012-03-06 14:14:02 -07:00
HD Moore 2c538fe9c0 Rework RangeWalker and some of the socket API to fix bugs and generally
handle ranges the right way
2011-12-10 20:10:10 -06:00
HD Moore dee053cd71 Try multiple scopes for link-local addresses, if necessary. Fix a small
typo
2011-12-10 15:24:10 -06:00
HD Moore e46745b761 Add support for link-local scopes 2011-12-10 13:24:58 -06:00
HD Moore 1cc68d1ed5 Accept IPv6 addresses in getaddress() responses 2011-12-10 13:24:58 -06:00
HD Moore 4344a5f92a Fix up IPv6 resolution in DNS replies 2011-12-05 13:07:37 -06:00
HD Moore bcebdb1893 Improve IPv6 handling 2011-12-05 13:07:37 -06:00
HD Moore 825c9f776c Fixes #5980 by correcting the address match for IPv6. Clean up regex mapping in general 2011-11-16 14:35:23 -06:00
HD Moore 292aae8ab5 This small patch causes any input to RangeWalker that contains a host name to expand to all A records returned for that name. This allows RHOSTS to be set to a dns name that returns multiple addresses and for all addresses corresponding to the name to be tested.
git-svn-id: file:///home/svn/framework3/trunk@13837 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-09 01:07:51 +00:00
James Lee b3e96add60 fix whitespace at eol
git-svn-id: file:///home/svn/framework3/trunk@13795 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-26 17:42:07 +00: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 05f107f466 Fixes #4371, Converts many uses of require to autoload
git-svn-id: file:///home/svn/framework3/trunk@12554 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:47:10 +00:00
James Lee 64d160e393 add a method for determining if an address is internal, i.e. within the ranges specified in rfc1918 or rfc5735, and cleanup the unit tests to work on 1.9 and account for various changes to the library that previously didn't get any love in the tests, e.g. r4545.
git-svn-id: file:///home/svn/framework3/trunk@11580 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-15 04:40:21 +00:00
HD Moore 30affd4b2c This commit adds a new set of discovery modules from wuntee and some useful utility methods for working with link-local addresses
git-svn-id: file:///home/svn/framework3/trunk@11417 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-27 16:43:53 +00:00
HD Moore 2bb7528e26 Switch to 8.8.8.8 from 50.50.50.50 now that the 50 block has been allocated. Note that this isn't actually sending data to the target
git-svn-id: file:///home/svn/framework3/trunk@11384 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-20 22:13:49 +00:00
James Lee 185f50212f use TCPServer instead of Socket + bind and work around JRuby's broken Socket#getsockname (see http://jira.codehaus.org/browse/JRUBY-5232)
git-svn-id: file:///home/svn/framework3/trunk@11211 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-02 23:49:02 +00:00
HD Moore a12d9f8dbf This patch adds detailed thread tracking across the metasploit framework, along with a new console command (threads) to manage these. This level of tracking is required to accurately monitor background tasks, assist with debugging, and kill orphaned threads.
git-svn-id: file:///home/svn/framework3/trunk@11003 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 06:19:49 +00:00
HD Moore 182943fe6c This change allows IPv6 addresses to be ignored by passing false as a second parameter to getaddress()
git-svn-id: file:///home/svn/framework3/trunk@10761 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 01:27:00 +00:00
HD Moore 9489c2fa58 Note on thread safety
git-svn-id: file:///home/svn/framework3/trunk@10597 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:55:06 +00:00
HD Moore e2ed2f0d75 Fix a long-standing issue with Resolv.getaddress() being broken on Ruby 1.9.1 Windows
git-svn-id: file:///home/svn/framework3/trunk@10544 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 14:49:19 +00:00
HD Moore 1b4190df38 This commit brings configurability to TCP Servers as to which Comm they use. The ReverseListenerComm and ListenerComm advanced options can be used to prevent a given listener from trying to bind a listener over the pivoted routed. This is useful for a number of situations and not possible to configure explicitly before.
git-svn-id: file:///home/svn/framework3/trunk@10534 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 02:11:22 +00:00
Tod Beardsley 2250a83913 Updates meterpreter autoroute to accept CIDR notation.
git-svn-id: file:///home/svn/framework3/trunk@9667 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-03 01:27:24 +00:00
Tod Beardsley fb273e83a9 Updates autoroute to enforce sensible netmasks. This is serious business.
git-svn-id: file:///home/svn/framework3/trunk@9664 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 18:42:56 +00:00
HD Moore 09dd8c1fcc Adds portlist_to_portspec and portspec_to_portlist. Merges in Qualys XML support from Sertan Kolat
git-svn-id: file:///home/svn/framework3/trunk@8949 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-28 23:02:28 +00:00
Stephen Fewer 6335fde3e1 Commit the Ruby side for the UDP socket pivoting. Change the TCP client channel so the respective StreamAbstraction is responsible for monitoring its own rsock.
git-svn-id: file:///home/svn/framework3/trunk@8431 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-09 16:45:46 +00:00
Stephen Fewer fd2469db24 Commit the Ruby end for TCP server channels, the modified TCP client channels and the support for pivoting a reverse_tcp meterpreter.
git-svn-id: file:///home/svn/framework3/trunk@8384 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-06 17:59:25 +00:00
HD Moore 12ef5437df 1.0.0.0/8 has been allocated, switch to 50.50.50.50
git-svn-id: file:///home/svn/framework3/trunk@8221 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 13:27:19 +00:00
HD Moore 54c10c0c3d Fixes #623 and fixes #622, implements a number of changes to the core channel dispatch code, sets timeouts on unmatched responses, and handles tcp relay writes with a threaded/timeout wrapper to avoid delays.
git-svn-id: file:///home/svn/framework3/trunk@7753 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 18:32:26 +00:00
HD Moore 95f6aa0d02 Revert last commit temporarily
git-svn-id: file:///home/svn/framework3/trunk@6313 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 23:00:17 +00:00
HD Moore aa4274a3bb Upgrading metasm...
git-svn-id: file:///home/svn/framework3/trunk@6312 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 22:58:19 +00:00
kris b012696f1f just use boolean @@support_ipv6 instead of "yes"/"no"
git-svn-id: file:///home/svn/framework3/trunk@6047 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-26 07:11:49 +00:00
kris 0e8ce1cc46 Move my portspec parsing code from scanner/portscan/tcp to Rex as
Socket.portspec_crack and use it to also replace the incomplete
parsing code used for db_autopwn


git-svn-id: file:///home/svn/framework3/trunk@6033 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-20 20:34:05 +00:00
HD Moore 2d498ed3c5 Fixes #149. This doesnt address quite the bug, but solves a case where the DNS server does not reply and the Windows version of ruby acts stupid. The bug mentioned in this ticket is addressed by a newer ruby version.
git-svn-id: file:///home/svn/framework3/trunk@5863 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-09 22:59:21 +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 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