Commit Graph

67 Commits (d079cf8ca5132d8c66de1cc77c263c3c2b59f470)

Author SHA1 Message Date
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
HD Moore a4af2d9d93 Fix socket, change requires in dns
git-svn-id: file:///home/svn/framework3/trunk@5575 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 17:39:02 +00:00
HD Moore a52530f647 Raw IP socket support for Rex. Guess what this is for :-)
git-svn-id: file:///home/svn/framework3/trunk@5565 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-22 19:03:59 +00:00
HD Moore 4415d0370f Stop leaking file descriptors when source_address() is called
git-svn-id: file:///home/svn/framework3/trunk@5561 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-21 03:32:51 +00:00
HD Moore 288d82c8f6 cidr_crack() now detects v6 addresses better
git-svn-id: file:///home/svn/framework3/trunk@4828 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-01 04:54:18 +00:00
HD Moore a36a740cf0 Minor fix for IPv6 support
git-svn-id: file:///home/svn/framework3/trunk@4826 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-01 04:47:53 +00:00
HD Moore bf56c136ee Catch even more generic errors
git-svn-id: file:///home/svn/framework3/trunk@4816 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-30 00:13:26 +00:00
HD Moore abb0ac92d9 This adds a secondary check to see if the OS actually supports IPv6 sockets
git-svn-id: file:///home/svn/framework3/trunk@4815 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-30 00:11:49 +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 8c631e7063 Switches the socket class to use pack_sockaddr_in(). Fixes #58
git-svn-id: file:///home/svn/framework3/trunk@4545 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-22 22:15:26 +00:00
HD Moore 6df557c8a7 Support for bidirectional pipe on windows uses a hacked up socket_pair()
git-svn-id: file:///home/svn/framework3/trunk@4291 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-21 20:21:58 +00:00
Matt Miller d8b2f95178 auto load stdapi before interact, implement type? interface
git-svn-id: file:///home/svn/framework3/trunk@3833 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-15 04:07:25 +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 8006479e6b Fix for OS X socket bugs
git-svn-id: file:///home/svn/framework3/trunk@3796 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-31 19:22:21 +00:00
HD Moore 2b603db2bb Merge from side branch to fix a bug
git-svn-id: file:///home/svn/framework3/trunk@3732 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-27 23:00:49 +00:00
HD Moore c6436b501a IPv6 needed this fix as well
git-svn-id: file:///home/svn/incoming/trunk@3673 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-16 03:56:08 +00:00
Matt Miller 3e37b5993f fix unpack in from_sockaddr
git-svn-id: file:///home/svn/incoming/trunk@3672 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-16 03:11:53 +00:00
Matt Miller 4f21fc4709 fix for pack crap
git-svn-id: file:///home/svn/incoming/trunk@3671 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-16 03:03:40 +00:00
bmc 3c2a871399 * fix dotted_ip? to be more strict
git-svn-id: file:///home/svn/incoming/trunk@3670 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-15 22:41:57 +00:00
Matt Miller 54540f7eb7 fix regex
git-svn-id: file:///home/svn/incoming/trunk@3668 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-15 21:17:05 +00:00
Matt Miller e312f588a2 delay issue on win32 fixed by wrapping socket calls
git-svn-id: file:///home/svn/incoming/trunk@3667 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-15 20:53:20 +00:00
HD Moore 989fb37f33 Woops, forgot to keep it compatible with ipv4 :/
git-svn-id: file:///home/svn/incoming/trunk@3657 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-08 21:09:00 +00:00
HD Moore ebf46cf535 Fixes for IPv6 compatibility
git-svn-id: file:///home/svn/incoming/trunk@3656 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-08 21:02:58 +00:00
HD Moore f4c07e8a54 Catch an exception thrown if no default route exists
git-svn-id: file:///home/svn/incoming/trunk@3480 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-30 21:57:24 +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
HD Moore 2f0b44adf6 Tab completion is about 90% done :-)
git-svn-id: file:///home/svn/incoming/trunk@3062 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-24 00:08:09 +00:00