Commit Graph

7781 Commits (f3f7b1dc83f10a1ec0368e424c78db159e0a8b43)

Author SHA1 Message Date
Joshua Drake 9c54152d81 fail on errors
git-svn-id: file:///home/svn/framework3/trunk@10602 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 17:27:02 +00:00
James Lee 988bbd13f1 associate clients with a campaign
git-svn-id: file:///home/svn/framework3/trunk@10601 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 17:20:57 +00:00
Joshua Drake 7f9fe3b527 bring metasm to tip
git-svn-id: file:///home/svn/framework3/trunk@10600 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 16:01:37 +00:00
HD Moore d8b9cf5cac Slight speed improvement to request processing
git-svn-id: file:///home/svn/framework3/trunk@10599 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 06:14:44 +00:00
HD Moore 41183d3395 Bump the packet queue timeout as well (10 minutes), which should handle even the worst lag
git-svn-id: file:///home/svn/framework3/trunk@10598 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 05:00:03 +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 9e01b0f4e5 Fix a race condition in concurrent session handling
git-svn-id: file:///home/svn/framework3/trunk@10596 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:46:53 +00:00
HD Moore 2e9138ebbc This commit overhauls much of the meterpreter timeouts and staging processes. This fixes a bug with concurrent session handling, reduces CPU load by caching a single SSL certificate for all sessions, increases all of the critical timeouts, and generally makes mass ownage work better. We still need to limit the maximum number of concurrent on_session() threads to something sane to prevent sesssion spikes from dragging out the process even longer. The C-side meterpreter change is minimal and will only help with future compatibility if we move to non-blocking fd's for the SSL socket.
git-svn-id: file:///home/svn/framework3/trunk@10595 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:11:47 +00:00
HD Moore e4a00b2fd1 Handle a larger backlog
git-svn-id: file:///home/svn/framework3/trunk@10594 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 03:20:09 +00:00
Tod Beardsley c2938323cc Pretty much the same deal as r10592, but for SSH, which sometimes has similiar RST problems.
git-svn-id: file:///home/svn/framework3/trunk@10593 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 02:11:06 +00:00
Tod Beardsley df48b11093 Makes telnet_login a more resistant to intermittant RSTs. If a machine gives us a reset, try again with a backoff. Only after 3 retries should we give up entirely. You'd be amazed how many devices this is required for.
git-svn-id: file:///home/svn/framework3/trunk@10592 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 01:54:56 +00:00
HD Moore 04276d333a Add category, confidence, description, and blame to the web_vulns table.
git-svn-id: file:///home/svn/framework3/trunk@10591 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 01:51:28 +00:00
Tod Beardsley b5fe64aca2 This works around a blocking problem encountered with recv_telnet(). Don't hang around trying to recv when we've already got a password prompt or a success/fail response.
git-svn-id: file:///home/svn/framework3/trunk@10590 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 00:48:24 +00:00
Joshua Drake 840824e3e8 remove unexplained binary characters
git-svn-id: file:///home/svn/framework3/trunk@10588 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 16:22:16 +00:00
pks 872c8b09c7 Add the ability to clean up file descriptors in the remote process.
git-svn-id: file:///home/svn/framework3/trunk@10587 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 11:52:45 +00:00
pks 754225a80d Implement per dispatch run channel_write of packets, remove __FUNCTION__ due to dprintf changes, and fix shutting down networkpug interfaces. Re-add networkpug binary.
git-svn-id: file:///home/svn/framework3/trunk@10586 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 11:52:38 +00:00
HD Moore 6a47af814a Basic, still buggy support for NetSparker XML
git-svn-id: file:///home/svn/framework3/trunk@10585 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 06:24:26 +00:00
HD Moore 1afba58f94 Fix typos
git-svn-id: file:///home/svn/framework3/trunk@10584 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 04:16:48 +00:00
HD Moore 2e25245e9b Remove threading, caused slowdowns
git-svn-id: file:///home/svn/framework3/trunk@10583 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 03:57:51 +00:00
HD Moore 3250ab13e0 Add a parser for Retina XML
git-svn-id: file:///home/svn/framework3/trunk@10582 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 02:33:57 +00:00
Joshua Drake eb6da40f69 fix thread rssh param, indentation, rescue close errors
git-svn-id: file:///home/svn/framework3/trunk@10581 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 00:12:12 +00:00
HD Moore 352b4cf1c8 Dispatch incoming requests as threads
git-svn-id: file:///home/svn/framework3/trunk@10579 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 23:20:13 +00:00
Matt Weeks cb453a97ab Temporary workaround for #2261 - make new console for shell.
git-svn-id: file:///home/svn/framework3/trunk@10578 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 23:10:18 +00:00
Joshua Drake eee1e52f14 remove extra padding that messes everything up
git-svn-id: file:///home/svn/framework3/trunk@10577 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 21:44:23 +00:00
HD Moore b98732ae0a This change allows the auth modules to automatically remove their input files when requested. This makes scripting with temporary files much easier
git-svn-id: file:///home/svn/framework3/trunk@10576 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 21:04:16 +00:00
HD Moore cbcebc0cc8 Bug fixes to the importer
git-svn-id: file:///home/svn/framework3/trunk@10575 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 20:24:26 +00:00
Joshua Drake da459f7712 fix typo
git-svn-id: file:///home/svn/framework3/trunk@10574 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 19:42:14 +00:00
Joshua Drake 87cc978ed9 fix/redo OLD_DHGEX compat
git-svn-id: file:///home/svn/framework3/trunk@10573 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 19:40:13 +00:00
Joshua Drake 64ad40dc17 oops, the transport socket was getting removed prematurely, causing interact fail
git-svn-id: file:///home/svn/framework3/trunk@10572 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 19:39:16 +00:00
HD Moore af28507c36 Cleaner regex
git-svn-id: file:///home/svn/framework3/trunk@10571 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 18:10:39 +00:00
HD Moore 222c418fee Accept MetasploitV4 as well as a base tag, preparing for 3.5.0
git-svn-id: file:///home/svn/framework3/trunk@10570 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 18:09:06 +00:00
HD Moore 0127137151 Reorganize methods and add recognition of v4
git-svn-id: file:///home/svn/framework3/trunk@10569 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 18:00:21 +00:00
HD Moore 1e75603894 Add a Quickfile class that is identical to Tempfile except for the finalizer
git-svn-id: file:///home/svn/framework3/trunk@10568 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 17:57:56 +00:00
Tod Beardsley 4e7e69f768 Avoid GC issue with Tempfiles in meterpreter's command dispatcher.
git-svn-id: file:///home/svn/framework3/trunk@10567 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 17:26:33 +00:00
Joshua Drake fd0195133d add socket so cleanup happens
git-svn-id: file:///home/svn/framework3/trunk@10566 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 16:59:57 +00:00
HD Moore 683a82bfee Switch out msfx/msfe terminology for just msf
git-svn-id: file:///home/svn/framework3/trunk@10565 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 15:55:28 +00:00
Tod Beardsley e492136567 Handle slightly malformed MSFX zip imports. This introduces the nils_for_nulls function that basically takes any instance of NULL in the XML of an MSFX import and turns it into a proper Ruby nil. This helps avoid a lot of problems for reports that were created with NULLs accidentally included.
git-svn-id: file:///home/svn/framework3/trunk@10563 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 05:10:16 +00:00
Tod Beardsley 7041102df7 Fixes #2848, uses the half-guessing method of figuring out the "right" protocol.
git-svn-id: file:///home/svn/framework3/trunk@10562 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 04:18:01 +00:00
HD Moore bf2b4d199c Unbreak
git-svn-id: file:///home/svn/framework3/trunk@10561 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 00:53:45 +00:00
Joshua Drake 425757a6e7 move more platform designations from target to exploit info block
git-svn-id: file:///home/svn/framework3/trunk@10559 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 23:41:17 +00:00
Joshua Drake de159e3fe7 rename with msXX_XXX name, fix platform
git-svn-id: file:///home/svn/framework3/trunk@10558 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 23:39:14 +00:00
Joshua Drake b36e383581 clean up exceptions a bit further
git-svn-id: file:///home/svn/framework3/trunk@10557 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 23:23:17 +00:00
Joshua Drake 7a04ce32ca demote due to interaction requirement
git-svn-id: file:///home/svn/framework3/trunk@10556 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 23:13:04 +00:00
James Lee bf4cda0374 add a disclosure date column to module list (search and 'show exploits' output), fixes #2090
git-svn-id: file:///home/svn/framework3/trunk@10555 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 22:32:21 +00:00
Joshua Drake 74db9d7fe4 demote to manual ranking due to domain requirement
git-svn-id: file:///home/svn/framework3/trunk@10554 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 19:29:10 +00:00
Joshua Drake d2c5d62606 do not wait for WfsDelay if unable to enum printers
git-svn-id: file:///home/svn/framework3/trunk@10553 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 19:03:52 +00:00
Steve Tornio 3276451e3d add osvdb refs
git-svn-id: file:///home/svn/framework3/trunk@10551 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 12:38:46 +00:00
Mario Ceballos dc7a9cb321 use the right bid id.
git-svn-id: file:///home/svn/framework3/trunk@10550 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 01:05:49 +00:00
Joshua Drake 739bff4fb2 remove SRVPORT option, since it is set to the default
git-svn-id: file:///home/svn/framework3/trunk@10548 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 23:52:30 +00:00
Mario Ceballos f921aca916 brightstor blah blah blah
git-svn-id: file:///home/svn/framework3/trunk@10547 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 22:00:22 +00:00