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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
e2ed2f0d75
Fix a long-standing issue with Resolv.getaddress() being broken on Ruby 1.9.1 Windows
...
git-svn-id: file:///home/svn/framework3/trunk@10544 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 14:49:19 +00:00
8fe655fce7
add unknown command override, see #2793
...
git-svn-id: file:///home/svn/framework3/trunk@10542 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 08:05:09 +00:00
3b99c58cb1
Drop this to 75 to take into account other processes accessing the same db. Theoretically the AR pool manager will kick in when this is hit anyways
...
git-svn-id: file:///home/svn/framework3/trunk@10541 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 07:11:07 +00:00
31b8fcf7f2
Reduce the default pool size to match reasonable database limits
...
git-svn-id: file:///home/svn/framework3/trunk@10540 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 06:55:34 +00:00
4a12f9529e
Choose a reasonable default if none is set
...
git-svn-id: file:///home/svn/framework3/trunk@10539 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 04:50:10 +00:00
f69a1190a4
Commit the EICAR Canary check for meddling AVs
...
git-svn-id: file:///home/svn/framework3/trunk@10536 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 03:07:58 +00:00
adeae9fdec
Expose ReverseListenerComm to the reverse_https and passivex handlers as well
...
git-svn-id: file:///home/svn/framework3/trunk@10535 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 02:17:09 +00:00
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
6a06a95f2f
Faster unique form sort
...
git-svn-id: file:///home/svn/framework3/trunk@10532 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 03:34:58 +00:00
555f6840fa
Remove the port when its the default for the protocol
...
git-svn-id: file:///home/svn/framework3/trunk@10531 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 01:57:07 +00:00
02b1979c27
Tweaks for vuln reporting
...
git-svn-id: file:///home/svn/framework3/trunk@10530 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 01:04:33 +00:00
6319d95456
Actually store the additional fields
...
git-svn-id: file:///home/svn/framework3/trunk@10529 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 00:45:44 +00:00
ddcb07bf97
Typos
...
git-svn-id: file:///home/svn/framework3/trunk@10528 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-03 00:23:18 +00:00
8a567dd3a8
Add query to web_form/web_path
...
git-svn-id: file:///home/svn/framework3/trunk@10526 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-02 22:55:54 +00:00
8a0fdf7e14
Add some helper methods to the workspace
...
git-svn-id: file:///home/svn/framework3/trunk@10524 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-02 19:52:50 +00:00
5b7296931d
This patch merges in support for four new database tables focused on tracking web application information along with a tweak to the task manager code to allow tasks to be run from within tasks without fear of deadlock.
...
git-svn-id: file:///home/svn/framework3/trunk@10523 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-02 18:48:29 +00:00
86f6ecdadd
add bools
...
git-svn-id: file:///home/svn/framework3/trunk@10517 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-01 13:36:32 +00:00
6743dbfc62
Actually respect the allow_yaml status for imports on everything that might be serialized, and also streamlines unserialized_object a little.
...
git-svn-id: file:///home/svn/framework3/trunk@10505 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-28 17:52:48 +00:00
7409e34738
See #2717 . Fixes session reaping (VNC, specifically)
...
git-svn-id: file:///home/svn/framework3/trunk@10502 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-28 15:06:09 +00:00
ddb2f71674
Ensuring binary file reads, always.
...
git-svn-id: file:///home/svn/framework3/trunk@10501 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-28 03:13:10 +00:00
dc79d360ac
Quick fix to avoid dying on badly formatted imported data (looks like a Nessus import problem, actually)
...
git-svn-id: file:///home/svn/framework3/trunk@10499 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 23:06:13 +00:00
331f7a7b26
Handles REXML::ParseErrors without making a terrible mess.
...
git-svn-id: file:///home/svn/framework3/trunk@10497 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 15:40:33 +00:00
337a0be8fc
adjust templates, move SerializedPrefs into its own file
...
git-svn-id: file:///home/svn/framework3/trunk@10494 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 04:12:04 +00:00
7b2a29365f
fix report_note taking a Service obj in opts[:service]
...
git-svn-id: file:///home/svn/framework3/trunk@10493 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 03:52:39 +00:00
971d1efcfb
Updated Nessus Plugin lib and formating fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10492 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 00:43:40 +00:00
f07f354472
tidy pass on exploit mixins
...
git-svn-id: file:///home/svn/framework3/trunk@10487 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 21:02:00 +00:00
e4bef2ce51
turn off payload handler by default for fileformat modules
...
git-svn-id: file:///home/svn/framework3/trunk@10486 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 18:28:58 +00:00
14cabd2611
Allow debugging to be enabled.
...
This will make it easier to hopefully track down bugs.
exploitme-posix.c - make complete stack executable. On some kernel versions, execstack doesn't do the trick.
git-svn-id: file:///home/svn/framework3/trunk@10485 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 05:58:59 +00:00
784e355d93
Networkpug improvements
...
git-svn-id: file:///home/svn/framework3/trunk@10484 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 05:58:48 +00:00
e646176db7
check number of fields before trying to add row
...
git-svn-id: file:///home/svn/framework3/trunk@10482 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 04:16:18 +00:00
cdc97316b5
Automatically close dead sessions (finally), also, automatically mark meterpreter sessions as dead when writes start to trigger exceptions
...
git-svn-id: file:///home/svn/framework3/trunk@10475 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-25 03:57:30 +00:00
faf58c2b62
Allows 0.0.0.0/::0 to be used in place of the real "any" address regardless of socket type when the bind address is specified
...
git-svn-id: file:///home/svn/framework3/trunk@10473 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-25 03:28:19 +00:00
3b31f56894
This commit adds a new option to all reverse handlers: ReverseListenerBindAddress. This setting determines exactly what address is bound on the local system
...
git-svn-id: file:///home/svn/framework3/trunk@10472 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-25 03:25:09 +00:00
54c1ec843d
tab complete on scripts in ~/.msf3/scripts/meterpreter/ as well. fixes #2403
...
git-svn-id: file:///home/svn/framework3/trunk@10468 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 23:05:10 +00:00
478a15f827
doc the use of :name for services
...
git-svn-id: file:///home/svn/framework3/trunk@10465 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 21:25:18 +00:00
7878273131
try to preserve the service name in the case of incorrect report_note usage
...
git-svn-id: file:///home/svn/framework3/trunk@10464 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 21:11:36 +00:00
c00d56d560
Deal with services a little more intelligently if they're not already there when you report a note.
...
git-svn-id: file:///home/svn/framework3/trunk@10463 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 20:51:38 +00:00
09cab24dbf
Report_note no longer tries to re-report a service name; it just re-reports port numbers and protocols. This is to avoid unidentifying identified services.
...
git-svn-id: file:///home/svn/framework3/trunk@10458 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 17:52:25 +00:00
84c031d620
document smtp_deliver a little better
...
git-svn-id: file:///home/svn/framework3/trunk@10456 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 16:54:09 +00:00
b3d5e4ddf7
is_admin? Meterpreter Mixin call for win32 and win64 versions of Meterpreter
...
git-svn-id: file:///home/svn/framework3/trunk@10452 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 00:08:05 +00:00
ae48757fd5
new nessus plugin patches from Zate Berg
...
git-svn-id: file:///home/svn/framework3/trunk@10450 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 23:17:13 +00:00
a5527f7757
Typo
...
git-svn-id: file:///home/svn/framework3/trunk@10447 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 12:37:40 +00:00
0cd520b093
Changes for PHP, Java and Linux Meterpreter Channels and fix for registry key case changes depending on windows version.
...
git-svn-id: file:///home/svn/framework3/trunk@10446 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 12:15:59 +00:00
224891387a
add exploit number to prefix
...
git-svn-id: file:///home/svn/framework3/trunk@10443 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 02:16:29 +00:00
87b8b9ae8f
tighten up response code check
...
git-svn-id: file:///home/svn/framework3/trunk@10441 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 01:55:19 +00:00
cabbe1a84a
oops, hehehe -- fixes exe generation
...
git-svn-id: file:///home/svn/framework3/trunk@10440 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 01:43:42 +00:00
5800274b8f
avoid sending email data when the server says it doesn't like our DATA, don't send creds if the server doesn't ask, fix the slowness in TLS
...
git-svn-id: file:///home/svn/framework3/trunk@10438 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-22 22:34:37 +00:00
000c05ff86
allow external control of the arch/platform, fix for aux modules
...
git-svn-id: file:///home/svn/framework3/trunk@10435 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-22 20:55:26 +00:00
2a58f7433e
revamp report_note to compare data in ruby instead of SQL which was causing headaches with serialization
...
git-svn-id: file:///home/svn/framework3/trunk@10432 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-22 05:37:21 +00:00
d1de6fde36
remove _old from filename
...
git-svn-id: file:///home/svn/framework3/trunk@10428 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 17:07:00 +00:00
465fe7c60d
nice work troulouliou, shuffling comments only
...
git-svn-id: file:///home/svn/framework3/trunk@10427 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 16:24:18 +00:00
3204b3ad83
Patch for the SMB timestamp parser which allows it to function in GMT+ zones
...
git-svn-id: file:///home/svn/framework3/trunk@10425 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 14:21:38 +00:00
50241faa57
Implement a sniffer for posix meterpreter using libpcap.
...
This version of the sniffer supports packet filtering after the packet count variable, like so:
meterpreter > sniffer_interfaces
1 - 'eth0' ( type:0 mtu:1514 usable:false dhcp:false wifi:false )
2 - 'any' ( type:0 mtu:1514 usable:false dhcp:false wifi:false )
3 - 'lo' ( type:0 mtu:1514 usable:false dhcp:false wifi:false )
meterpreter > use sniffer
Loading extension sniffer...success.
meterpreter > sniffer_start 1 500000 icmp <-- picks up only icmp packets.
[*] Capture started on interface 1 (500000 packet buffer)
meterpreter > sniffer_stop 1
[*] Capture stopped on interface 1
git-svn-id: file:///home/svn/framework3/trunk@10424 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 11:43:30 +00:00
a179836fca
Initial import of networkpug, a pivoting interface using libpcap to monitor/inject packets on a interface on the remote machine.
...
git-svn-id: file:///home/svn/framework3/trunk@10423 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 09:35:46 +00:00
7a58e611e6
don't log plaintext passwords
...
git-svn-id: file:///home/svn/framework3/trunk@10422 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 07:00:50 +00:00
b8bcc2fedb
Continue processing even if the exploit's on_new_session override triggers an exception
...
git-svn-id: file:///home/svn/framework3/trunk@10413 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 03:05:55 +00:00
001a6ffbdb
really use simple substitution method, oops
...
git-svn-id: file:///home/svn/framework3/trunk@10412 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:59:42 +00:00
048b21e3b9
Ensure that errors in the PHPInclude mixin lead to the service being stopped. Handle unreachable services in the php_include module better. Fix database-enabled tab completion to be workspace friendly
...
git-svn-id: file:///home/svn/framework3/trunk@10410 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:52:49 +00:00
9f02523ab9
allow forcing use of substitution method
...
git-svn-id: file:///home/svn/framework3/trunk@10408 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:34:43 +00:00
eab9c22657
add support for more dll template types
...
git-svn-id: file:///home/svn/framework3/trunk@10407 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:32:12 +00:00
837e6e5075
fix inject support
...
git-svn-id: file:///home/svn/framework3/trunk@10406 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 02:19:33 +00:00
8e5cf31e9a
big exe/dll update, see #2017
...
NOTE: These changes specifically affect payload encoding via RPC, "use
payload", and msfencode
1. consolidate user-specified exe generation routine (now
Msf::Util::EXE.to_executable_fmt)
2. supported format types are now queried/checked using arrays
3. cleaned up and standardized exe option passing
4. rename data store options for EXE mixin
5. add generate_payload_exe_service for psexec/smb_relay
6. reworked default template handling in Msf::Util::EXE
a. added template search path option (not used if template includes
a path separator)
b. "fallback" flag to enable using default if specified file doesn't
exist
7. added Msf::Util::EXE.to_win64pe_dll
8. improved error messages from exe generation
git-svn-id: file:///home/svn/framework3/trunk@10404 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 00:13:30 +00:00
771fc82c8c
add a unique cid to attachments
...
git-svn-id: file:///home/svn/framework3/trunk@10399 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 21:41:50 +00:00
bd1eeb3722
rework to_jsp_war a bit, fix uses, default msfencode -t war to x86/win32
...
git-svn-id: file:///home/svn/framework3/trunk@10397 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 15:59:46 +00:00
4590844871
tons of indentation fixes, some other style tweaks
...
git-svn-id: file:///home/svn/framework3/trunk@10394 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 08:06:27 +00:00
69ce7eed1b
Wrap the admin check in case the OS doesn't support this API (WinNT, Win2000)
...
git-svn-id: file:///home/svn/framework3/trunk@10390 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 04:58:25 +00:00
21d88b36c1
rename generate_exe -> generate_payload_exe
...
git-svn-id: file:///home/svn/framework3/trunk@10388 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 04:37:25 +00:00
25315ec3ea
Store the module instance itself in an accessor on the session. You have to be careful when using this, as the contents can change if the owner of the module is still working with it.
...
git-svn-id: file:///home/svn/framework3/trunk@10386 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 03:51:38 +00:00
3c505f4c5d
remove loop instruction, it was causing problems when the destination was too far away, fixes #2459
...
git-svn-id: file:///home/svn/framework3/trunk@10385 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 03:26:41 +00:00
541c192f12
Updates from Zate, renamed commands to match the existing plugins
...
git-svn-id: file:///home/svn/framework3/trunk@10383 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 02:18:25 +00:00
0b008d6c3c
remove some duplicate code and make output more useful when there is a service with no name
...
git-svn-id: file:///home/svn/framework3/trunk@10382 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 01:54:23 +00:00
711fe18ac2
typo fix
...
git-svn-id: file:///home/svn/framework3/trunk@10379 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 23:22:32 +00:00
940a096769
typo fix
...
git-svn-id: file:///home/svn/framework3/trunk@10378 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 23:13:02 +00:00
5f0cc946b1
document report_note a little better, and modify several modules to use it correctly. fixes #2568
...
git-svn-id: file:///home/svn/framework3/trunk@10377 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 22:25:56 +00:00
7c540583b5
Latest code from Zate
...
git-svn-id: file:///home/svn/framework3/trunk@10376 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 22:18:56 +00:00
5d3089c135
raise EOFError from SSL connections
...
git-svn-id: file:///home/svn/framework3/trunk@10375 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 21:20:06 +00:00
136ab04a22
Add msfencode capability to rpc.
...
git-svn-id: file:///home/svn/framework3/trunk@10373 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 02:42:33 +00:00
ff22e5212e
revert to backward compatible method of using utc+zone
...
git-svn-id: file:///home/svn/framework3/trunk@10367 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 05:09:47 +00:00
af19a0d924
hrm, i dont think i meant to check these in
...
git-svn-id: file:///home/svn/framework3/trunk@10364 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 01:41:13 +00:00
b22c24289d
fix up the simple.client.system_time and underlying stuffs
...
git-svn-id: file:///home/svn/framework3/trunk@10362 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-18 01:12:44 +00:00
012654947a
Store the time zone as well
...
git-svn-id: file:///home/svn/framework3/trunk@10357 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 21:19:04 +00:00
73bec8b819
many-to-many switch
...
git-svn-id: file:///home/svn/framework3/trunk@10355 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 21:05:11 +00:00
31f5ee512c
Store the server time in Ruby object format
...
git-svn-id: file:///home/svn/framework3/trunk@10354 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 21:03:08 +00:00
d0ea92d35f
Dont match on directories with the name of the intended file. Problem identified by JJ Gray
...
git-svn-id: file:///home/svn/framework3/trunk@10347 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 16:02:10 +00:00
8f7743c999
Check for railgun first
...
git-svn-id: file:///home/svn/framework3/trunk@10342 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 21:49:51 +00:00
21d734201a
Closes #2520 . Merges Rob's patch to check admin privs on start
...
git-svn-id: file:///home/svn/framework3/trunk@10341 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 21:44:25 +00:00
99e2218d13
Be a little more careful with credential sources and update new services in the current workspace.
...
git-svn-id: file:///home/svn/framework3/trunk@10339 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 19:45:51 +00:00
5e2295a9a8
Add in an aux module to create a socks4 proxy server. If you add in a route via a meterpreter session to the framework routing table the proxy server will use that route where appropriate. (Also modified the servers opts hash to optionally take a 'Comm' param if you want to programmatically create a socks4 server which will always use a specific meterpreter session for all socket creation - by default this does not happen and it uses the rex socket switchboard as per normal rex socket creation).
...
git-svn-id: file:///home/svn/framework3/trunk@10337 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 18:23:03 +00:00
5c2717a189
Add in a Socks4a proxy server.
...
git-svn-id: file:///home/svn/framework3/trunk@10330 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 12:11:30 +00:00
ab1ac7ab22
make sure attachments are included
...
git-svn-id: file:///home/svn/framework3/trunk@10329 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 08:43:08 +00:00
0479107e7a
Railgun is now part of Standard API no need to load it
...
git-svn-id: file:///home/svn/framework3/trunk@10328 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 01:41:11 +00:00
cf440fc6c9
Rename for consistency
...
git-svn-id: file:///home/svn/framework3/trunk@10324 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-15 08:40:57 +00:00
4970c502f7
Import of the dual-licensed (GPL/BSD) nessus-xmlrpc client from Vlatko Kosturjak
...
git-svn-id: file:///home/svn/framework3/trunk@10323 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-15 08:22:28 +00:00
6f4eaeb8e3
Delete the ruby side railgun meterpreter extension and add in the new stdapi railgun stuff. Railgun with stdapi works the same (e.g. just use client.railgun.user32.MesageBoxA(...) ). The module definitions are lazy loaded on demand to avoid the performance hit if we load them all at once when stdapi is initially loaded.
...
git-svn-id: file:///home/svn/framework3/trunk@10319 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-14 23:28:52 +00:00
e85b8adcf8
Add Ruby side meterpreter packet support for QWORD Tlv's.
...
git-svn-id: file:///home/svn/framework3/trunk@10318 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-14 23:23:15 +00:00
44a67d0440
Typo fix
...
git-svn-id: file:///home/svn/framework3/trunk@10315 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-14 18:20:17 +00:00
792285cb87
Clean up monitor threads
...
git-svn-id: file:///home/svn/framework3/trunk@10309 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 21:07:02 +00:00
778132ad02
Remove the select spin loop in favor of a thread.join
...
git-svn-id: file:///home/svn/framework3/trunk@10308 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 20:57:38 +00:00
7ccf4e2f11
Change stream writes to be non-blocking, this has been pretty heavily tested over the last couple days, and should preserve the original behavior as well. This fixes a deadlock in Ruby in certain conditions
...
git-svn-id: file:///home/svn/framework3/trunk@10306 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 14:39:17 +00:00
fa38a19ada
Adding the missing report_template.rb.
...
git-svn-id: file:///home/svn/framework3/trunk@10304 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 13:20:49 +00:00
088e862e16
Adds a migration for report template tracking.
...
git-svn-id: file:///home/svn/framework3/trunk@10303 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 12:17:57 +00:00
cd7dd926e2
use the models from the last commit. i suck at getting all the files in a single commit. =/
...
git-svn-id: file:///home/svn/framework3/trunk@10302 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 08:26:48 +00:00
c8bd48dbb0
add models for campaigns and stuff.
...
git-svn-id: file:///home/svn/framework3/trunk@10301 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 08:25:27 +00:00
cefe0ecb45
Add ability to run modules in console, some other fixes.
...
git-svn-id: file:///home/svn/framework3/trunk@10297 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 21:54:19 +00:00
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
cb41474f49
fix typo and import errors.
...
git-svn-id: file:///home/svn/framework3/trunk@10291 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 16:17:12 +00:00
995b289635
Add session upgrade capability to command shells.
...
git-svn-id: file:///home/svn/framework3/trunk@10289 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 15:59:19 +00:00
7f3cc47da9
Only add platform for meterpreter sessions. Unbreaks shell sessions.
...
git-svn-id: file:///home/svn/framework3/trunk@10286 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-10 23:33:33 +00:00
8716609aaf
add the platform to the session attributes returned by rpc
...
git-svn-id: file:///home/svn/framework3/trunk@10285 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-10 20:56:21 +00:00
f7020af01a
update metasm to tip
...
git-svn-id: file:///home/svn/framework3/trunk@10278 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 18:19:35 +00:00
eec9b59609
add docs dir
...
git-svn-id: file:///home/svn/framework3/trunk@10274 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 15:49:06 +00:00
6422d8c2de
unbreak payloads over rpc
...
git-svn-id: file:///home/svn/framework3/trunk@10271 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 05:19:04 +00:00
0a8c8b3c90
add the platform to sessions list
...
git-svn-id: file:///home/svn/framework3/trunk@10269 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 01:41:32 +00:00
1405bda8a4
properly set defaults for ip start and end, fixes #2500
...
git-svn-id: file:///home/svn/framework3/trunk@10261 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-08 17:06:31 +00:00
6336c01771
Deprecates db_import_* file type commands, and suggests the user use db_import instead.
...
git-svn-id: file:///home/svn/framework3/trunk@10246 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-06 18:33:17 +00:00
85cdc7ad78
ugh, i'm bouncing between too many languages, this syntax doesn't even work in php. fixes #2495
...
git-svn-id: file:///home/svn/framework3/trunk@10240 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-05 16:13:17 +00:00
e8e796868e
default to nil
...
git-svn-id: file:///home/svn/framework3/trunk@10237 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-04 00:08:12 +00:00
0b8eebcace
make sure sets has something in it. lib/msf/core/exploit.rb sends this a nil if the user didn't specify anything
...
git-svn-id: file:///home/svn/framework3/trunk@10235 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 23:48:46 +00:00
e42d2c1ef4
make sure we read the whole file
...
git-svn-id: file:///home/svn/framework3/trunk@10234 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 23:00:28 +00:00
b24a7db785
Add workspace support throughout GUI; add/select/remove db workspace and set default workspace when running modules.
...
git-svn-id: file:///home/svn/framework3/trunk@10233 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 17:13:53 +00:00
f5bc508370
Fix db.vulns typos
...
git-svn-id: file:///home/svn/framework3/trunk@10232 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 16:09:10 +00:00
57dac0dbf8
remove newlines when importing from an ip list
...
git-svn-id: file:///home/svn/framework3/trunk@10230 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 15:04:09 +00:00
04ee50d10c
fixed bug w/ revert
...
git-svn-id: file:///home/svn/framework3/trunk@10224 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-02 20:34:31 +00:00
4388b886c8
jduck tricked me on purpose.
...
git-svn-id: file:///home/svn/framework3/trunk@10222 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-02 16:22:48 +00:00
e7aa1a86ec
Avoid xml encoding spaces.
...
git-svn-id: file:///home/svn/framework3/trunk@10221 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-02 16:20:30 +00:00
832960b6df
Whoops forgot the x.
...
git-svn-id: file:///home/svn/framework3/trunk@10216 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-01 23:26:35 +00:00
1d1805306e
Adds xml_char_encode. Like html_encode, but allows xml-safe character through.
...
git-svn-id: file:///home/svn/framework3/trunk@10214 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-01 22:40:07 +00:00
b65be82387
Handle updating the updated_at time for just-checked credentials better.
...
git-svn-id: file:///home/svn/framework3/trunk@10213 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-01 22:06:52 +00:00
21540e22ed
Checking in missing reporting stuff for bruteforce. Namely, report_exploit, also changes ftp's pw type to just "password" and re-opens newly verified sessions.
...
git-svn-id: file:///home/svn/framework3/trunk@10205 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-31 20:33:16 +00:00
a0f86c62e3
Meterpreter search support to leverage the index on older systems (2000/XP/2003) via Windows Desktop Search v2.
...
git-svn-id: file:///home/svn/framework3/trunk@10187 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-30 09:50:41 +00:00
9253085d13
Add plugin support to rpc. Fixes #2292
...
git-svn-id: file:///home/svn/framework3/trunk@10177 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-28 18:21:17 +00:00
1d508a7acd
Fixes #2464
...
git-svn-id: file:///home/svn/framework3/trunk@10175 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-28 17:37:27 +00:00
6d333eb185
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10173 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 21:26:59 +00:00
d02687b755
add dest adjust option to omelete hunter
...
git-svn-id: file:///home/svn/framework3/trunk@10172 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 21:19:42 +00:00
8dd489ad3b
expose the payload exe filename, remove the concat operator
...
git-svn-id: file:///home/svn/framework3/trunk@10169 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 17:23:47 +00:00
a3a20ebb05
default to no concatenation
...
git-svn-id: file:///home/svn/framework3/trunk@10168 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 17:16:44 +00:00
fbf64adf2a
Commit the ruby side for meterpreter file search. If available, will leverage Windows Search to speed up searching an indexed directory. Examples of usage as follows:
...
Find all .PDF files on the host system:
meterpreter>search *.pdf
Find all files on bob's desktop:
meterpreter>search -d 'c:\users\bob\desktop' -f *
Find all files in the root drive c: but don't search subdirectories:
meterpreter>search -d c: -r false -f *
If Windows Search is available (Vista and above by default, XP/2003 by addon) we can also search any indexed IE history and indexed email
meterpreter>search -d iehistory -f *
meterpreter>search -d mapi -f *
git-svn-id: file:///home/svn/framework3/trunk@10167 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 14:59:38 +00:00
77917c80e6
This should fix #2459 - the "short" qualifiers were not being removed from all asm stubs
...
git-svn-id: file:///home/svn/framework3/trunk@10164 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 05:11:19 +00:00
a119cb7b71
dont let close exceptions slow us down
...
git-svn-id: file:///home/svn/framework3/trunk@10163 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 04:44:02 +00:00
6e48076249
fixes #2435 , add BROADCAST option to DHCP server, use in cases where sending to 255.255.255.255 fails
...
git-svn-id: file:///home/svn/framework3/trunk@10159 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-26 19:34:53 +00:00
330281eadd
see #684 , adds checksum support, updates modules to use it, fixes some wfs_delay/WfsDelay issues
...
git-svn-id: file:///home/svn/framework3/trunk@10150 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:55:37 +00:00
c473d20927
default badchars to payload_badchars
...
git-svn-id: file:///home/svn/framework3/trunk@10149 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:54:20 +00:00
34eb75af73
overhaul smtp to add support for authentication and STARTTLS. can now send email through a gmail account
...
git-svn-id: file:///home/svn/framework3/trunk@10148 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:31:46 +00:00
a0e7901c19
add syscall name comment
...
git-svn-id: file:///home/svn/framework3/trunk@10147 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:23:38 +00:00
9557980607
oops, semicolon is a comment except when used in metasm_shell
...
git-svn-id: file:///home/svn/framework3/trunk@10144 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 17:46:06 +00:00
1477ae6b92
merge in checksum support, add quick-n-dirty unit test
...
git-svn-id: file:///home/svn/framework3/trunk@10143 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 16:52:13 +00:00
623e4ef3ac
add forward search, reset between eggs, move options into a hash
...
git-svn-id: file:///home/svn/framework3/trunk@10132 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 01:21:12 +00:00
1db9d8eb01
Fixes #2444 . Adds an ExploitedHost table, adds the db_exploited command, adds the report_exploit() function.
...
Tested with meterpreter, shell, and clientside exploit sessions.
git-svn-id: file:///home/svn/framework3/trunk@10130 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-24 21:57:04 +00:00
8741179e8a
bugfix for the revert command
...
git-svn-id: file:///home/svn/framework3/trunk@10129 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-24 19:29:43 +00:00
49beb83081
add the "makerc" command for quick resource script generation, fixes #738
...
git-svn-id: file:///home/svn/framework3/trunk@10119 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 21:19:01 +00:00
b6577681c6
another omelet update from Peter, this time with in-line assembly
...
git-svn-id: file:///home/svn/framework3/trunk@10118 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 21:03:00 +00:00
bd96c10cc0
only read the history file if we have no history
...
git-svn-id: file:///home/svn/framework3/trunk@10117 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 20:56:50 +00:00
6e66831517
couple minor fixes to omelet mixin/class
...
git-svn-id: file:///home/svn/framework3/trunk@10116 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 19:53:15 +00:00
2b11577ae1
fix broken free, type in require
...
git-svn-id: file:///home/svn/framework3/trunk@10112 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 18:05:37 +00:00
acef967d5a
Updating importing to deal with importing credentials from Metasploit Express XML.
...
git-svn-id: file:///home/svn/framework3/trunk@10111 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 17:45:36 +00:00
d2bada79a9
typo in error string
...
git-svn-id: file:///home/svn/framework3/trunk@10109 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 17:37:06 +00:00
08fc366d0b
add omlet mixin from Peter Van Eeckhoutte
...
git-svn-id: file:///home/svn/framework3/trunk@10108 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 17:35:41 +00:00
62f6c9b961
fix some 1.8/1.9 incompatabilities, should be last commit on #2329
...
git-svn-id: file:///home/svn/framework3/trunk@10106 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 16:45:38 +00:00
8c9d08b1e8
add egg override param for egghunter
...
git-svn-id: file:///home/svn/framework3/trunk@10098 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-22 20:19:19 +00:00
7ad4f80014
Add a badchars argument
...
git-svn-id: file:///home/svn/framework3/trunk@10094 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-21 07:20:58 +00:00
09af63c1fb
generate returning nil in payload.size
...
git-svn-id: file:///home/svn/framework3/trunk@10087 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 20:35:48 +00:00
0e896261cb
1.8.6 compatibility fix
...
git-svn-id: file:///home/svn/framework3/trunk@10086 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 20:31:39 +00:00
b1411084ff
add -h and invalid param error to cmd_show
...
git-svn-id: file:///home/svn/framework3/trunk@10083 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 18:45:33 +00:00
198cc37f8a
load java payload mixin, fixes #2432
...
git-svn-id: file:///home/svn/framework3/trunk@10081 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 18:04:48 +00:00
5b38990e70
missed this
...
git-svn-id: file:///home/svn/framework3/trunk@10076 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 07:13:35 +00:00
5d95f48848
add preliminary support for the new java payloads. Working meterpreter and shell stages with tcp bind and reverse stagers, see #406
...
git-svn-id: file:///home/svn/framework3/trunk@10073 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 07:01:23 +00:00
d0ea2737c5
Don't overwrite source_id just because we don't have one.
...
git-svn-id: file:///home/svn/framework3/trunk@10067 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 23:19:34 +00:00
2545410bc7
make exe template names more consistent
...
git-svn-id: file:///home/svn/framework3/trunk@10065 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 21:08:51 +00:00
d9337f3cca
add a Jar class to Rex::Zip
...
git-svn-id: file:///home/svn/framework3/trunk@10057 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 17:08:29 +00:00
d5149b8e23
less verbose Entry#inspect
...
git-svn-id: file:///home/svn/framework3/trunk@10056 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 17:04:42 +00:00
a9a4e3f2da
Add meterpreter client side support for cleaning up loaded extensions upon server termination by calling the loaded extensions cleanup() method if available.
...
git-svn-id: file:///home/svn/framework3/trunk@10055 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 11:37:22 +00:00
7d560e9c18
rescue NoCompatiblePayloadError inside size method, fixes #1604
...
git-svn-id: file:///home/svn/framework3/trunk@10051 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 00:10:06 +00:00
48e91af25d
remove client ip send, remove puts lines, fixes #2329
...
git-svn-id: file:///home/svn/framework3/trunk@10049 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 23:35:28 +00:00
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
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
ad2b69dced
add database access to rpc. thanks Ryan Linn for the patch\!
...
git-svn-id: file:///home/svn/framework3/trunk@10043 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 21:26:26 +00:00
b8991c541e
add a NO RECV flag to the client call function
...
git-svn-id: file:///home/svn/framework3/trunk@10038 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 17:21:10 +00:00
626f7e0c66
add a flag indication not to recv to various smb/client methods
...
git-svn-id: file:///home/svn/framework3/trunk@10037 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 17:20:55 +00:00
24d10866b6
add update_checksum, size, and length methods
...
git-svn-id: file:///home/svn/framework3/trunk@10036 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 04:39:38 +00:00
6d6a547b34
Fixes #2412 . Adds a creds table, modifies the db_report_auth API, adds the db_creds and db_add_cred commands.
...
git-svn-id: file:///home/svn/framework3/trunk@10034 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 00:58:20 +00:00
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
aca547ac48
Remove the 10,000 banner
...
git-svn-id: file:///home/svn/framework3/trunk@10023 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-16 17:13:35 +00:00
d803cf0ea9
un-break the tree! *facepalm* -- see #2398
...
git-svn-id: file:///home/svn/framework3/trunk@10018 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 20:52:54 +00:00
6c05d425dc
change remaining methods to take an opts hash and allow template override for them
...
git-svn-id: file:///home/svn/framework3/trunk@10016 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 20:40:45 +00:00
9ba0916937
fix port bug, add diff from sj, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@10015 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 20:21:14 +00:00
d848732254
stop leaking sockets/jobs when using rerun on aux modules
...
git-svn-id: file:///home/svn/framework3/trunk@10014 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 06:47:11 +00:00
3a0402de2a
a few minor cleanups
...
git-svn-id: file:///home/svn/framework3/trunk@10013 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 06:42:17 +00:00
cb445588e0
fix problem with unclosed sockets
...
git-svn-id: file:///home/svn/framework3/trunk@10012 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 04:58:27 +00:00
c94663c1fd
check the os before adding output redirection to commands
...
git-svn-id: file:///home/svn/framework3/trunk@10007 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 19:46:04 +00:00
7b521b8ef2
change the timeout to something sane
...
git-svn-id: file:///home/svn/framework3/trunk@10006 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 17:24:59 +00:00
c1a2f51487
tagging id / rev
...
git-svn-id: file:///home/svn/framework3/trunk@10004 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 16:54:40 +00:00
cc99ceac52
10,000
...
git-svn-id: file:///home/svn/framework3/trunk@10000 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 16:10:30 +00:00
bcbd691ea7
add a list chunk function
...
git-svn-id: file:///home/svn/framework3/trunk@9997 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 16:09:31 +00:00
10c2bfb64e
added validation for the meterpreter route command - thanks robin for pointing it out
...
git-svn-id: file:///home/svn/framework3/trunk@9993 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 06:12:05 +00:00
fb6b993492
added validation for the route command - thanks robin wood
...
git-svn-id: file:///home/svn/framework3/trunk@9992 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 06:11:10 +00:00
f48afb37a7
merge tftp.diff from scriptjunkie, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9991 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 03:25:43 +00:00
939bf2a881
merge dhcp.diif from scriptjunkie, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9990 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 03:11:30 +00:00
1b31a44b57
move riff support from ani_loadimage browser sploit to mixin
...
git-svn-id: file:///home/svn/framework3/trunk@9984 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-12 16:56:41 +00:00
040a292181
Create a new mixin that changes SMBUser/SMBPass to normal options, include this mixin within SMB modules that more often than not require authentication
...
git-svn-id: file:///home/svn/framework3/trunk@9981 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-12 15:00:58 +00:00
d540818f01
split http exploit mixin into http/server and http/client
...
git-svn-id: file:///home/svn/framework3/trunk@9971 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-07 06:59:16 +00:00
23a0064f9d
merge cleanup.diff from scriptjunkie, rewrote set_option, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9970 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-07 06:45:02 +00:00
9dacf8116e
remove rails dependency from module.replicant
...
git-svn-id: file:///home/svn/framework3/trunk@9969 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-07 05:57:58 +00:00
7f8bbbc535
add dhcp/pxe stuff from scriptjunkie, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9963 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-06 17:37:28 +00:00
52b2d0a495
add support for various options
...
git-svn-id: file:///home/svn/framework3/trunk@9962 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-06 17:21:22 +00:00
53e2a010cd
add -n (disable database) option for msfconsole, gives 33% startup time reduction
...
git-svn-id: file:///home/svn/framework3/trunk@9959 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-05 02:24:40 +00:00
f8fcc80874
fix silly typos, thx scriptjunkie - fixes #2330
...
git-svn-id: file:///home/svn/framework3/trunk@9952 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-03 16:07:48 +00:00
d7a4cd2096
fix next/break handling inside new loop -- fixes #2310
...
git-svn-id: file:///home/svn/framework3/trunk@9951 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-03 16:00:45 +00:00
2f384cde82
add alias for calling Msf::Exploit regenerate_payload explicitly -- fixes #2312
...
git-svn-id: file:///home/svn/framework3/trunk@9950 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-03 15:14:34 +00:00
e26d4ded08
Import the scanner and utility modules for the VxWorks WDB Agent service
...
git-svn-id: file:///home/svn/framework3/trunk@9945 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-02 05:56:26 +00:00
e81fd4a5fe
updated lab controller
...
git-svn-id: file:///home/svn/framework3/trunk@9941 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-29 03:50:31 +00:00
1c7ead1699
remove duped p_filesz entry, fixes #2307
...
git-svn-id: file:///home/svn/framework3/trunk@9937 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-27 18:03:18 +00:00
5fd9b689e7
updated lab backend
...
git-svn-id: file:///home/svn/framework3/trunk@9931 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-26 15:24:05 +00:00
09b73b594e
Changes in the comments and added function for deleting windows services
...
git-svn-id: file:///home/svn/framework3/trunk@9928 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-25 20:51:24 +00:00
1ae81367ac
Forgot, TABS not spaces for indent
...
git-svn-id: file:///home/svn/framework3/trunk@9921 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-25 01:54:29 +00:00
d279123b77
Added functions for managing services in the railgun api and created new calls to use this functions for starting, stopping and creating services, Thanks to Scriptjunkie for the calls and example code that I used to base the mixin calls on
...
git-svn-id: file:///home/svn/framework3/trunk@9920 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-25 01:32:50 +00:00
9a583b9e09
fix encoding. =/
...
git-svn-id: file:///home/svn/framework3/trunk@9918 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-24 01:04:58 +00:00
3ae1a26aef
include a bunch more firefox fingerprints. thanks Mark Fioravanti for the patch
...
git-svn-id: file:///home/svn/framework3/trunk@9917 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-23 22:20:05 +00:00
e957a7a90e
add support for doing everything msfpayload does into msfconsole and xmlrpc, fixes #589 . Thanks, Ryan Linn for the patch
...
git-svn-id: file:///home/svn/framework3/trunk@9914 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-23 20:22:36 +00:00
fbc4be6af4
support outputing selected columns instead of just address
...
git-svn-id: file:///home/svn/framework3/trunk@9913 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-22 16:53:11 +00:00
6e34bc5420
further clean up exception handling / session waiting for exploits
...
git-svn-id: file:///home/svn/framework3/trunk@9910 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 23:25:20 +00:00
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
fed1e88b7d
missed a file
...
git-svn-id: file:///home/svn/framework3/trunk@9908 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 22:37:49 +00:00
671d243aaa
put the stop command in core instead of base and default the extra argument to nil. this should allow a cleaner exit without breaking existing code (i hope). see #2247 (again) and also fixes #1010
...
git-svn-id: file:///home/svn/framework3/trunk@9907 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 22:37:26 +00:00
a5d179311f
fix session creation, *facepalm*
...
git-svn-id: file:///home/svn/framework3/trunk@9904 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 15:14:54 +00:00
b8b5d0586d
generate job info from available properties in rpc. fixes #2236
...
git-svn-id: file:///home/svn/framework3/trunk@9902 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 08:57:11 +00:00
8c5f10006f
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@9899 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 06:03:42 +00:00
0d8e98a519
handle validation errors more gracefully, check job_id, fixes #2279
...
git-svn-id: file:///home/svn/framework3/trunk@9898 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 00:50:25 +00:00
276a83d7b4
allow specifing which code to use for the exe
...
git-svn-id: file:///home/svn/framework3/trunk@9895 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 00:01:45 +00:00
45c869d015
revert the rpc.stop patch as it breaks other rpc stuff. i'll have a better fix for this later today.
...
git-svn-id: file:///home/svn/framework3/trunk@9890 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 20:36:09 +00:00
88c6bf13dd
apply patch from scriptjunkie to stop the xmlrpc daemon. fixes #2247
...
git-svn-id: file:///home/svn/framework3/trunk@9887 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 19:12:09 +00:00
08d705c1db
add java meterpreter and update java_calendar_deserialize to be able to use it, see #406
...
git-svn-id: file:///home/svn/framework3/trunk@9874 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 00:53:24 +00:00
33b479e696
adjust https handler status message
...
git-svn-id: file:///home/svn/framework3/trunk@9872 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 00:17:58 +00:00
7963d65f28
Only allow a single instance of a generated DLL to execute (prevent duplicate sessions, like with LNK)
...
git-svn-id: file:///home/svn/framework3/trunk@9871 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 23:24:57 +00:00
f87b7bc59e
Fix up the DLL payloads
...
git-svn-id: file:///home/svn/framework3/trunk@9868 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 22:13:34 +00:00
23fd327f30
Fixes the VulnerabilityListing class in the NeXpose API.
...
git-svn-id: file:///home/svn/framework3/trunk@9860 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 18:14:23 +00:00
d363efd883
slight changes to the vmware controller
...
git-svn-id: file:///home/svn/framework3/trunk@9850 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 22:19:38 +00:00
b6d506f078
centralize lab requires
...
git-svn-id: file:///home/svn/framework3/trunk@9849 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 22:19:17 +00:00
bcb62247dd
explicitly clear a module's job_id in case it was set in a previous run. Fixes #2267
...
git-svn-id: file:///home/svn/framework3/trunk@9847 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 21:47:00 +00:00
63595d1ce2
update exception handling to bail on RuntimeError or Interrupt, but wait otherwise.
...
git-svn-id: file:///home/svn/framework3/trunk@9845 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 19:58:41 +00:00
d9402edde3
Handle cases where the exploit succeeds but then throws an exception, printing the "exploit failed" message. Closes #2260
...
git-svn-id: file:///home/svn/framework3/trunk@9840 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-15 21:28:21 +00:00
9f5042c8ac
add the uripath back into the output of 'jobs -v'
...
git-svn-id: file:///home/svn/framework3/trunk@9835 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-15 03:27:02 +00:00
3c199b0364
Fixes #824 . PcapLog now works, and doesn't use racket nor packetfu -- just straight pcaprub, since I'm not doing anything exciting with them aside from saving to a file.
...
Also, it's a proper plugin now, not just a singleton, with a command dispather and everything.
Pretty much totoally rewritten. Since it hasn't worked for at least 5 months, I doubt anyone will be shocked by the API change.
git-svn-id: file:///home/svn/framework3/trunk@9834 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 20:38:19 +00:00
ac69cf72bb
Clone the module_store while we are at it
...
git-svn-id: file:///home/svn/framework3/trunk@9832 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 20:18:39 +00:00
97d3c9da8b
This may solve both of the scanner/bap cases for module cloning
...
git-svn-id: file:///home/svn/framework3/trunk@9831 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 20:16:22 +00:00
6b25b1024e
Always try to read the NB header first to get the length
...
git-svn-id: file:///home/svn/framework3/trunk@9826 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 17:07:10 +00:00
7710528432
Duplicate the report info string
...
git-svn-id: file:///home/svn/framework3/trunk@9825 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 17:06:44 +00:00
5c2f104ade
Fix module.replicant(), closes #2252
...
git-svn-id: file:///home/svn/framework3/trunk@9824 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 17:06:12 +00:00
ff204324e0
Do not fall through to YAML
...
git-svn-id: file:///home/svn/framework3/trunk@9823 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 17:05:47 +00:00
4b44fdb8c2
adds ftp data functionality from Thomas Ring, after some modifications
...
git-svn-id: file:///home/svn/framework3/trunk@9821 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 14:04:27 +00:00
c78b87a356
Add support for the ring0 stager_sysenter_hook payload to run its ring3 payload in a new thread in order to preserve/resume the original hijacked ring3 thread.
...
git-svn-id: file:///home/svn/framework3/trunk@9819 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 13:43:17 +00:00
c19e533ec9
Don't call it a success if AIX complains about all upcase logins.
...
git-svn-id: file:///home/svn/framework3/trunk@9813 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 22:30:45 +00:00
e765553d26
Fix BufferItem references
...
git-svn-id: file:///home/svn/framework3/trunk@9811 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 19:34:32 +00:00
9d859e4dce
Implements the client side of multi-call railgun
...
git-svn-id: file:///home/svn/framework3/trunk@9807 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 19:19:36 +00:00
e67e231659
Adds Rex::Text.to_hex_ascii(), replaces the gsub on the banner checks to use it.
...
git-svn-id: file:///home/svn/framework3/trunk@9804 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 18:52:27 +00:00
301d220c80
get rid of debugging alerts. wtf
...
git-svn-id: file:///home/svn/framework3/trunk@9800 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 07:58:50 +00:00
16851f56c9
Swizzle.
...
git-svn-id: file:///home/svn/framework3/trunk@9796 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 21:51:11 +00:00
a430970ddd
Wrap the write() calls to catch exceptions from the socket api
...
git-svn-id: file:///home/svn/framework3/trunk@9794 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 17:55:20 +00:00
e5d6214bf5
refactored lab libraries - now with more object orientation.
...
git-svn-id: file:///home/svn/framework3/trunk@9793 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 15:00:45 +00:00
5b3fa182ba
Switch back to dev mode
...
git-svn-id: file:///home/svn/framework3/trunk@9791 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 07:25:30 +00:00
37f4783d55
Adds -u to the connect command
...
git-svn-id: file:///home/svn/framework3/trunk@9788 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 03:15:45 +00:00
1dd2dd2315
add java as a regular platform
...
git-svn-id: file:///home/svn/framework3/trunk@9782 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-11 19:46:55 +00:00
cc963785fc
Bump to -release, final should be cut soon
...
git-svn-id: file:///home/svn/framework3/trunk@9763 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-10 15:18:34 +00:00
16134447d9
Cleanup / cosmetic for dcerpc, make EBADF pretend to be EOFError in terms of what exception is raised
...
git-svn-id: file:///home/svn/framework3/trunk@9752 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 19:05:16 +00:00
42f8dc10c0
Change the timeout from 0
...
git-svn-id: file:///home/svn/framework3/trunk@9750 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 18:03:48 +00:00
adf33feb0e
Catch an odd corner case with zero timeouts - this broke dcerpc over tcp
...
git-svn-id: file:///home/svn/framework3/trunk@9749 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 17:58:59 +00:00
2d65cb602b
Fix boolean handling
...
git-svn-id: file:///home/svn/framework3/trunk@9747 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 16:34:18 +00:00
573fc216dd
add write support, tftproot, output dir for tftp server
...
git-svn-id: file:///home/svn/framework3/trunk@9742 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 23:34:29 +00:00
e0d9c41b5f
did not write info when file did not exists, problem fixed
...
git-svn-id: file:///home/svn/framework3/trunk@9739 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 20:28:56 +00:00
978c0f30e3
updated get_vmx to handle the structure passed by the control shells. For instance: @lab['metasploitable'] = {"vmx" => "msf_lab/user/Metasploitable/Metasploitable.vmx", "user" => "user", "pass" => "user", "os" => "linux" }
...
git-svn-id: file:///home/svn/framework3/trunk@9737 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 19:13:20 +00:00
a4c6280ae0
Minor cleanups for railgun, fix 1.8/1.9 differences, remove use of string encoding routines for 1.8 back-compat
...
git-svn-id: file:///home/svn/framework3/trunk@9736 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 18:53:49 +00:00
4b1286522d
version bump for beta release
...
git-svn-id: file:///home/svn/framework3/trunk@9731 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 23:15:03 +00:00
2d0e49ca6f
adding in tod's patch ( http://www.0x0e.org/x/msf/vmware_lab_diff.tod.20100707 ) - adds neat functionality like being able to create a lab on the fly or from a set of files on disk.
...
git-svn-id: file:///home/svn/framework3/trunk@9730 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 22:56:26 +00:00
3049d527ef
there is no comm variable here, fixes #2200
...
git-svn-id: file:///home/svn/framework3/trunk@9728 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 20:49:49 +00:00
2de94b910b
more specificity
...
git-svn-id: file:///home/svn/framework3/trunk@9725 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 18:25:04 +00:00
08a75a0c8e
make shell_read_until_token more agressive
...
git-svn-id: file:///home/svn/framework3/trunk@9724 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 18:18:55 +00:00
c0aca105de
closes #2205 . This is actually part of the bigger datastore bug
...
git-svn-id: file:///home/svn/framework3/trunk@9722 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 18:14:51 +00:00
49955d2ca0
check for fileness instead of just existence, fixes #2204
...
git-svn-id: file:///home/svn/framework3/trunk@9720 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 17:42:18 +00:00
3aa3a642ac
move fingerprint verification to mixin
...
git-svn-id: file:///home/svn/framework3/trunk@9717 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 17:36:33 +00:00
2c5336dabb
attach job_id to the exploit, not just the driver; regenerate the uuid when replicating a module; generate the payload after copying the exploit module for a new job; fixes #2203 , see #2098 and #2096
...
git-svn-id: file:///home/svn/framework3/trunk@9714 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 16:37:23 +00:00
9915be8935
Add the railgun client extensions
...
git-svn-id: file:///home/svn/framework3/trunk@9712 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 16:31:24 +00:00
01c1d1d6df
Makes sure that Qualys reports only try to report sensible data -- fixes DB complaints about null in non-null contrained columns.
...
git-svn-id: file:///home/svn/framework3/trunk@9707 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 14:53:16 +00:00
dffd8c0c97
Deal with marshaled data for msfx imports.
...
git-svn-id: file:///home/svn/framework3/trunk@9699 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 00:28:34 +00:00
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
ce44b02a35
avoid returning nil info, try to look it up
...
git-svn-id: file:///home/svn/framework3/trunk@9693 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 21:53:24 +00:00
8898e2de8f
go back to copying the module for jobs. 'exploit -j' appears to work with the current changes. fixes #2096 and #2098 (for real this time)
...
git-svn-id: file:///home/svn/framework3/trunk@9692 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 21:09:53 +00:00
d5e9453a9c
Allow yaml for v1/v2, not for v3, tested
...
git-svn-id: file:///home/svn/framework3/trunk@9691 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 19:33:27 +00:00
812d715c35
Validate base64 before demarshal
...
git-svn-id: file:///home/svn/framework3/trunk@9690 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:40:19 +00:00
ef3dbf3841
Workaround for Ruby 1.8's fragile Marshal code
...
git-svn-id: file:///home/svn/framework3/trunk@9689 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:35:49 +00:00
7384dec65e
add virtual columns back per egyp7 request, see #2055
...
git-svn-id: file:///home/svn/framework3/trunk@9688 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:18:26 +00:00
2786427113
adding initial version of the lab controller - note that this will be updated to use vixr soon
...
git-svn-id: file:///home/svn/framework3/trunk@9687 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:18:06 +00:00
8f967af2f3
Dont fallback to yaml for service.info, its either base64 or a string
...
git-svn-id: file:///home/svn/framework3/trunk@9686 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:17:14 +00:00
7c9e39ab1d
make db_hosts -c conform to the -h text, fixes #2055
...
git-svn-id: file:///home/svn/framework3/trunk@9685 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 18:05:41 +00:00
618b377d58
let's try this again. don't convert datastore values to strings when copying, only dup things that are already Strings, see #2189 , #2098 , #2096
...
git-svn-id: file:///home/svn/framework3/trunk@9684 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 17:59:36 +00:00
5df5991d95
revert r9651, fixes #2189 . Clearly there is more going on when copying a datastore object
...
git-svn-id: file:///home/svn/framework3/trunk@9683 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 17:26:06 +00:00
24fbbfb906
use fat_offset, from Dino, fixes #2183
...
git-svn-id: file:///home/svn/framework3/trunk@9682 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 17:16:35 +00:00
7847a645cd
Remove the 'delete'
...
git-svn-id: file:///home/svn/framework3/trunk@9681 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 16:44:04 +00:00
fbdf5dca3c
Try the three-way fallback for serialized fields (service.info and note.data)
...
git-svn-id: file:///home/svn/framework3/trunk@9680 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 16:33:27 +00:00
a482f66cb9
Serialize service.info, handle all 3 forms of possible serialized data (marshal, yaml, and string)
...
git-svn-id: file:///home/svn/framework3/trunk@9679 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 16:20:04 +00:00
0d40a69f16
Dont mangle the service.info field this way
...
git-svn-id: file:///home/svn/framework3/trunk@9678 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 16:10:05 +00:00
5cff86cc1e
Use the module-defined workspace if specified
...
git-svn-id: file:///home/svn/framework3/trunk@9676 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 15:43:22 +00:00
f3afedf490
Fix an issue caused by pad_data being a string not an integer, this caused the evasion code to return a nil. Fixed a couple of ambiguities in how options are passed
...
git-svn-id: file:///home/svn/framework3/trunk@9674 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-05 13:38:39 +00:00
21b3be4f53
fix the payload display in jobs -v
...
git-svn-id: file:///home/svn/framework3/trunk@9673 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-04 23:40:11 +00:00
2250a83913
Updates meterpreter autoroute to accept CIDR notation.
...
git-svn-id: file:///home/svn/framework3/trunk@9667 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-03 01:27:24 +00:00
6a20b8f5f5
Fixing a typing error for banner timeouts on telnet.
...
git-svn-id: file:///home/svn/framework3/trunk@9665 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 21:33:38 +00:00
fb273e83a9
Updates autoroute to enforce sensible netmasks. This is serious business.
...
git-svn-id: file:///home/svn/framework3/trunk@9664 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 18:42:56 +00:00
01139ed655
Adding an autoroute meterpreter script, and enabling route housekeeping to be stored and retrived via Sessions directly, rather than through Rex::Socket::SwitchBoard.
...
git-svn-id: file:///home/svn/framework3/trunk@9663 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 17:38:56 +00:00
07ef50e4e1
don't copy modules for jobs. fixes 'exploit -j' which was unable to create sessions, but reopens #2096 and #2098
...
git-svn-id: file:///home/svn/framework3/trunk@9662 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 02:46:07 +00:00
1c9059eeb1
standardize job context as an Array and always copy datastore for jobs. fixes #2096 and fixes #2098
...
git-svn-id: file:///home/svn/framework3/trunk@9652 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 22:02:46 +00:00
37da4be3e4
do a deep copy of the datastore when replicating a module
...
git-svn-id: file:///home/svn/framework3/trunk@9651 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 21:57:24 +00:00
c0eaed263c
abstract some copy-paste; add DataStore#copy for doing a deep copy instead of the shallow copy performed by #dup and #clone
...
git-svn-id: file:///home/svn/framework3/trunk@9650 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 21:56:38 +00:00
f1c7fc79de
remove to_s methods that reference a non-existent attribute. fixes .inspect on instances of Opt*. I have no idea how this bug never showed up before
...
git-svn-id: file:///home/svn/framework3/trunk@9649 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 21:52:30 +00:00
864fcafb4a
See #2167 . This should make all platforms equal now in terms of how read selects are handled. It looks like OS X needs the same workaround as Windows
...
git-svn-id: file:///home/svn/framework3/trunk@9641 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 14:49:49 +00:00
03918eeeda
Adds an explicit function for import file validation acceptability.
...
git-svn-id: file:///home/svn/framework3/trunk@9636 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-30 15:28:49 +00:00
7e247e2f29
db migration to convert services info from varchar(65535) to text, and save info as a yaml'ed form in order to preserve funny characters.
...
git-svn-id: file:///home/svn/framework3/trunk@9633 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-28 22:42:50 +00:00
aecb6cd43f
Prevent a loop condition noted by commonism
...
git-svn-id: file:///home/svn/framework3/trunk@9631 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-28 14:40:11 +00:00
d488f133cf
log the number of modules db_autopwn will try
...
git-svn-id: file:///home/svn/framework3/trunk@9628 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 22:32:39 +00:00
d4c558b0d0
use the calculated address for :target_host since session.target_host is nil for client exploits
...
git-svn-id: file:///home/svn/framework3/trunk@9625 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 18:33:41 +00:00
96cd7bddae
compatibility for 1.9. fixes #2143
...
git-svn-id: file:///home/svn/framework3/trunk@9622 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 05:52:05 +00:00
63a563c20b
Add disclosure_date method
...
git-svn-id: file:///home/svn/framework3/trunk@9619 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 04:21:23 +00:00
83d3e3cbac
1.9 fixes, see 2143
...
git-svn-id: file:///home/svn/framework3/trunk@9618 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 04:03:58 +00:00
01702e8506
don't rescue IOError.
...
git-svn-id: file:///home/svn/framework3/trunk@9616 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 00:31:00 +00:00
6e01b03767
IO.select has different behavior when a socket is closed, go back to Rex::ThreadSafe.select; fixes portfwd
...
git-svn-id: file:///home/svn/framework3/trunk@9615 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 00:28:49 +00:00
f0a4812644
add special encoder for piranha_passwd_exec vuln (rh62)
...
git-svn-id: file:///home/svn/framework3/trunk@9613 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 22:36:51 +00:00
b3e5fec174
Fixing misplaced puts from r9606
...
git-svn-id: file:///home/svn/framework3/trunk@9612 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 20:34:36 +00:00
32fa35d53f
Undoing r9607.
...
git-svn-id: file:///home/svn/framework3/trunk@9610 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 16:44:09 +00:00
6280c51382
Adding Java to the platform list (mainly so module_ports.rb will work again)
...
git-svn-id: file:///home/svn/framework3/trunk@9607 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 14:17:09 +00:00
19d6ee5edf
add compat for KEXDH_GEX_REQUEST_OLD
...
git-svn-id: file:///home/svn/framework3/trunk@9606 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 06:24:43 +00:00
9c0bcb4bad
Add timeouts to the retry category, helps with the nexpose instance is heavily loaded
...
git-svn-id: file:///home/svn/framework3/trunk@9604 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 03:43:32 +00:00
5f9680d902
Fixes #2133 . This seems to handle many keyfiles pretty well, even if they're concatenated together. Calling it closed.
...
git-svn-id: file:///home/svn/framework3/trunk@9602 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 01:00:08 +00:00
ec0e8aba30
Cosmetic changes, renamed mixin function and now all scripts that generate logs they are saved to .msf3/logs/scripts
...
git-svn-id: file:///home/svn/framework3/trunk@9588 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-23 00:50:14 +00:00
4953b3b69f
If the :fix_services option is used for nmap, actually fix the services, and in addition, skip hosts which only present filtered ports.
...
git-svn-id: file:///home/svn/framework3/trunk@9585 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 22:37:14 +00:00
3591143f3a
When importing MSFX data, just report unique collateral once.
...
git-svn-id: file:///home/svn/framework3/trunk@9584 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 20:30:43 +00:00
171543624a
fix typos
...
git-svn-id: file:///home/svn/framework3/trunk@9581 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 16:11:02 +00:00
3f7dbaaaac
check the database for a previous fingerprint before going out to the network
...
git-svn-id: file:///home/svn/framework3/trunk@9580 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 06:30:48 +00:00
f14b3221ca
move http version reporting into the HttpClient mixin
...
git-svn-id: file:///home/svn/framework3/trunk@9579 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 01:39:43 +00:00
ef5c0f77eb
move copy-paste into a mixin
...
git-svn-id: file:///home/svn/framework3/trunk@9576 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 00:46:52 +00:00
83962cb24a
be explicit about returning false when we couldn't find a vncviewer
...
git-svn-id: file:///home/svn/framework3/trunk@9573 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-22 00:09:50 +00:00
2c91164494
allow x64 payloads to be used with psexec
...
git-svn-id: file:///home/svn/framework3/trunk@9565 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-21 03:49:39 +00:00
613f288226
Fix up ssh_login_pubkey's session management for more effective session reuse.
...
git-svn-id: file:///home/svn/framework3/trunk@9563 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-19 15:03:27 +00:00
161ae211c4
add a capabilities hash to the meterpreter client for determining whether libs are available on the server. eventually there should be a way to request this from the server directly instead of inferring it from platform
...
git-svn-id: file:///home/svn/framework3/trunk@9561 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 23:15:48 +00:00
025cfa9286
break to_war out from to_jsp_war
...
git-svn-id: file:///home/svn/framework3/trunk@9559 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 21:54:33 +00:00
20dd7ca26b
make 100% line up correctly
...
git-svn-id: file:///home/svn/framework3/trunk@9554 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 03:37:23 +00:00
50c59a9ab1
Skip nmap port imports where the result is unknown and the target is really localhost.
...
git-svn-id: file:///home/svn/framework3/trunk@9553 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 03:03:11 +00:00
ebe48096f3
put the original suspend handler back, even if it was nil. fixes 2102
...
git-svn-id: file:///home/svn/framework3/trunk@9547 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 22:41:53 +00:00
3e38aa9cd4
put the old sigint handler back, fixes #2103
...
git-svn-id: file:///home/svn/framework3/trunk@9546 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 21:57:46 +00:00
b35baa39f7
allow PHPInclude modules to run automatically
...
git-svn-id: file:///home/svn/framework3/trunk@9545 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 21:16:15 +00:00
3d98f22ef4
Un-private-ing :range
...
git-svn-id: file:///home/svn/framework3/trunk@9537 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 19:12:31 +00:00
9924a8d40e
Incorporates a service name map that makes nmap scanning a little more useful for MSFX out of the gate.
...
git-svn-id: file:///home/svn/framework3/trunk@9536 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 18:22:42 +00:00
cb69b0c134
Fixes #2101 . Introduces a proper :skip_user, and adds better comment docs to auth_brute to describe the intended use of each return code.
...
git-svn-id: file:///home/svn/framework3/trunk@9529 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-15 19:10:15 +00:00
f4670b26d0
sessions -s was passing unnecesary arguments to scripts, fixeed conflict for scripts that use the -s option
...
git-svn-id: file:///home/svn/framework3/trunk@9508 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-13 01:25:18 +00:00
1b5e35b059
Fixes #2089 . Getting rid of zip_requires() in favor of always loading Zip, Dirtmp, and FileUtils.
...
git-svn-id: file:///home/svn/framework3/trunk@9496 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 21:21:59 +00:00
d4e6e75f7d
Handle loot, tasks, and report times that come from a MSFX ZIP report.
...
git-svn-id: file:///home/svn/framework3/trunk@9493 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 18:56:16 +00:00
f6901861fa
allow host specifications like 'range, range' e.g. '10.1.1.0/24, 10.2.2.1'. Note that the space is required
...
git-svn-id: file:///home/svn/framework3/trunk@9489 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 17:20:14 +00:00
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
6fc84364b5
make PlatformList a little more like an Array
...
git-svn-id: file:///home/svn/framework3/trunk@9479 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 05:20:40 +00:00
6f37ea2aeb
Adding a 3rd party zip library (rubyzip by Thomas Sondergaard and Technorama Ltd, released under the Ruby license), and a method to import ZIP reports generated by Metasploit Express (still needs work, but is mildly functional right now).
...
git-svn-id: file:///home/svn/framework3/trunk@9478 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-10 21:06:06 +00:00
ec439354b0
Dropping the summary info. It's often incorrect.
...
git-svn-id: file:///home/svn/framework3/trunk@9469 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-10 13:24:43 +00:00
ef372a9d78
Adds the db_sync command
...
git-svn-id: file:///home/svn/framework3/trunk@9466 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-09 21:47:57 +00:00
4f2c63dae7
add templates for creating linux armle ELFs, thanks Civ
...
git-svn-id: file:///home/svn/framework3/trunk@9455 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-09 07:20:21 +00:00
d4e1da2fc9
Fixes amap log importing, hopefully once and for all.
...
git-svn-id: file:///home/svn/framework3/trunk@9454 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-08 22:14:25 +00:00
38674cf62f
Implements callbacks for importing data from vulnerability scanners.
...
git-svn-id: file:///home/svn/framework3/trunk@9452 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-08 19:16:20 +00:00
dd71e4ac58
Fixes #2034 . Adds the SINGLE_SESSION option, adds an ftp_quit method to handle sending QUIT and disconnecting.
...
git-svn-id: file:///home/svn/framework3/trunk@9451 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-08 16:30:03 +00:00
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
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
a0e252ad75
See #2034 . This adds a pretty decent reconnection handler -- keep trying until you're dropped, so this is handy for sites that greylist the banner display.
...
Also ensures that anonymous:somebrowserID is always checked.
git-svn-id: file:///home/svn/framework3/trunk@9447 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 21:37:29 +00:00
6950cae916
more legible inspect for meterpreter packets
...
git-svn-id: file:///home/svn/framework3/trunk@9445 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 15:20:24 +00:00
394f292c4a
fix handling of '100 Continue' responses
...
git-svn-id: file:///home/svn/framework3/trunk@9444 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-06 19:48:33 +00:00
eee1194e82
Removing old wmap lib
...
git-svn-id: file:///home/svn/framework3/trunk@9443 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-06 03:55:21 +00:00
432284ce5a
Handle multiple versions of Metasploit Express XML files.
...
git-svn-id: file:///home/svn/framework3/trunk@9431 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-04 18:54:50 +00:00
c6da645a93
First part of a db import overhaul. Next up: implementing callbacks so the user can follow along with the import to get a sense of where they're at.
...
git-svn-id: file:///home/svn/framework3/trunk@9426 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-04 14:57:58 +00:00
694b70208a
Fix rhost/rport for auth_brute
...
git-svn-id: file:///home/svn/framework3/trunk@9408 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-03 17:58:57 +00:00
e4c2a74915
DIY on the iconv stuff. just load the arrays once, plz.
...
git-svn-id: file:///home/svn/framework3/trunk@9407 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-03 17:35:58 +00:00
a5a318f623
Workaround for a lack of Iconv for performing EBCDIC/ASCII conversions
...
git-svn-id: file:///home/svn/framework3/trunk@9406 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-03 17:28:45 +00:00
7039bc3461
change "local port" to "listen port", see #2005
...
git-svn-id: file:///home/svn/framework3/trunk@9395 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-02 16:23:46 +00:00
d242143518
Allow for spaces and funny characters in usernames and passwords
...
git-svn-id: file:///home/svn/framework3/trunk@9390 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 22:44:50 +00:00
d41e94050e
See #2034 . This adds a basic FTP bruteforce module. It also makes some minor changes to auth_brute (allows for both SMB and FTP credentials to get mapped to the basic 'USERNAME' and 'PASSWORD' datastores), and touches up the other FTP modules slightly.
...
git-svn-id: file:///home/svn/framework3/trunk@9388 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 18:17:26 +00:00
055ec7d768
session handler stub for php meterpreter
...
git-svn-id: file:///home/svn/framework3/trunk@9387 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 17:01:42 +00:00
c1371c8758
add a method for checking if we support ssl and make sure we do before trying initializing the client
...
git-svn-id: file:///home/svn/framework3/trunk@9386 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 17:00:00 +00:00
87379e798a
Bump the timeout for hashdump, handle large DCs better, thanks Chris!
...
git-svn-id: file:///home/svn/framework3/trunk@9385 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 16:45:34 +00:00
5b6b13e7e8
check for existence before using stuff
...
git-svn-id: file:///home/svn/framework3/trunk@9384 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 16:35:10 +00:00
0dfe0c38be
use quotes to avoid php warnings, encoders should take care of it anyway
...
git-svn-id: file:///home/svn/framework3/trunk@9383 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 16:26:48 +00:00
766b591988
Add -o to db_hosts, write the list of hosts to a file
...
git-svn-id: file:///home/svn/framework3/trunk@9381 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-30 13:49:28 +00:00
845407a356
Allow interrupts to break out of recvfrom
...
git-svn-id: file:///home/svn/framework3/trunk@9380 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-29 06:52:47 +00:00
288b700e75
remove silly debugging statements
...
git-svn-id: file:///home/svn/framework3/trunk@9377 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 22:46:22 +00:00
6d1e7bdaa5
big commit - lots of cmdstager changes
...
created 4 cmd stagers (instead of just one): CmdStagerVBS, CmdStagerDebugAsm, CmdStagerDebugWrite, CmdStagerTFTP
created a TFTPServer mixin
created Msf::Exploit::EXE mixin to generate executables
updated all uses of CmdStager to use CmdStagerVBS for the time being
add exploit for cve-2001-0333 using CmdStagerTFTP
updated tftp server to wait for transfers to finish (up to 30 seconds) before shutting down
write debug.exe stager stub in 16-bit assembly (used in CmdStagerDebugAsm)
git-svn-id: file:///home/svn/framework3/trunk@9375 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 22:39:56 +00:00
ecba10c4fd
switch to ::IO.select
...
git-svn-id: file:///home/svn/framework3/trunk@9374 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 22:11:42 +00:00
1e47a49b7e
match whitespace to the rbreadline standard instead of the msf standard
...
git-svn-id: file:///home/svn/framework3/trunk@9373 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 19:54:32 +00:00
2555392fc8
tab complete OptPath options
...
git-svn-id: file:///home/svn/framework3/trunk@9372 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 17:02:58 +00:00
350ac4fb7c
grammar!
...
git-svn-id: file:///home/svn/framework3/trunk@9371 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 15:40:12 +00:00
3ce61ca466
grammar!
...
git-svn-id: file:///home/svn/framework3/trunk@9370 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 15:38:13 +00:00
def1af53ad
remove executable property
...
git-svn-id: file:///home/svn/framework3/trunk@9369 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 01:14:46 +00:00
110e0c8404
Allow for an IP range notation of "10.1.1.1-10.255.255.255" . This is equivalent to "10.1-255.1-255.1-255" but is more natural for some people not familiar with the nmap-style notation. Note that there must be no spaces around the hyphen. In the case of "10.1.1.1 - 10.255.255.255", this will merely fail normally. In the case of "10.1.1.1- 10.255.255.255," you will end up with a funny range of 10.1.1.1-255 and 10.255.255.255, since the space after the hyphen denotes "until the end of the octet space."
...
git-svn-id: file:///home/svn/framework3/trunk@9368 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-25 22:44:55 +00:00
563ab310dc
Strengthening up the checks for valid formats for CIDR address ranges when passed to Rex::Socket::RangeWalker
...
git-svn-id: file:///home/svn/framework3/trunk@9366 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-25 20:46:00 +00:00
6167fbe2a3
leave the database commands in all the time and warn if there's no connection, fixes #1923
...
git-svn-id: file:///home/svn/framework3/trunk@9361 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-25 01:32:30 +00:00
7b7e2f6e0c
add tab completion to db_import
...
git-svn-id: file:///home/svn/framework3/trunk@9360 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 23:38:45 +00:00
8b9eb25664
Load rubygems before changing Encoding.default_internal ( fixes #1914 )
...
git-svn-id: file:///home/svn/framework3/trunk@9359 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 23:07:56 +00:00
d90656be0e
Improve error logging when modules fail to load.
...
* Don't print module file path twice on the same line
* Use print_error instead of print
* Remove unnecessary newlines
git-svn-id: file:///home/svn/framework3/trunk@9358 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 23:07:52 +00:00
a6d39ca581
add tab completion for filenames. works fine with real readline, only does current directory in rbreadline, see #664
...
git-svn-id: file:///home/svn/framework3/trunk@9357 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 22:57:27 +00:00
afd52bd798
Change the base value used for calculating the system call numbers and
...
arguments in aix.rb
git-svn-id: file:///home/svn/framework3/trunk@9353 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 18:07:15 +00:00
d31dd35f62
Fixes #2004 . Add back the timeout argument to sunrpc_call method.
...
git-svn-id: file:///home/svn/framework3/trunk@9349 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-24 00:57:18 +00:00
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
df5ce05fa1
Whitespace for the tests.
...
git-svn-id: file:///home/svn/framework3/trunk@9345 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-22 15:48:02 +00:00
3e80e6ce87
See #2002 . Adds a standard, native NTLM library for Ruby that lends itself very well to HTTP authentication. (Ruby licensed by yrock and Minero Aoki)
...
Usage: See lib/net/ntlm.rb.ut.rb
git-svn-id: file:///home/svn/framework3/trunk@9344 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 21:37:45 +00:00
a6795c4714
add EXE exploit mixin
...
git-svn-id: file:///home/svn/framework3/trunk@9340 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 06:20:10 +00:00
83adc3f391
switch to ::IO.select
...
git-svn-id: file:///home/svn/framework3/trunk@9339 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 05:02:52 +00:00
872575209f
Fix a corner case with udp send destinations already having a ::ffff: prefix
...
git-svn-id: file:///home/svn/framework3/trunk@9338 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 05:01:14 +00:00
21130bc38a
replace hardcoded numbers with friendly constants
...
git-svn-id: file:///home/svn/framework3/trunk@9334 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 00:15:10 +00:00
957b1432ed
add simple tftp server
...
git-svn-id: file:///home/svn/framework3/trunk@9333 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 00:03:04 +00:00
15cee53b41
move tab completion setup out of init_ui. fixes #1180
...
git-svn-id: file:///home/svn/framework3/trunk@9332 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 23:47:49 +00:00
851b68d9ab
make sure the session has ui handles before running the upexec, see #1982
...
git-svn-id: file:///home/svn/framework3/trunk@9331 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 23:30:03 +00:00
dfa7fb7d0b
Move away from Kernel.select in exchange for IO.select, solves some issues with windows compatibility
...
git-svn-id: file:///home/svn/framework3/trunk@9330 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 20:42:17 +00:00
088d501095
default to postgres
...
git-svn-id: file:///home/svn/framework3/trunk@9328 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 19:37:46 +00:00
87ba4a9594
Fixes #1990 . Turns out, we were counting on resolved hostnames, and skipping anything with an unresolved IP address.
...
git-svn-id: file:///home/svn/framework3/trunk@9327 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 14:08:29 +00:00
8e648dc7e0
proto is not required, fixes #1976
...
git-svn-id: file:///home/svn/framework3/trunk@9326 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-19 19:08:08 +00:00
346f1b715f
bump version to 3.4.1-dev
...
git-svn-id: file:///home/svn/framework3/trunk@9325 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-19 16:20:21 +00:00
be6520c52b
Racket should not require rubygems
...
git-svn-id: file:///home/svn/framework3/trunk@9323 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-18 23:16:51 +00:00
a29371647f
Force cygwin to use the Rex::ThreadSafe.select code
...
git-svn-id: file:///home/svn/framework3/trunk@9322 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-18 15:11:19 +00:00
Joshua Drake
HD Moore
James Lee
pks
Tod Beardsley
Carlos Perez
Matt Weeks
Stephen Fewer
Jonathan Cran
Mike Smith
Ramon de C Valle