James Lee
|
5091a0fbfa
|
un-revert another piece of r12600's overzealousness. see r12574
git-svn-id: file:///home/svn/framework3/trunk@12647 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-17 17:16:47 +00:00 |
HD Moore
|
9bbee65ebb
|
Back to regularly scheduled development
git-svn-id: file:///home/svn/framework3/trunk@12644 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-17 14:03:05 +00:00 |
|
HD Moore
|
68ca98b225
|
Add the missing debug accessor
git-svn-id: file:///home/svn/framework3/trunk@12627 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-16 02:12:59 +00:00 |
|
HD Moore
|
e0ffab0e6c
|
Move all db.import* calls to the same db.import backend call (as they should have been). Fix method casing to be ruby standard
git-svn-id: file:///home/svn/framework3/trunk@12625 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-16 00:51:26 +00:00 |
|
HD Moore
|
9d765d4d25
|
Change protected for private, add debug flag to MessagePack (with debug.methods call)
git-svn-id: file:///home/svn/framework3/trunk@12624 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-15 23:51:53 +00:00 |
Tod Beardsley
|
056cde292f
|
Deprecate the exploited_host table. Vulns that indicate a successful exploit without opening a session should set the :exploited_at timestamp.
git-svn-id: file:///home/svn/framework3/trunk@12623 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-15 22:19:00 +00:00 |
|
HD Moore
|
26fe5f2c9f
|
Detailed logging when something goes wonky
git-svn-id: file:///home/svn/framework3/trunk@12622 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-15 19:25:09 +00:00 |
|
HD Moore
|
a6da350581
|
Treat timestamps as integers in all RPC calls. This fixes a inconsistency between methods (string vs DateTime object) and standardizing on Unix time stamps results in wider RPC transport support
git-svn-id: file:///home/svn/framework3/trunk@12621 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-15 18:24:52 +00:00 |
|
HD Moore
|
80f71b441e
|
This adds a basic RPC server that operates over HTTP and uses MessagePack. The client/server wrappers are still being finalized. MessagePack libraries are avavailable for all major languages ( http://msgpack.org/ ) and this implementation is ridiculous fast and binary safe, relative to XMLRPC.
git-svn-id: file:///home/svn/framework3/trunk@12616 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-14 18:38:44 +00:00 |
|
Tod Beardsley
|
03549f0b15
|
Nessus imported vulns should reference themselves as a NSS- identifier.
git-svn-id: file:///home/svn/framework3/trunk@12610 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-13 17:00:03 +00:00 |
|
James Lee
|
369a2e898e
|
mark version for minor release
git-svn-id: file:///home/svn/framework3/trunk@12608 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-13 16:14:05 +00:00 |
|
HD Moore
|
c7439f5ba1
|
Remove the leftover autoloads
git-svn-id: file:///home/svn/framework3/trunk@12603 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-12 20:20:08 +00:00 |
|
HD Moore
|
1904e446b2
|
Change this back to cooincide with autoload revert
git-svn-id: file:///home/svn/framework3/trunk@12602 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-12 20:11:43 +00:00 |
|
HD Moore
|
ecb726fb2c
|
Rolling two changes through again (stomped on by the autoload revert)
git-svn-id: file:///home/svn/framework3/trunk@12601 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-12 20:08:33 +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 |
|
HD Moore
|
95d802754b
|
Rework to avoid a warning
git-svn-id: file:///home/svn/framework3/trunk@12598 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-12 19:26:11 +00:00 |
Joshua Drake
|
fd4e6db85d
|
Fixes 4373, Migrates lib/msf to use autoload instead of require (first try)
git-svn-id: file:///home/svn/framework3/trunk@12596 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-12 19:07:35 +00:00 |
|
HD Moore
|
664bbf7c3c
|
Remove the requires now that autoload has been fixed
git-svn-id: file:///home/svn/framework3/trunk@12593 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-12 15:09:27 +00:00 |
|
HD Moore
|
78a2558142
|
Apply patch from chao-mu, fixes #4414
git-svn-id: file:///home/svn/framework3/trunk@12591 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-12 14:59:44 +00:00 |
|
HD Moore
|
c9566da399
|
Add missing requires and autoload to make browser exploits work again.
git-svn-id: file:///home/svn/framework3/trunk@12590 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-12 05:23:32 +00:00 |
|
James Lee
|
06779bc8c0
|
remove unnecessary requires for stuff in rex. autoload and a high-level require 'rex' in lib/msf/core.rb should take care of everything. see #4371, #4373, r12587, and r12554.
git-svn-id: file:///home/svn/framework3/trunk@12588 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-12 00:53:33 +00:00 |
|
Tod Beardsley
|
3e6d526eca
|
Fixes #4391. Sorry! Ruby incompatability on method defs where if you set one option, you need to set them all (doesn't affect current 1.9 Rubies).
git-svn-id: file:///home/svn/framework3/trunk@12580 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-10 21:27:17 +00:00 |
|
Tod Beardsley
|
50b26cb2d6
|
Adds another Qualys formatted XML importer for ASSET_DATA_REPORT files.
git-svn-id: file:///home/svn/framework3/trunk@12575 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-10 19:10:02 +00:00 |
|
Joshua Drake
|
cdeb44747f
|
huh? missing something important heh
git-svn-id: file:///home/svn/framework3/trunk@12574 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-10 18:33:38 +00:00 |
amaloteaux
|
cb72073cd8
|
pcaprub: add a respond_to? in the capture mixin to ensure latest version
git-svn-id: file:///home/svn/framework3/trunk@12565 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-08 04:43:24 +00:00 |
|
amaloteaux
|
5d8db916d7
|
pcap_replay: small fix on th delay
git-svn-id: file:///home/svn/framework3/trunk@12563 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-08 01:44:09 +00:00 |
Matt Weeks
|
490471e129
|
Include necessary require.
git-svn-id: file:///home/svn/framework3/trunk@12558 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-07 02:16:09 +00:00 |
|
James Lee
|
47ef020c61
|
back to development. 3.8 here we come
git-svn-id: file:///home/svn/framework3/trunk@12541 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-04 23:12:43 +00:00 |
|
HD Moore
|
decf71c4af
|
Exceptions trying to determine DB status should simply return false
git-svn-id: file:///home/svn/framework3/trunk@12536 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-04 02:44:14 +00:00 |
|
James Lee
|
9c712f1481
|
cosmetic
git-svn-id: file:///home/svn/framework3/trunk@12534 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 18:25:55 +00:00 |
|
HD Moore
|
4c84181c44
|
This adds a migrated flag to the framework.db object, to prevent a race condition between session_manager startup and db availability while the schema loads. This also makes the session_manager code try again (up to a max count) when it encounters an exception
git-svn-id: file:///home/svn/framework3/trunk@12529 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 07:09:34 +00:00 |
|
James Lee
|
73ba020547
|
release!
git-svn-id: file:///home/svn/framework3/trunk@12521 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 04:40:41 +00:00 |
|
James Lee
|
2192532a0c
|
don't read from the rsock as that's already taken care of by monitor_rsock in StreamAbstraction. fixes EVERYTHING. also fixes #4321
git-svn-id: file:///home/svn/framework3/trunk@12520 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 04:12:41 +00:00 |
|
HD Moore
|
1c86441f12
|
This removes the abortive_close code for stream sockets, it was leading to inconsistencies in how dead sessions were cleaned up
git-svn-id: file:///home/svn/framework3/trunk@12519 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 03:59:02 +00:00 |
|
HD Moore
|
fdc19b5e4a
|
Add the second required argument to write()
git-svn-id: file:///home/svn/framework3/trunk@12518 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 03:09:20 +00:00 |
|
HD Moore
|
23c355ba2c
|
Just use :mac not :host_mac
git-svn-id: file:///home/svn/framework3/trunk@12517 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-03 03:03:38 +00:00 |
|
HD Moore
|
b93e134195
|
Use shell_write vs ring.put
git-svn-id: file:///home/svn/framework3/trunk@12516 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 23:07:02 +00:00 |
|
HD Moore
|
d98f8dfd89
|
Make it clear that all Rex::IO::Stream implementations must accept a second parameter called opts for the read, write, and put methods
git-svn-id: file:///home/svn/framework3/trunk@12515 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 21:39:09 +00:00 |
|
James Lee
|
8fd84e3c3d
|
fix cmd/unix/reverse by adding proper read() and write() methods to TcpReverseDoubleSessionChannel
git-svn-id: file:///home/svn/framework3/trunk@12514 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 20:42:53 +00:00 |
|
James Lee
|
e81d3440b8
|
don't try to store session events for sessions without a db_record. fixes #4301
git-svn-id: file:///home/svn/framework3/trunk@12505 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 06:45:21 +00:00 |
|
HD Moore
|
732a1f3993
|
Skip empty vulnerability names
git-svn-id: file:///home/svn/framework3/trunk@12503 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 05:20:07 +00:00 |
|
Joshua Drake
|
e9372d0e51
|
add another require
git-svn-id: file:///home/svn/framework3/trunk@12501 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 03:40:34 +00:00 |
|
Joshua Drake
|
ed86305675
|
add a require
git-svn-id: file:///home/svn/framework3/trunk@12500 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 03:40:03 +00:00 |
|
Joshua Drake
|
91658ac45e
|
remove crufty require
git-svn-id: file:///home/svn/framework3/trunk@12497 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-02 01:35:21 +00:00 |
|
James Lee
|
178ae10e22
|
make sure telnet sessions use crlf for write() as well as put()
git-svn-id: file:///home/svn/framework3/trunk@12494 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-05-01 23:56:57 +00:00 |
|
HD Moore
|
2c3e85af05
|
Major cleanups to the session manager, serialized processing of incoming connections, concurrent processing (up to a max scheduler thread count) of meterpreter initialization/scripts. This is to avoid a potential deadlock in openssl and ensure consistent, reliable session staging. This commit also fixes a bug that would mark database sessions as closed too early.
git-svn-id: file:///home/svn/framework3/trunk@12485 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-04-30 18:51:50 +00:00 |
|
HD Moore
|
22537ffbde
|
A few more tweaks to non-blocking ssl mode
git-svn-id: file:///home/svn/framework3/trunk@12482 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-04-30 10:24:52 +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 |
|
HD Moore
|
23d0c7d7d0
|
This overrides the framework.sessions.each method to use a temporary list instead of the native hash method. This avoids a rare race condition where a thread is enumerating sessions while another thread tries to register one.
git-svn-id: file:///home/svn/framework3/trunk@12478 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-04-30 04:50:06 +00:00 |
|
Tod Beardsley
|
dfb8a9e24b
|
Catching more nils in db_import.
git-svn-id: file:///home/svn/framework3/trunk@12477 4d416f70-5f16-0410-b530-b9f4589650da
|
2011-04-30 04:33:52 +00:00 |