Commit Graph

48 Commits (255e792ed3cbaca95c7c3a3d6adf40eaf509673f)

Author SHA1 Message Date
sinn3r 45bb336c51 Loop do it 2014-01-26 16:27:36 -06:00
sinn3r eec01e79ff No explicit "return" 2014-01-26 16:25:30 -06:00
sinn3r 2d12c0a368 NoMethod check and stuff 2014-01-25 20:25:01 -06:00
sinn3r 93fa58ed45 aux scanner support 2014-01-24 17:54:40 -06:00
Tab Assassin 7e5e0f7fc8 Retab lib 2013-08-30 16:28:33 -05:00
HD Moore d656e3185f Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
David Maloney 67c7971bdf Addresses a race condition with checking a scanner's status before it's run method has executed. 2012-03-08 13:07:03 -06:00
David Maloney 9d343ea1c1 Fix to dividie by zero issue in scannenr progress method 2012-03-08 11:03:33 -06:00
James Lee 79c2264263 more spaces at EOL and bad tabs 2011-11-20 12:05:14 +11:00
HD Moore c504d295b2 Rescue EOFErrors by default as well (handle corner cases across a swath of modules)
git-svn-id: file:///home/svn/framework3/trunk@14200 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-09 06:10:10 +00: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
HD Moore 07fb337ad9 Fix the actual thread cap
git-svn-id: file:///home/svn/framework3/trunk@12378 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 17:56:38 +00:00
et baab86fc52 WMAP 1.0 and first pass on some modules
git-svn-id: file:///home/svn/framework3/trunk@11709 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 05:57:26 +00:00
Tod Beardsley fb79d97bca Allow for things external to a scanner module to come in an kill all the threads with the mod.seppuko!() method.
git-svn-id: file:///home/svn/framework3/trunk@11117 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-24 00:08:39 +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 42da9e899a Improvements to the cleanup process, close sockets properly for exploits and auxiliary
git-svn-id: file:///home/svn/framework3/trunk@9187 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-01 16:26:24 +00:00
HD Moore af10ee5e57 Handle timeout errors more gracefully
git-svn-id: file:///home/svn/framework3/trunk@9023 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-06 02:05:50 +00:00
HD Moore 4625e9b363 Catch Meterpreter-timeout errors for pivoted scanners
git-svn-id: file:///home/svn/framework3/trunk@8893 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 12:09:32 +00:00
HD Moore a55dfa1bbc Adds scanner_progress for granular percentage
git-svn-id: file:///home/svn/framework3/trunk@8120 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:20:32 +00:00
HD Moore a9ec7c8b21 Ignore proxy errors during scanning
git-svn-id: file:///home/svn/framework3/trunk@7962 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 15:29:22 +00:00
HD Moore 75c90b8ef9 Handle Errno::EINTR gracefully
git-svn-id: file:///home/svn/framework3/trunk@7796 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 06:13:14 +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 4b9a54a2f6 Fixes #529 by correcting the variable name
git-svn-id: file:///home/svn/framework3/trunk@7555 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 12:45:34 +00:00
James Lee 80ee6157ed fix a few warnings
git-svn-id: file:///home/svn/framework3/trunk@7492 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 20:28:36 +00:00
HD Moore 6da0013b91 See #378. Additional fix for batch mode
git-svn-id: file:///home/svn/framework3/trunk@7264 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 03:54:44 +00:00
HD Moore 8328bf654b Fixes #358. Adds progress reporting at 10% intervals (min granularity is thread count)
git-svn-id: file:///home/svn/framework3/trunk@7263 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 03:49:07 +00:00
HD Moore 4d4c0905ef Slightly improved error handling for auxiliary and exploit modules. Improved brute forcing mode for mssql_login. Serious errors (broken code, etc) are bubbled up in auxiliary scanners now. Fixes #384 by reading wordlists one line at a time and not buffering
git-svn-id: file:///home/svn/framework3/trunk@7185 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-18 18:03:02 +00:00
kris 8d6e48bc0b Revamp the THREADS handling for aux run_host() and run_batch(). THREADS is
supposed to be the number of concurrent threads; however, what's been happening
is just the firing off of THREADS threads and then simply waiting for them all
to finish before doing another round.

Now it tries to keep new threads coming when possible.  It's not exactly smart,
but should usually beat the previous method (when using multiple threads) and
should never be any worse.

Here's the relevant code comment:

# Assume that the oldest thread will be one of the
# first to finish and wait for it.  After that's
# done, remove any finished threads from the list
# and continue on.  This will open up at least one
# spot for a new thread



git-svn-id: file:///home/svn/framework3/trunk@6809 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-16 02:27:18 +00:00
kris 4b9785e1b7 Fix aux run_batch() handling when using multiple threads: it would often pass
modules a duplicate or even empty batch array.


git-svn-id: file:///home/svn/framework3/trunk@6808 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-16 00:20:54 +00:00
HD Moore e6e8a42090 Enforce maximum thread count on windows platforms
git-svn-id: file:///home/svn/framework3/trunk@6672 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-19 21:46:40 +00:00
HD Moore 6a76e5d0a2 One of potentially many threading issues with ruby 1.9
git-svn-id: file:///home/svn/framework3/trunk@6590 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-29 03:18:00 +00:00
James Lee 99afc981d2 log a useful error message
git-svn-id: file:///home/svn/framework3/trunk@6573 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-21 23:37:07 +00:00
Ramon de C Valle a044ac4661 Do not print backtrace when handling Exception.
git-svn-id: file:///home/svn/framework3/trunk@6544 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-11 17:51:02 +00:00
kris 9bcc3b3167 update aux scanner error message
git-svn-id: file:///home/svn/framework3/trunk@6473 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-10 04:05:05 +00:00
HD Moore 2552633f9b Fix up batch mode aux scanners that dont use the tcp mixin. Minor changes to snmp_scan
git-svn-id: file:///home/svn/framework3/trunk@6422 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 03:11:56 +00:00
HD Moore 26b9903b0d Changes Auxiliary::Scanner to use a new module instance for each thread, updates associated mixins and modules to support this change.
git-svn-id: file:///home/svn/framework3/trunk@6401 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 05:49:33 +00:00
kris 679fa424b1 add a colon to error message for clarity
git-svn-id: file:///home/svn/framework3/trunk@6175 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-23 18:37:48 +00:00
kris 248f1e9fc3 Remove "#{xxx.to_s}" redundancies ('s/\(#{[^}]*\)\.to_s}/\1}/g')
git-svn-id: file:///home/svn/framework3/trunk@6022 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 07:11:08 +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 02780a1d88 Improvements to the FTP mixin and scanner, still needs multiline read support
git-svn-id: file:///home/svn/framework3/trunk@5715 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-04 21:42:37 +00:00
HD Moore ee4fbac2bf Log error message by IP address
git-svn-id: file:///home/svn/framework3/trunk@5348 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-25 04:53:15 +00:00
HD Moore a9ca5d1ace More GUI work. Changed the location where module exceptions are reported
git-svn-id: file:///home/svn/framework3/trunk@5335 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-24 05:29:35 +00:00
HD Moore 94c81d866c Fix is a cpu loop bug in batch-mode scanner modules. This was apparent when using a RHOSTS set of 256 hosts but a THREADS count of > 1 with the UDP sweep module
git-svn-id: file:///home/svn/framework3/trunk@5227 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-29 17:16:22 +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 feac78350f Break on ^c
git-svn-id: file:///home/svn/framework3/trunk@4174 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-10 06:04:51 +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