Commit Graph

133 Commits (580c818748a9d8a220bcc41794c6df617bd1aa04)

Author SHA1 Message Date
James Lee 7ea5f87960 Allow proper ruby types for evasion configuration
At some point in the distant past, the datastore was all strings and the
various option types got parsed out in the appropriate places. Then, in
the somewhat more recent past, the options started getting converted to
regular ruby types (such as TrueClass for a BOOL options, etc) earlier
in their life.  Apparently, that change broke boolean http evasions.
This commit fixes them by ensuring that +true+ is just as acceptable as
"true".

Fixes #6198, thanks Ashish for the report
2012-01-06 20:05:29 -07:00
HD Moore 49ff9f594a Properly enclose IPv6 addresses with brackets inside of the Host header 2011-12-10 13:24:58 -06:00
HD Moore 5fec13a389 Propogate the timeout in send_recv() down to the TCP connect call as well
git-svn-id: file:///home/svn/framework3/trunk@14021 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-21 15:41:37 +00:00
James Lee d50577066f remove some silliness of registering UserAgent as an option since it's already an advanced option for HttpClient, make the default obvious
git-svn-id: file:///home/svn/framework3/trunk@13394 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-28 22:57:47 +00:00
HD Moore 9220506ba2 Merge in recent meterpreter work. These are not the commits you are looking for (more info on what all this is later this week).
git-svn-id: file:///home/svn/framework3/trunk@13053 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-28 21:26:43 +00:00
Tod Beardsley 7b4c7d44db Adds a Burp Session XML parser and importer. Also includes fix to Rex's HTTP header parser to ensure that it uses only unencoded regexes.
git-svn-id: file:///home/svn/framework3/trunk@12846 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 21:17:57 +00:00
HD Moore ecaeac1f6e Only override the server header if the caller didn't already provide one.
git-svn-id: file:///home/svn/framework3/trunk@12709 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 01:51:09 +00:00
James Lee d1e2f274f9 add ability to use arbitrary certs with SSL server sockets.
git-svn-id: file:///home/svn/framework3/trunk@12675 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-20 23:12:35 +00:00
HD Moore c5c4c929b8 Clarify that partial is handled in HTTP
git-svn-id: file:///home/svn/framework3/trunk@12619 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-15 18:23:14 +00:00
HD Moore aa98667a77 Two performance fixes for HTTP Servers. The first reduces latency from 0.25s to near-zero for back-to-back connections by using the Queue class as a notify system. The second switches the slow socket.get for the much faster socket.read
git-svn-id: file:///home/svn/framework3/trunk@12615 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-14 18:34:06 +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
HD Moore 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
Joshua Drake 1e6365ed58 Fixes #3596, Force Rex::Text.gzip to use ASCII-8BIT strings, Reverts r10653
git-svn-id: file:///home/svn/framework3/trunk@11639 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 19:59:56 +00:00
HD Moore e3f909cef9 Fixes for chunked http reply processing, additional cisco configuration support, and a scanner module for unprotected cisco device managers.
git-svn-id: file:///home/svn/framework3/trunk@11287 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 07:37:09 +00:00
HD Moore 5b43ea2c15 Buffer data before sending it to the response parser, handle buffered data on disconnect
git-svn-id: file:///home/svn/framework3/trunk@11286 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-11 06:19:36 +00:00
Joshua Drake 5a01ede38a only assign the original request if a response was returned
git-svn-id: file:///home/svn/framework3/trunk@11193 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-01 16:32:40 +00:00
HD Moore 54f3563c7e Store the http request in the http response object when Rex::HTTP::Client.send_recv() is used. Let Anemone store the request as well, passing it into the Page object for further analysis.
git-svn-id: file:///home/svn/framework3/trunk@11023 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 05:25: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
Joshua Drake 8353bf7bf3 move 100-continue processing into Rex, fixes #3109
git-svn-id: file:///home/svn/framework3/trunk@10919 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-05 16:20:13 +00:00
HD Moore dbbd0dc07e This ensures that even if some wonky string encoding is passed as the body of a HTTP reply, it will be treated as binary. Fixes some of the HTTP Server exploits on Windows
git-svn-id: file:///home/svn/framework3/trunk@10653 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 16:16:39 +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
James Lee eddd6d481d add some documentation for request_cgi
git-svn-id: file:///home/svn/framework3/trunk@10293 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 17:31:26 +00:00
Joshua Drake 8463e026bd read responses until EOF per RFC
git-svn-id: file:///home/svn/framework3/trunk@10045 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 22:41:07 +00:00
Joshua Drake 06dca2addb fix this unit test
git-svn-id: file:///home/svn/framework3/trunk@10044 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 22:36:13 +00:00
Joshua Drake d46d4313e7 reduce verbosity for printed exceptions when processing on_request
git-svn-id: file:///home/svn/framework3/trunk@10029 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-17 22:57:52 +00:00
Joshua Drake 25bc9f2973 add error printing for HttpServer exploits
git-svn-id: file:///home/svn/framework3/trunk@9909 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 23:24:51 +00:00
HD Moore 843b6ffa00 Make the http client try harder
git-svn-id: file:///home/svn/framework3/trunk@9698 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 23:08:28 +00:00
Joshua Drake e32abab8dc a HTTP -> an HTTP (http://www.english-zone.com/grammar/a-anlessn.html)
git-svn-id: file:///home/svn/framework3/trunk@9488 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 16:12:05 +00:00
James Lee 32c24b944a actually increment the loop variable; document the deficiencies of the employed technique
git-svn-id: file:///home/svn/framework3/trunk@9449 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 23:56:35 +00:00
James Lee 7044c65f22 make sure we have a newline in a chunk length before parsing it, tighten up the regex. fixes 2063 (I hope)
git-svn-id: file:///home/svn/framework3/trunk@9448 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 23:43:32 +00:00
Tod Beardsley 1a2be34a63 Fixes #2002. Needed to work with some pipelining to get this all to work right, but it seems to function now pretty well -- if the target takes Basic, do basic, if the target takes NTLM, do NTLM. Should implement Digest too, but I don't think hardly anyone uses that.
git-svn-id: file:///home/svn/framework3/trunk@9346 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-22 17:58:01 +00:00
HD Moore 3c4024a0c6 Expose the server client list, set the keepalive
git-svn-id: file:///home/svn/framework3/trunk@8992 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 06:05:06 +00:00
HD Moore cd71cfbad1 Handle buggy HTTP servers better
git-svn-id: file:///home/svn/framework3/trunk@8921 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 21:35:37 +00:00
HD Moore 89c62bc838 Fixes #1079. Handle a closed SSL socket gracefully
git-svn-id: file:///home/svn/framework3/trunk@8783 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 14:13:53 +00:00
James Lee 7d348c3593 honor the SSL option in HttpServer, fixes #1001
git-svn-id: file:///home/svn/framework3/trunk@8699 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 18:47:04 +00:00
HD Moore a753666073 Switch sysread back to get_once(). This reverts a previous change, but the sysread breaks SSL support
git-svn-id: file:///home/svn/framework3/trunk@8124 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 21:40:30 +00:00
HD Moore 4c6fd97b0e Handles some broken TCP stack implementations better (but not perfectly)
git-svn-id: file:///home/svn/framework3/trunk@7991 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-27 07:02:55 +00:00
HD Moore a16feb01bc Minor tweaks to http processing
git-svn-id: file:///home/svn/framework3/trunk@7805 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 18:12:38 +00:00
HD Moore 5ef9a1c040 Wipe the headers before reparsing
git-svn-id: file:///home/svn/framework3/trunk@7801 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 17:04:52 +00:00
HD Moore 006d5d51fc Fixes #674 by adding 100-continue support
git-svn-id: file:///home/svn/framework3/trunk@7799 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 16:54:27 +00:00
James Lee 7427640fb0 don't wait for a message body that will never come. fixes 659
git-svn-id: file:///home/svn/framework3/trunk@7748 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 02:26:37 +00:00
James Lee 5182d1c927 allow the Connection header to specify keep-alive in a less strict manner. this is more rfc2616 compliant and fixes #601
git-svn-id: file:///home/svn/framework3/trunk@7677 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 07:40:37 +00:00
HD Moore fc983ef7e3 Many bug fixes to db_autopwn, cross-referencing of OS-level vulnerabilities, small bug fixes to HTTP client API
git-svn-id: file:///home/svn/framework3/trunk@7676 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 01:36:17 +00:00
HD Moore ed7b7ac6f0 Fixes #491 and fixes #543 by updating the HTTP stack and validating configuration options
git-svn-id: file:///home/svn/framework3/trunk@7652 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 21:15:06 +00:00
HD Moore 8cadfe66cf Mostly cosmetic
git-svn-id: file:///home/svn/framework3/trunk@7530 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 15:16:08 +00:00
James Lee 78c88c888f don't backtrace just because the client cancelled
git-svn-id: file:///home/svn/framework3/trunk@7453 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 19:38:18 +00:00
HD Moore 83fece42fe Handle HTTP failures more gracefully
git-svn-id: file:///home/svn/framework3/trunk@7335 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 18:10:09 +00:00
HD Moore 075b8c5fa4 Fixes #434. Always use Timeout.timeout() -- on Ruby 1.9 this results in the Timeout::TimeoutError exception vs RuntimeError
git-svn-id: file:///home/svn/framework3/trunk@7323 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 18:14:57 +00:00
HD Moore 5e137e92fd Fixes #381. To scan for TLSv1 only services, set SSLVersion TLS1
git-svn-id: file:///home/svn/framework3/trunk@7282 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 19:48:15 +00:00