James Lee
44fa5c67a6
fix a latent issue with windows paths surrounded by quotes
...
git-svn-id: file:///home/svn/framework3/trunk@10763 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 09:50:12 +00:00
HD Moore
182943fe6c
This change allows IPv6 addresses to be ignored by passing false as a second parameter to getaddress()
...
git-svn-id: file:///home/svn/framework3/trunk@10761 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 01:27:00 +00:00
HD Moore
9d99bf1039
Store the original error code in the RequestError object as well, use this code to determine whether to raise a connect error or not
...
git-svn-id: file:///home/svn/framework3/trunk@10759 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 01:05:50 +00:00
Joshua Drake
e114f373b0
move content-disposition header before content-type, per rfc1867 examples
...
git-svn-id: file:///home/svn/framework3/trunk@10724 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 07:01:54 +00:00
HD Moore
467fceb2a7
Fixes #2692 by retrying writes when the sendQ is full.
...
git-svn-id: file:///home/svn/framework3/trunk@10712 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-16 21:50:03 +00:00
HD Moore
3e09fc30ae
Fixes #2070 by adding finalizers to process, event, thread, registry, and channels.
...
git-svn-id: file:///home/svn/framework3/trunk@10711 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-16 19:39:11 +00:00
Tod Beardsley
f7bb3b82de
Fixes #2952 . Instead of raising an error when we hit the end of all possibles in converge_sets, just return what's left in the buffer, since it happens to be right anyway.
...
The associated test cases demonstrate that this doesn't cause any trouble (even with silly values) and nothing uses converged_sets except for pattern_create.
git-svn-id: file:///home/svn/framework3/trunk@10696 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-15 19:40:33 +00:00
James Lee
238242ecb9
add latest nessus plugin patches from Zate, fixes #2704
...
git-svn-id: file:///home/svn/framework3/trunk@10685 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:54:35 +00:00
Joshua Drake
c7fc361140
apply patch from Peter, see #684
...
git-svn-id: file:///home/svn/framework3/trunk@10657 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 17:29:35 +00:00
HD Moore
dbbd0dc07e
This ensures that even if some wonky string encoding is passed as the body of a HTTP reply, it will be treated as binary. Fixes some of the HTTP Server exploits on Windows
...
git-svn-id: file:///home/svn/framework3/trunk@10653 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 16:16:39 +00:00
HD Moore
0b82de4846
Force binmode for Tempfile use to prevent issues with Windows
...
git-svn-id: file:///home/svn/framework3/trunk@10650 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 01:48:42 +00:00
HD Moore
2d425d2e67
Make our Quickfile's always binary mode
...
git-svn-id: file:///home/svn/framework3/trunk@10649 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-12 01:42:08 +00:00
HD Moore
5a2444eb24
Clean up web_vuln import, use additional fields
...
git-svn-id: file:///home/svn/framework3/trunk@10635 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 02:57:07 +00:00
Joshua Drake
e408d5a155
add windows error messages for windows meterpreter sessions, minor cleanups
...
git-svn-id: file:///home/svn/framework3/trunk@10605 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 19:36:34 +00:00
HD Moore
41183d3395
Bump the packet queue timeout as well (10 minutes), which should handle even the worst lag
...
git-svn-id: file:///home/svn/framework3/trunk@10598 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 05:00:03 +00:00
HD Moore
9489c2fa58
Note on thread safety
...
git-svn-id: file:///home/svn/framework3/trunk@10597 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:55:06 +00:00
HD Moore
2e9138ebbc
This commit overhauls much of the meterpreter timeouts and staging processes. This fixes a bug with concurrent session handling, reduces CPU load by caching a single SSL certificate for all sessions, increases all of the critical timeouts, and generally makes mass ownage work better. We still need to limit the maximum number of concurrent on_session() threads to something sane to prevent sesssion spikes from dragging out the process even longer. The C-side meterpreter change is minimal and will only help with future compatibility if we move to non-blocking fd's for the SSL socket.
...
git-svn-id: file:///home/svn/framework3/trunk@10595 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 04:11:47 +00:00
HD Moore
e4a00b2fd1
Handle a larger backlog
...
git-svn-id: file:///home/svn/framework3/trunk@10594 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-08 03:20:09 +00:00
pks
754225a80d
Implement per dispatch run channel_write of packets, remove __FUNCTION__ due to dprintf changes, and fix shutting down networkpug interfaces. Re-add networkpug binary.
...
git-svn-id: file:///home/svn/framework3/trunk@10586 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 11:52:38 +00:00
HD Moore
6a47af814a
Basic, still buggy support for NetSparker XML
...
git-svn-id: file:///home/svn/framework3/trunk@10585 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 06:24:26 +00:00
HD Moore
1afba58f94
Fix typos
...
git-svn-id: file:///home/svn/framework3/trunk@10584 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 04:16:48 +00:00
HD Moore
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
HD Moore
1e75603894
Add a Quickfile class that is identical to Tempfile except for the finalizer
...
git-svn-id: file:///home/svn/framework3/trunk@10568 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 17:57:56 +00:00
Tod Beardsley
4e7e69f768
Avoid GC issue with Tempfiles in meterpreter's command dispatcher.
...
git-svn-id: file:///home/svn/framework3/trunk@10567 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 17:26:33 +00:00
HD Moore
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
HD Moore
1b4190df38
This commit brings configurability to TCP Servers as to which Comm they use. The ReverseListenerComm and ListenerComm advanced options can be used to prevent a given listener from trying to bind a listener over the pivoted routed. This is useful for a number of situations and not possible to configure explicitly before.
...
git-svn-id: file:///home/svn/framework3/trunk@10534 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 02:11:22 +00:00
pks
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
pks
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
Joshua Drake
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
HD Moore
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
James Lee
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
James Lee
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
Joshua Drake
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
HD Moore
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
pks
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
pks
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
Joshua Drake
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
Joshua Drake
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
Joshua Drake
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
Joshua Drake
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
HD Moore
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
HD Moore
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
HD Moore
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
HD Moore
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
Stephen Fewer
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
Stephen Fewer
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
HD Moore
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
Stephen Fewer
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
Stephen Fewer
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
HD Moore
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