HD Moore
|
0b82de4846
|
Force binmode for Tempfile use to prevent issues with Windows
git-svn-id: file:///home/svn/framework3/trunk@10650 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-12 01:48:42 +00:00 |
|
HD Moore
|
2d425d2e67
|
Make our Quickfile's always binary mode
git-svn-id: file:///home/svn/framework3/trunk@10649 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-12 01:42:08 +00:00 |
|
Joshua Drake
|
026d411660
|
fix silly test bug
git-svn-id: file:///home/svn/framework3/trunk@10648 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-12 00:27:35 +00:00 |
|
Joshua Drake
|
7b576be821
|
only create the database if it doesn't exist
git-svn-id: file:///home/svn/framework3/trunk@10646 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-11 23:48:53 +00:00 |
|
Joshua Drake
|
b6c4d1fc00
|
add web_urihost
git-svn-id: file:///home/svn/framework3/trunk@10640 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-11 05:56:18 +00:00 |
|
HD Moore
|
6f981e7b08
|
Add missing confidence field from import
git-svn-id: file:///home/svn/framework3/trunk@10636 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-11 03:35:15 +00:00 |
|
HD Moore
|
5a2444eb24
|
Clean up web_vuln import, use additional fields
git-svn-id: file:///home/svn/framework3/trunk@10635 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-11 02:57:07 +00:00 |
|
HD Moore
|
e7fe407106
|
Update to the report_web_vuln method to take into account the schema update
git-svn-id: file:///home/svn/framework3/trunk@10632 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-10 19:36:31 +00:00 |
|
Jonathan Cran
|
8ffe70c2a8
|
include the local path so you can just require lab_controller in irb
git-svn-id: file:///home/svn/framework3/trunk@10630 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-10 02:22:50 +00:00 |
|
Jonathan Cran
|
c76f88245d
|
Cleaned up the gidance on the labs, and fixed the lab.rb require
git-svn-id: file:///home/svn/framework3/trunk@10629 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-10 02:18:41 +00:00 |
|
HD Moore
|
39be54970b
|
Fix a typo in the exception handler
git-svn-id: file:///home/svn/framework3/trunk@10625 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-09 22:09:35 +00:00 |
|
HD Moore
|
b99be2dae6
|
Unbreak this
git-svn-id: file:///home/svn/framework3/trunk@10621 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-09 18:27:09 +00:00 |
|
HD Moore
|
f19be2ca3f
|
Try harder to figure out who ran the module
git-svn-id: file:///home/svn/framework3/trunk@10620 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-09 18:11:11 +00:00 |
|
James Lee
|
abf19e002d
|
tweak the models
git-svn-id: file:///home/svn/framework3/trunk@10618 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-09 08:35:41 +00:00 |
|
James Lee
|
8aa73c2951
|
add a filename
git-svn-id: file:///home/svn/framework3/trunk@10616 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-09 03:50:04 +00:00 |
|
James Lee
|
014ed847b2
|
actually save the campaign
git-svn-id: file:///home/svn/framework3/trunk@10609 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-08 20:32:32 +00:00 |
|
James Lee
|
dbcd8619e1
|
break report_user_agent into a fingerprint method and a report method, pass extra arguments on to report_client
git-svn-id: file:///home/svn/framework3/trunk@10608 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-08 20:28:14 +00:00 |
|
Joshua Drake
|
d6f8b689ee
|
fix bug in default case
git-svn-id: file:///home/svn/framework3/trunk@10606 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-08 19:49:57 +00:00 |
|
Joshua Drake
|
e408d5a155
|
add windows error messages for windows meterpreter sessions, minor cleanups
git-svn-id: file:///home/svn/framework3/trunk@10605 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-08 19:36:34 +00:00 |
|
HD Moore
|
504be7e7e2
|
Dont put the load_priv into the timeout block
git-svn-id: file:///home/svn/framework3/trunk@10603 4d416f70-5f16-0410-b530-b9f4589650da
|
2010-10-08 17:31:08 +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 |
|
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 |
|
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 |