Matt Weeks
067c612d9e
Make creds visible to RPC and GUI.
...
git-svn-id: file:///home/svn/framework3/trunk@11602 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 20:09:18 +00:00
Matt Weeks
3b7253aa8b
Add generic support for post modules.
...
Now supporting options.
Also, code clean up and better comments
git-svn-id: file:///home/svn/framework3/trunk@11582 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-16 00:06:22 +00:00
Matt Weeks
71ff357bf1
Add support for bypassuac and SNMP post modules and update scripts which have been converted to post modules.
...
git-svn-id: file:///home/svn/framework3/trunk@11578 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-14 04:05:14 +00:00
Stephen Fewer
41e5a4c61d
Fix for #3482 , the empty value occurs when no service pack is present. The fix simply tests for this. Also remove the two unused params on the _snprintf call.
...
git-svn-id: file:///home/svn/framework3/trunk@11542 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-11 14:29:16 +00:00
Matt Weeks
d25cda1f74
Add sound recording support to GUI.
...
git-svn-id: file:///home/svn/framework3/trunk@11530 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-10 02:50:45 +00:00
Matt Weeks
91151f1d1d
Update persistence options dialog.
...
git-svn-id: file:///home/svn/framework3/trunk@11522 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-08 18:27:21 +00:00
Matt Weeks
b2ed512f44
Fix advanced/evasion opts display.
...
git-svn-id: file:///home/svn/framework3/trunk@11510 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-07 21:01:41 +00:00
Matt Weeks
b098690d5c
Can now save webcam frame; console history now kept per-window.
...
git-svn-id: file:///home/svn/framework3/trunk@11487 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 17:55:44 +00:00
HD Moore
4971a0d7af
Add Skylined's "You Got Pwned" payload
...
git-svn-id: file:///home/svn/framework3/trunk@11485 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 17:34:09 +00:00
HD Moore
5d23306f01
Add bypassuac source to the tree
...
git-svn-id: file:///home/svn/framework3/trunk@11484 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 17:30:20 +00:00
Matt Weeks
99ab6a59dd
Msfgui fixes:
...
Make module window work better with smaller screens.
Fix option title display issues on GTK and in smaller windows.
RPC backend handles tabs and avoids crash on embedded nulls.
Cancelling exit confirmation aborts exit.
Reopening file browser and other session windows is faster and saves location.
Remove defunct vendor on about window.
git-svn-id: file:///home/svn/framework3/trunk@11461 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-02 22:34:27 +00:00
HD Moore
5875fdb701
Two new SNMP community enumeration tools for Windows by tebo (local account list and SMB shares). Addition of a Meterpreter script for snagging the SNMP community from the registry
...
git-svn-id: file:///home/svn/framework3/trunk@11410 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-25 06:08:34 +00:00
Matt Weeks
a3126ad8b5
Fix typo error on re-selecting stored target while loading a previously run module.
...
git-svn-id: file:///home/svn/framework3/trunk@11379 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-20 01:59:29 +00:00
Matt Weeks
d390c2eb80
Reduce number of menu items on module lists to work with a little bit smaller screens and clean up log output.
...
git-svn-id: file:///home/svn/framework3/trunk@11378 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-20 00:57:38 +00:00
Matt Weeks
599df0a71a
Fix error with recording on certain Windows versions.
...
git-svn-id: file:///home/svn/framework3/trunk@11311 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 20:12:03 +00:00
Matt Weeks
d28cc9bb5a
Fixes #3290 , allows address to be specified in an address bar and allows downloading multiple files.
...
git-svn-id: file:///home/svn/framework3/trunk@11229 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-05 20:06:28 +00:00
Matt Weeks
afa572e03b
Fix issue with scroll bars not being shown when many sessions were visible but the window had been resized to a small size.
...
git-svn-id: file:///home/svn/framework3/trunk@11184 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 23:52:25 +00:00
James Lee
191c4e8eb7
make java_signed_applet work with generic java payloads, but keep the default target as Windows/x86 since it is by far the most common victim.
...
git-svn-id: file:///home/svn/framework3/trunk@11172 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 03:50:40 +00:00
Matt Weeks
aa827488cd
Auto-load database connection info from windows install into database connection dialog if connection info is missing.
...
git-svn-id: file:///home/svn/framework3/trunk@11170 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-30 01:34:26 +00:00
Matt Weeks
3812aa95f4
Add webcam support to GUI.
...
git-svn-id: file:///home/svn/framework3/trunk@11161 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-29 02:31:59 +00:00
Matt Weeks
61242f3c2c
Catch invalid webcam frame requests.
...
git-svn-id: file:///home/svn/framework3/trunk@11160 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-29 02:23:01 +00:00
Matt Weeks
c3f98de6f5
Add task scheduler permissions escalation support to GUI.
...
git-svn-id: file:///home/svn/framework3/trunk@11153 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-25 15:48:05 +00:00
James Lee
90182c01f5
update documentation for executable dropper, thanks mihi
...
git-svn-id: file:///home/svn/framework3/trunk@11105 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 00:58:17 +00:00
James Lee
85a4eb703c
remove examples. if a user wants examples, they can build them.
...
git-svn-id: file:///home/svn/framework3/trunk@11104 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-23 00:56:54 +00:00
Matt Weeks
2e72926638
Add audio (microphone) recording support to stdapi.
...
git-svn-id: file:///home/svn/framework3/trunk@11087 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 00:32:39 +00:00
James Lee
6f7af42667
add an exploit for cve-2010-3563, thanks Matthias Kaiser
...
git-svn-id: file:///home/svn/framework3/trunk@11078 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 23:02:35 +00:00
Matt Weeks
c424d6b403
Make options more consistent when launching a handler.
...
git-svn-id: file:///home/svn/framework3/trunk@11054 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-17 00:26:39 +00:00
Matt Weeks
2a333d8106
Properly handle cancelling certain GUI commands, and issuing them multiple times, etc.
...
git-svn-id: file:///home/svn/framework3/trunk@11044 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-14 20:39:14 +00:00
Matt Weeks
7f53f36150
Sanity check on connecting. Also IDE update.
...
git-svn-id: file:///home/svn/framework3/trunk@11043 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-14 20:12:20 +00:00
Matt Weeks
560c1847c3
Properly return error if no webcams present (instead of killing session).
...
git-svn-id: file:///home/svn/framework3/trunk@11041 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-14 19:59:31 +00:00
Matt Weeks
bbf5cb9e5f
Typo.
...
git-svn-id: file:///home/svn/framework3/trunk@11040 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-14 19:57:48 +00:00
Matt Weeks
594a46bfc7
Merge webcam extension into stdapi.
...
git-svn-id: file:///home/svn/framework3/trunk@10997 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:36:54 +00:00
James Lee
85640627ab
add ability to drop an executable from the jar. see #406 , thanks mihi
...
git-svn-id: file:///home/svn/framework3/trunk@10973 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-10 19:54:56 +00:00
Matt Weeks
2d2e1989aa
Fix memory leak.
...
git-svn-id: file:///home/svn/framework3/trunk@10964 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-09 23:37:56 +00:00
Matt Weeks
db602dd478
Add functional in-memory webcam support.
...
git-svn-id: file:///home/svn/framework3/trunk@10954 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-09 02:24:28 +00:00
Matt Weeks
ec70016b53
Don't update data if no data received.
...
git-svn-id: file:///home/svn/framework3/trunk@10934 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 19:43:47 +00:00
Matt Weeks
7d6add8a35
Fix prompt error, update prompt even if no data received.
...
git-svn-id: file:///home/svn/framework3/trunk@10931 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 17:38:29 +00:00
Matt Weeks
f15b370127
And add logging.
...
git-svn-id: file:///home/svn/framework3/trunk@10930 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 17:04:47 +00:00
Matt Weeks
bc983ea52c
Run meterpreter GUI commands in background to not interfere with active shell or other channel interaction.
...
Also simplify calling commands in file browser and process viewer.
git-svn-id: file:///home/svn/framework3/trunk@10929 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 16:51:48 +00:00
Matt Weeks
de6feffcd9
Add rank class.
...
git-svn-id: file:///home/svn/framework3/trunk@10875 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 00:40:33 +00:00
Matt Weeks
b15ba92567
Add rank; fix issue with searching.
...
git-svn-id: file:///home/svn/framework3/trunk@10873 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 23:35:12 +00:00
Matt Weeks
db4c6ae246
Properly show compatible payloads. Important for cross-platform exploits.
...
git-svn-id: file:///home/svn/framework3/trunk@10870 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 22:41:49 +00:00
James Lee
68815a27ba
add the servlet lib to classpath for eclipse project
...
git-svn-id: file:///home/svn/framework3/trunk@10869 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 22:39:08 +00:00
James Lee
dcb850f56a
merge patches to fix a race condition in java meterpreter stager and a compatibility fix for gcj-based JVMs, thanks mihi\! java meterpreter now works with tomcat_mgr_deploy, see #3009
...
git-svn-id: file:///home/svn/framework3/trunk@10864 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 19:59:57 +00:00
Matt Weeks
c94c95bb04
Make the bottom button work too.
...
git-svn-id: file:///home/svn/framework3/trunk@10859 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 00:22:57 +00:00
Matt Weeks
6970e1834e
Fix bug with summarized options.
...
git-svn-id: file:///home/svn/framework3/trunk@10858 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 00:05:25 +00:00
Matt Weeks
3dd35cdcd4
Msfgui log fix. Fix identification of empty host list when consoles have been opened. Also change colors. Colors were a dumb idea.
...
git-svn-id: file:///home/svn/framework3/trunk@10849 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-30 22:12:15 +00:00
Joshua Drake
a0ee41188f
fix typo, fixes #2990
...
git-svn-id: file:///home/svn/framework3/trunk@10841 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-28 15:39:30 +00:00
pks
20b96ae0c1
Partial implementation of in memory execution and update binary
...
git-svn-id: file:///home/svn/framework3/trunk@10839 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-28 12:44:39 +00:00
Matt Weeks
85e7c799f7
Log modules runs that are started through console.
...
git-svn-id: file:///home/svn/framework3/trunk@10811 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-24 20:20:10 +00:00
Matt Weeks
ec15abd8dc
Add SSL support to connection starting/connecting.
...
git-svn-id: file:///home/svn/framework3/trunk@10810 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-24 20:09:04 +00:00
Matt Weeks
5619b7d57e
Fix for 3.5.
...
git-svn-id: file:///home/svn/framework3/trunk@10808 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-24 13:17:19 +00:00
Matt Weeks
780bdb32d3
Try ruby.exe first.
...
git-svn-id: file:///home/svn/framework3/trunk@10807 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-24 00:59:11 +00:00
Matt Weeks
cdef02c382
Add new command to try when starting msfrpcd.
...
git-svn-id: file:///home/svn/framework3/trunk@10801 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 23:13:12 +00:00
Matt Weeks
32875e1524
Propery highlight recent modules.
...
git-svn-id: file:///home/svn/framework3/trunk@10799 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 22:02:22 +00:00
Matt Weeks
560d79bb78
Standardize duplicate-option removal.
...
git-svn-id: file:///home/svn/framework3/trunk@10797 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 21:37:58 +00:00
Matt Weeks
a2801e5dc1
Add detach/kill support to interacting meterpreter channels over RPC. Also clean some duplicated code in session interaction.
...
git-svn-id: file:///home/svn/framework3/trunk@10794 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 17:05:48 +00:00
James Lee
f33d7cc670
revamp java payloads and make shells work with tomcat_mgr_deploy. tested java_trusted_chain and java_tester to verify that this doesn't break other java payload usage. see #3009 and #2973 , meterpreter doesn't work yet, so not marking resolved.
...
git-svn-id: file:///home/svn/framework3/trunk@10781 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 10:19:51 +00:00
Joshua Drake
f997b37245
remove the kitrap0d meterpreter script in favor of the "getsystem" implementation, fixes #800 , fixes #801
...
git-svn-id: file:///home/svn/framework3/trunk@10739 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 23:57:41 +00:00
James Lee
ad593bc1a0
bump version in linux installer
...
git-svn-id: file:///home/svn/framework3/trunk@10728 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 09:16:42 +00:00
James Lee
80b9e618ec
windows installer tweaks
...
git-svn-id: file:///home/svn/framework3/trunk@10727 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 09:14:23 +00:00
Matt Weeks
63d578dd7e
Add GUI support to service permissions escalate script.
...
git-svn-id: file:///home/svn/framework3/trunk@10723 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-17 23:34:37 +00:00
Matt Weeks
881f8e7919
Better error handling in gui shutdown code
...
git-svn-id: file:///home/svn/framework3/trunk@10710 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-16 19:18:53 +00:00
Matt Weeks
ca127fcf43
Display error in getting session list without displaying a new dialog window.
...
git-svn-id: file:///home/svn/framework3/trunk@10709 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-16 18:54:54 +00:00
Matt Weeks
f644580ec3
Minor fix on recent modules.
...
git-svn-id: file:///home/svn/framework3/trunk@10702 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-16 00:19:42 +00:00
Matt Weeks
ec4343c686
Improved object/XML conversion in XMLRPC code and changed config file to reuse the same code
...
so that normal java HashMaps, Lists, Strings, etc can be used instead of converting to and
from DOM nodes (easier to store complex objects). Module list is now stored with time each
module was first seen, and recent modules are highlighted. Accompanying minor edits included.
git-svn-id: file:///home/svn/framework3/trunk@10701 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-15 23:02:53 +00:00
Mike Smith
756e6d2ad8
Remove unsupported msfweb interface. ( fixes #503 )
...
* This will significantly decrease the size of the msf install (~5 MB)
* ActiveRecord & ActiveSupport are still used, and have been moved to lib/
git-svn-id: file:///home/svn/framework3/trunk@10682 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:45:16 +00:00
Matt Weeks
11bd6b2a95
Change conf file location to main msf conf dir; add scripts.
...
git-svn-id: file:///home/svn/framework3/trunk@10677 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 01:10:17 +00:00
Matt Weeks
51169377a9
Remove bad shell hack.
...
git-svn-id: file:///home/svn/framework3/trunk@10676 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 00:39:45 +00:00
Matt Weeks
2ba327c3aa
Don't lose history when connection is unsuccessful or connection info when not starting up an rpcd.
...
git-svn-id: file:///home/svn/framework3/trunk@10675 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 00:34:07 +00:00
Matt Weeks
e981b89ed4
Add Ctrl+C and Ctrl+Z support to gui console.
...
git-svn-id: file:///home/svn/framework3/trunk@10641 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 15:57:01 +00:00
Joshua Drake
f90af58fdf
fixed scripts so msfconsole can handle arguments with spaces
...
git-svn-id: file:///home/svn/framework3/trunk@10619 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 16:54:21 +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
pks
872c8b09c7
Add the ability to clean up file descriptors in the remote process.
...
git-svn-id: file:///home/svn/framework3/trunk@10587 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 11:52:45 +00:00
pks
754225a80d
Implement per dispatch run channel_write of packets, remove __FUNCTION__ due to dprintf changes, and fix shutting down networkpug interfaces. Re-add networkpug binary.
...
git-svn-id: file:///home/svn/framework3/trunk@10586 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 11:52:38 +00:00
Matt Weeks
cb453a97ab
Temporary workaround for #2261 - make new console for shell.
...
git-svn-id: file:///home/svn/framework3/trunk@10578 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-06 23:10:18 +00:00
Stephen Fewer
df8b9f8e95
Merge in the IPv6 Teredo patch.
...
git-svn-id: file:///home/svn/framework3/trunk@10543 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-04 11:02:46 +00:00
Matt Weeks
dc108abc56
Oops. Typo.
...
git-svn-id: file:///home/svn/framework3/trunk@10506 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-28 23:19:18 +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
Matt Weeks
2290b47c96
Add encoder support to exploits
...
git-svn-id: file:///home/svn/framework3/trunk@10480 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-26 00:07:02 +00:00
pks
740e2c1ab2
Change base from 0x90040000 to 0x20040000.
...
This is more portable across kernel versions / patches it seems. This
will be better for SEGMEXEC compatibility as well.
git-svn-id: file:///home/svn/framework3/trunk@10455 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-24 04:06:28 +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
pks
f196333e02
Strip debugging symbols when compiling the linker.
...
git-svn-id: file:///home/svn/framework3/trunk@10419 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 05:13:53 +00:00
pks
e30b420834
Railgun is windows specific at the moment, move the header include down a little bit and #ifdef the functions down a bit.
...
git-svn-id: file:///home/svn/framework3/trunk@10418 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 05:13:47 +00:00
pks
49b87daa7d
Implement locking in dl* functions
...
git-svn-id: file:///home/svn/framework3/trunk@10417 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 05:13:40 +00:00
pks
89b33c2cc7
Implement a crash handler to ease debugging
...
git-svn-id: file:///home/svn/framework3/trunk@10416 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 05:13:34 +00:00
pks
3c99897115
Missing file, QWORD compile fix, and thread error handling improvements.
...
asm/ucontext.h will be used to implement a crash handler in msflinker,
which should allow for easier debugging and development of msflinker
and extension code.
thread.c/h, fixes a bug if you thread_create(), but stop the thread before
running it.
Compilation fix for WSAGetLastError
git-svn-id: file:///home/svn/framework3/trunk@10415 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 05:13:27 +00:00
Matt Weeks
6736f6d5be
Make encoding payloads a million times faster.
...
git-svn-id: file:///home/svn/framework3/trunk@10374 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 02:45:55 +00:00
Matt Weeks
16f2e33442
Better support issuing commands to multiple sessions.
...
git-svn-id: file:///home/svn/framework3/trunk@10360 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 22:18:52 +00:00
Matt Weeks
908976c70a
Add ability to refresh console list, and only start polling for input on sessions when the window is opened.
...
git-svn-id: file:///home/svn/framework3/trunk@10359 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 21:41:08 +00:00
Matt Weeks
9712a99e42
Properly save host connecting to.
...
git-svn-id: file:///home/svn/framework3/trunk@10356 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 21:13:42 +00:00
Matt Weeks
c68861e4f4
Logout if not stopping the rpc daemon.
...
git-svn-id: file:///home/svn/framework3/trunk@10349 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 17:43:45 +00:00
Stephen Fewer
50e6d8f0e3
Delete the railgun meterpreter extension and add railgun support directly into stdapi. Support now includes Windows x64. Update meterpreter packet core to handle QWORD TLV's.
...
git-svn-id: file:///home/svn/framework3/trunk@10317 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-14 23:21:36 +00:00
Joshua Drake
d8fb8e5c49
merge in another posix meterpreter update from philip, see #2418
...
git-svn-id: file:///home/svn/framework3/trunk@10307 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 14:44:00 +00:00
Matt Weeks
f18ce42d1f
Remove unnecessary options to console run.
...
git-svn-id: file:///home/svn/framework3/trunk@10298 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 22:40:13 +00:00
Matt Weeks
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
James Lee
f15981074b
add source for java meterpreter. see #406
...
git-svn-id: file:///home/svn/framework3/trunk@10294 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 17:47:39 +00:00
Matt Weeks
12b15506c6
Log database connection, plugin loading/unloading, and session upgrades.
...
git-svn-id: file:///home/svn/framework3/trunk@10292 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 16:35:03 +00:00
Matt Weeks
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
Matt Weeks
711cf6d9ef
Prefer autodetect on importing, since other options are deprecated.
...
git-svn-id: file:///home/svn/framework3/trunk@10290 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 16:13:26 +00:00
Matt Weeks
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
Matt Weeks
f8dafa0308
Display platform on session list for meterpreter sessions.
...
git-svn-id: file:///home/svn/framework3/trunk@10288 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 15:31:42 +00:00
Joshua Drake
e3a5195c62
commit some fixes from philip, see #2418
...
git-svn-id: file:///home/svn/framework3/trunk@10275 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 15:51:30 +00:00
Joshua Drake
c3db1d7a7f
commit some fixes from philip, see #2418
...
git-svn-id: file:///home/svn/framework3/trunk@10272 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 15:39:28 +00:00
James Lee
85126af521
add an exploit module for cve-2010-0094, thanks Matthias Kaiser.
...
git-svn-id: file:///home/svn/framework3/trunk@10255 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-08 08:20:55 +00:00
Matt Weeks
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
Matt Weeks
62e27afa36
Add support for deleting items and add clients, notes, and loots db queries.
...
git-svn-id: file:///home/svn/framework3/trunk@10226 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 00:43:06 +00:00
Matt Weeks
9e86da570e
Initialize framework after forking when running msfrpcd as a daemon. Fixes #2465 by running database task thread in daemon.
...
git-svn-id: file:///home/svn/framework3/trunk@10207 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-31 23:24:54 +00:00
Joshua Drake
8dc12802fa
add termio.h back, see #2418
...
git-svn-id: file:///home/svn/framework3/trunk@10203 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-31 15:11:29 +00:00
Joshua Drake
3b67eefe4e
sync up with Philip's code, see #2418
...
git-svn-id: file:///home/svn/framework3/trunk@10202 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-31 15:10:41 +00:00
Matt Weeks
6dcd8a8269
Use new search command and script for search/download in gui.
...
git-svn-id: file:///home/svn/framework3/trunk@10198 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-30 22:59:46 +00:00
Stephen Fewer
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
Matt Weeks
77aa35c53f
Allow viewing connection details.
...
git-svn-id: file:///home/svn/framework3/trunk@10182 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-29 02:50:03 +00:00
Matt Weeks
d5b31adc6d
Only enable menus when connected to an msfrpc server
...
git-svn-id: file:///home/svn/framework3/trunk@10180 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-28 19:56:11 +00:00
Matt Weeks
a32e88b509
Simplify calling RPC functions in gui with implicit argument array.
...
git-svn-id: file:///home/svn/framework3/trunk@10179 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-28 19:43:38 +00:00
Matt Weeks
60105d8f24
Basic gui plugin support.
...
git-svn-id: file:///home/svn/framework3/trunk@10178 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-28 19:23:19 +00:00
Matt Weeks
633f84888e
Add support for database connect and disconnect, saving connection details.
...
git-svn-id: file:///home/svn/framework3/trunk@10176 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-28 18:09:30 +00:00
James Lee
5d5f075449
do the tar.bz2 as part of the normal build process. fixes #2334
...
git-svn-id: file:///home/svn/framework3/trunk@10171 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 18:27:57 +00:00
Stephen Fewer
53bfdb6f37
Commit the source for meterpreter file searching...
...
git-svn-id: file:///home/svn/framework3/trunk@10165 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 14:44:42 +00:00
Matt Weeks
8f52ae02df
Tabs disabled until loaded from database, auto-load database on connect, and more simplified database calls,
...
git-svn-id: file:///home/svn/framework3/trunk@10161 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-26 23:49:35 +00:00
Joshua Drake
aee73a3129
resolve some case insensitive filename issues
...
git-svn-id: file:///home/svn/framework3/trunk@10158 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-26 17:32:34 +00:00
Joshua Drake
778ee60d2c
update additional files, see #2418
...
git-svn-id: file:///home/svn/framework3/trunk@10156 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-26 07:25:15 +00:00
Joshua Drake
067830a8d0
remove the old elf server, see #2418 , should have been part of r10154
...
git-svn-id: file:///home/svn/framework3/trunk@10155 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-26 05:24:20 +00:00
Joshua Drake
6d1ed6d779
first attempt to merge in Philip Sanderson's work on the POSIX meterpreter
...
git-svn-id: file:///home/svn/framework3/trunk@10154 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-26 05:16:27 +00:00
HD Moore
3b7c23b841
Remove the duplicate copy
...
git-svn-id: file:///home/svn/framework3/trunk@10145 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 19:22:02 +00:00
HD Moore
24e4645ecb
Updated with revision data, additional bug fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10141 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 15:13:27 +00:00
HD Moore
df918670a2
Add a revision
...
git-svn-id: file:///home/svn/framework3/trunk@10140 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 15:13:06 +00:00
HD Moore
633a169971
Add a packaging script
...
git-svn-id: file:///home/svn/framework3/trunk@10139 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 15:11:19 +00:00
HD Moore
c12947192c
Use the same wait logic for analyze
...
git-svn-id: file:///home/svn/framework3/trunk@10138 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 15:05:37 +00:00
HD Moore
d7b2831557
Fix CSV parsing when the timestamp has a comma, extend the wait period during the audit to handle slow systems better.
...
git-svn-id: file:///home/svn/framework3/trunk@10137 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 15:04:19 +00:00
HD Moore
68a5837b07
Regenerated binaries, error when CSV is missing
...
git-svn-id: file:///home/svn/framework3/trunk@10136 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 14:33:09 +00:00
HD Moore
db1adc0e76
Actually track this in SVN
...
git-svn-id: file:///home/svn/framework3/trunk@10135 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 14:21:53 +00:00
HD Moore
7ea537c7ea
Better, Faster, Stronger: DLLHijackAuditKit v2
...
git-svn-id: file:///home/svn/framework3/trunk@10134 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 06:57:36 +00:00
Matt Weeks
4af82f2937
Add import capability and simplify reloading database.
...
git-svn-id: file:///home/svn/framework3/trunk@10133 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 02:05:03 +00:00
HD Moore
f2b30738b1
Add /accepteula to the batch script
...
git-svn-id: file:///home/svn/framework3/trunk@10125 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-24 14:13:52 +00:00
Matt Weeks
f94e174d97
Initial Database support, with improved basic view.
...
git-svn-id: file:///home/svn/framework3/trunk@10124 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-24 00:22:49 +00:00
Joshua Drake
5201aa885a
remove asm file now that the assembly is inlined in the class
...
git-svn-id: file:///home/svn/framework3/trunk@10120 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 22:32:32 +00:00
HD Moore
f02956a816
Fix typo in audit.rb
...
git-svn-id: file:///home/svn/framework3/trunk@10115 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 19:28:20 +00:00
Joshua Drake
15c7a25d68
add omlet stub asm source
...
git-svn-id: file:///home/svn/framework3/trunk@10110 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 17:43:53 +00:00
HD Moore
cc3554601f
Tools for testing DLL hijack flaws
...
git-svn-id: file:///home/svn/framework3/trunk@10100 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 05:43:47 +00:00
James Lee
b35cea94cd
add source code for cve-2010-0840
...
git-svn-id: file:///home/svn/framework3/trunk@10095 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-21 07:27:26 +00:00
Matt Weeks
57b48314a6
Add logging support to console sessions.
...
git-svn-id: file:///home/svn/framework3/trunk@10084 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 19:07:15 +00:00
James Lee
232af015cb
add source code for javapayload, thanks mihi. see #406
...
git-svn-id: file:///home/svn/framework3/trunk@10075 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 07:09:51 +00:00
Matt Weeks
937606ab1f
Ability to close consoles and discover old consoles.
...
git-svn-id: file:///home/svn/framework3/trunk@10068 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 23:22:22 +00:00
Matt Weeks
6c38930db6
Do not poll for output on hidden windows. Improves performance with many windows open.
...
git-svn-id: file:///home/svn/framework3/trunk@10066 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 23:02:31 +00:00
Stephen Fewer
73f7b20935
Add meterpreter server side support for cleaning up loaded extensions upon server termination by calling the loaded extensions DeinisServerExtension() functions.
...
git-svn-id: file:///home/svn/framework3/trunk@10053 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 11:34:23 +00:00
Stephen Fewer
fd0b96ee9d
Add a list_shift() function to the common linked list code.
...
git-svn-id: file:///home/svn/framework3/trunk@10052 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 11:25:11 +00:00
Matt Weeks
f3648b15cc
Add console support to gui. Includes tab completion.
...
git-svn-id: file:///home/svn/framework3/trunk@10033 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 00:30:41 +00:00
Matt Weeks
ffb4b611c6
Confirm rpc exit for menu close operations too.
...
git-svn-id: file:///home/svn/framework3/trunk@9947 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-03 02:42:41 +00:00
Matt Weeks
7f87cb9e55
Fix for date error on job.info call.
...
git-svn-id: file:///home/svn/framework3/trunk@9916 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-23 21:54:18 +00:00
Matt Weeks
9b0e9fca55
Support stopping rpcd on exit, based on user confirmation. Fixes #2287
...
git-svn-id: file:///home/svn/framework3/trunk@9915 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-23 21:28:39 +00:00
James Lee
50914a1e68
add a makefile so i don't forget how to compile this stuff
...
git-svn-id: file:///home/svn/framework3/trunk@9901 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 07:27:15 +00:00
Matt Weeks
ed74422a62
Fix for Linux error on get system icon call. Fixes bug #2283
...
git-svn-id: file:///home/svn/framework3/trunk@9894 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 23:57:02 +00:00
Matt Weeks
e065891a65
Fix for width of version label.
...
git-svn-id: file:///home/svn/framework3/trunk@9877 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 03:06:17 +00:00
Matt Weeks
e7f748118b
Display number of modules and show console window on double-click
...
git-svn-id: file:///home/svn/framework3/trunk@9876 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 03:04:18 +00:00
James Lee
119f9328fc
remove debug prints. =/
...
git-svn-id: file:///home/svn/framework3/trunk@9875 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 00:57:03 +00:00
James Lee
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
James Lee
0af37c6d8b
add some option parsing and a bit of documentation.
...
git-svn-id: file:///home/svn/framework3/trunk@9867 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 21:29:50 +00:00
James Lee
ab0d2c365e
nuke the gtk and web UIs for the mini installer
...
git-svn-id: file:///home/svn/framework3/trunk@9866 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 20:28:23 +00:00
James Lee
fb90a81bf0
specify the path to minify.sh
...
git-svn-id: file:///home/svn/framework3/trunk@9865 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 20:12:36 +00:00
James Lee
42600c1f9a
make sure we grab the right scripts/ directory
...
git-svn-id: file:///home/svn/framework3/trunk@9864 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 20:10:52 +00:00
James Lee
92828f2241
quit using ./tmp
...
git-svn-id: file:///home/svn/framework3/trunk@9863 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 20:02:11 +00:00
James Lee
180c3e3bd0
don't spit errors if the symlink doesn't exist
...
git-svn-id: file:///home/svn/framework3/trunk@9862 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 19:38:03 +00:00
James Lee
5059ac9c0e
take an archive as an argument, minify with the new external script
...
git-svn-id: file:///home/svn/framework3/trunk@9861 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 19:16:11 +00:00
Matt Weeks
9029bdf722
Sort modules (exploits, auxiliary, payloads) alphabetically in menu.
...
git-svn-id: file:///home/svn/framework3/trunk@9846 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 21:44:55 +00:00
Matt Weeks
85d07af548
Multiple-session script execution fixed.
...
Build config updated for netbeans 6.9 and current tree.
git-svn-id: file:///home/svn/framework3/trunk@9830 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 19:27:23 +00:00
Stephen Fewer
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
Matt Weeks
dcb3ab6441
Initial commit of Java Metasploit GUI source. Netbeans project files included.
...
git-svn-id: file:///home/svn/framework3/trunk@9815 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 22:43:43 +00:00
HD Moore
30d3440b5d
New bins, implements the server side of multi-call railgun
...
git-svn-id: file:///home/svn/framework3/trunk@9806 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 19:19:21 +00:00
Stephen Fewer
a47ced6ac4
Partial solution for #1448 . Fall back to CreateProcessWithTokenW when CreateProcessAsUser fails with ERROR_PRIVILEGE_NOT_HELD. While only available on 2003 and above this works on my server 2008 test case which was failing before.
...
git-svn-id: file:///home/svn/framework3/trunk@9781 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-11 18:36:57 +00:00
Stephen Fewer
7a57ca57a6
Bug fix for a misplaced & in call to DestroyEnvironmentBlock() during process_execute(), was causing a hang on Vista and an Access Violation on server 2008.
...
git-svn-id: file:///home/svn/framework3/trunk@9779 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-11 16:37:50 +00:00
James Lee
11bad248c5
add a simple script for turning a regular checkout into a mini version
...
git-svn-id: file:///home/svn/framework3/trunk@9778 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-11 16:13:20 +00:00
HD Moore
d0c8f91f21
Bump to 3.4.1
...
git-svn-id: file:///home/svn/framework3/trunk@9764 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-10 15:19:01 +00:00
HD Moore
d3a6418e53
Revert changes to elevate, still not getting around restrictions on primary token creation, needs a deeper look
...
git-svn-id: file:///home/svn/framework3/trunk@9759 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 21:59:31 +00:00
HD Moore
d5932fc2fd
Switch the namedpipe code to convert the thread token to a primary token first
...
git-svn-id: file:///home/svn/framework3/trunk@9756 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 21:40:44 +00:00
HD Moore
ec9156827e
Switch the elevator methods to DuplicateHandleEx to get a primary token
...
git-svn-id: file:///home/svn/framework3/trunk@9755 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 21:23:05 +00:00
HD Moore
29f9f6671e
This *should* fix all cases where execute -t would fail to use an impersonated token
...
git-svn-id: file:///home/svn/framework3/trunk@9754 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 19:32:51 +00:00
James Lee
7fd71dcbcb
note the updated version of ruby
...
git-svn-id: file:///home/svn/framework3/trunk@9753 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 19:29:34 +00:00
HD Moore
972e7bc282
Clean up some of the token impersonation code around process execution
...
git-svn-id: file:///home/svn/framework3/trunk@9751 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 18:54:20 +00:00
HD Moore
ccfea56ed5
Minor tweak to build without the include path for common
...
git-svn-id: file:///home/svn/framework3/trunk@9715 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 16:46:58 +00:00
HD Moore
5d9a6622de
Merge railgun, tweak configurations
...
git-svn-id: file:///home/svn/framework3/trunk@9709 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 16:29:03 +00:00
James Lee
fb43495ada
meterpreter now compiles on 64-bit linux in a 32-bit chroot. still need payload handlers and some stdapi love to make it useable
...
git-svn-id: file:///home/svn/framework3/trunk@9468 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-10 06:10:15 +00:00
Joshua Drake
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
Ramon de C Valle
380ed580fb
Update unixasm external source.
...
git-svn-id: file:///home/svn/framework3/trunk@9348 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-23 20:01:11 +00:00
James Lee
4f61fb6dc3
add a mini installer to the standard build. it can still use some more minification, it's at about 24MB and expands to 132MB
...
git-svn-id: file:///home/svn/framework3/trunk@9341 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 06:25:26 +00:00
James Lee
0615dac174
break the common stuff out into a function
...
git-svn-id: file:///home/svn/framework3/trunk@9337 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 04:53:46 +00:00
James Lee
a89db83513
use the BINPATH
...
git-svn-id: file:///home/svn/framework3/trunk@9329 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 20:39:55 +00:00
James Lee
3a928fc9c2
this is what i really meant.
...
git-svn-id: file:///home/svn/framework3/trunk@9318 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 21:14:10 +00:00
James Lee
3ed28c0822
typo
...
git-svn-id: file:///home/svn/framework3/trunk@9317 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 21:05:51 +00:00
James Lee
b5cd499b06
only build an arch if we've got bins for it
...
git-svn-id: file:///home/svn/framework3/trunk@9316 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 20:49:08 +00:00
James Lee
8d38f0da87
use a variable for the installation directory so we can eventually make it an option
...
git-svn-id: file:///home/svn/framework3/trunk@9314 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 20:27:03 +00:00
James Lee
c4a7368591
use our gems directory
...
git-svn-id: file:///home/svn/framework3/trunk@9313 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 20:22:57 +00:00
HD Moore
c93642b11f
Update for 3.4.0
...
git-svn-id: file:///home/svn/framework3/trunk@9307 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-16 17:35:56 +00:00
HD Moore
36836423d9
Add a warning, cosmetic comment to asm
...
git-svn-id: file:///home/svn/framework3/trunk@9037 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 20:51:05 +00:00
HD Moore
c6ebd735df
Updated comments
...
git-svn-id: file:///home/svn/framework3/trunk@9003 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 15:08:17 +00:00
HD Moore
11c10518b3
Bug fixes for better windows OS compatibility
...
git-svn-id: file:///home/svn/framework3/trunk@9002 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 14:57:51 +00:00
HD Moore
cd2760f2c2
Bug fixes and size improvements for the reverse_https stager
...
git-svn-id: file:///home/svn/framework3/trunk@9001 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 13:53:35 +00:00
HD Moore
e968c3894e
More size tweaks
...
git-svn-id: file:///home/svn/framework3/trunk@8999 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 08:03:28 +00:00
HD Moore
c8defe9716
Size tweaks to bring the ssl stager + encoder + target_id to exactly 400 bytes
...
git-svn-id: file:///home/svn/framework3/trunk@8998 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 07:48:53 +00:00
HD Moore
c6c956ab46
Small patch to enable a new stager
...
git-svn-id: file:///home/svn/framework3/trunk@8984 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 05:21:15 +00:00
HD Moore
5d0fb434b7
Adds a reverse_tcp_dns stager
...
git-svn-id: file:///home/svn/framework3/trunk@8983 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 03:38:57 +00:00
Stephen Fewer
9a4293c445
In with the modified VNC payload which now supports an in memory breakout of session isolation for systems like Vista/2008/7 when the payload is run from a service in session 0 isolation.
...
git-svn-id: file:///home/svn/framework3/trunk@8890 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 00:00:05 +00:00
Stephen Fewer
c09ca4eba5
Commit all the code for the new 'screenshot' command in the stdapi extension. Screenshot will now work on NT4 - 7 on both x86 and x64 and on newer versions of Windows we can break out of session isolation (e.g. session 0 isolation for services) to screenshot the active desktop (or logon screen) without the need to migrate meterpreter. The majority of the migration code-injection stuff has been refactored out into base_inject.c so it can be shared with the new ps_inject() functionality to inject dlls. The 'ps' command now reports what session each process belongs to (if this is too verbose we can remove it or add a -v verbose switch to the ps command). The 'execute' command can now take a -s switch in order to create a process in a users session under the users privs (assuming you have the privs to do this).
...
git-svn-id: file:///home/svn/framework3/trunk@8787 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 17:09:55 +00:00
Stephen Fewer
c55e9af9ae
Commit the updated APC injection stubs. fixes a nasty issue in some edge cases whereby when using APC injection for a process in another session then the current host process the injected APC can cause an access violation in kernel32 during a call the kernel32!CreateThread caused by the APC's host thread not having an initialized Activation Context inside its TEB. We now test for this and create a dummy ActivationContext entry to appease the kernel. This will both improve DLL injection reliability as well as meterpreter migration reliability.
...
git-svn-id: file:///home/svn/framework3/trunk@8786 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 17:00:19 +00:00
Stephen Fewer
08d1850bcc
Commit the new VNC x86/x64 DLL source code...
...
git-svn-id: file:///home/svn/framework3/trunk@8745 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-08 14:49:45 +00:00
Stephen Fewer
d0f2b589b6
Delete the old VNC source code.
...
git-svn-id: file:///home/svn/framework3/trunk@8744 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-08 14:39:20 +00:00
Stephen Fewer
195d1ab4b8
Commit snojobs jpeg patch for espia with an x64 build and some minor changes on the ruby side (The 'screenshot' command is now 'screengrab' to avoid a future conflict with changes happening in stdapi).
...
git-svn-id: file:///home/svn/framework3/trunk@8726 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-05 15:50:24 +00:00
Stephen Fewer
4e73d95dac
Commit the JPEG-8 lib code from snowjobs patch. Added an x64 build environment and the libs directory for x86/x64 projects to link against.
...
git-svn-id: file:///home/svn/framework3/trunk@8725 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-05 15:44:36 +00:00
Stephen Fewer
5f35f33cd1
Forgot the updated build.py, also add in a link to a blog post I wrote for this shellcode.
...
git-svn-id: file:///home/svn/framework3/trunk@8657 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 14:27:13 +00:00
Stephen Fewer
88cc851a41
Commit the stager_sysenter_hook win32 kernel shellcode source and mixin patch, resolves #405 .
...
git-svn-id: file:///home/svn/framework3/trunk@8655 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 13:41:16 +00:00
Tod Beardsley
d5f4ea9692
Adding TightVNC's java viewer to external/source. vnc.html works, it just needs to have the path set correctly.
...
git-svn-id: file:///home/svn/framework3/trunk@8648 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-25 23:18:42 +00:00
Tod Beardsley
948d9d95d9
Deleting the winvnc java stuff.
...
git-svn-id: file:///home/svn/framework3/trunk@8647 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-25 23:10:00 +00:00
Stephen Fewer
4ed9e71b76
Commit the meterpreter C side (and bins) for transparent zlib (zlib.c copied from the posix meterpreter source) compression of TLV's and channels. To use transparent compression with channels, create them with CHANNEL_FLAG_COMPRESS. To use transparent compression with any TLV value, bitwise or the TLV type with TLV_META_TYPE_COMPRESSED (Don't create the TLV type with TLV_META_TYPE_COMPRESSED as the compressed flag is removed on the remote end after compression). For consistency with the ruby side we could at a later stage add a boolean compress parameter to all the packet_add_tlv_* functions so you don't have to manually specify TLV_META_TYPE_COMPRESSED flag.
...
git-svn-id: file:///home/svn/framework3/trunk@8515 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 14:56:24 +00:00
Stephen Fewer
e732ef6872
Commit the Meterpreter C side for the UDP socket pivoting. (+1 bug fix for the TCP client socket notify event function)
...
git-svn-id: file:///home/svn/framework3/trunk@8430 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-09 16:43:33 +00:00
Stephen Fewer
a80d1ad2ee
Commit the new TCP server channel support on the meterpreter end as well as some fixes to TCP client channels.
...
git-svn-id: file:///home/svn/framework3/trunk@8383 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-06 17:55:41 +00:00
et
a40817ea67
Finally the Wmap patch for ratproxy for new db schema. Based on Albert School patch
...
git-svn-id: file:///home/svn/framework3/trunk@8332 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-31 04:15:31 +00:00
HD Moore
42b331b47f
Fix #790 . Initialize the client state to be alive, tweak a few things on the meterpreter side
...
git-svn-id: file:///home/svn/framework3/trunk@8327 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 18:52:44 +00:00
Stephen Fewer
7a32f9f2e2
fix ps so an x64 process's path is returned correctly when ps is run from a wow64 meterpeter.
...
git-svn-id: file:///home/svn/framework3/trunk@8322 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 12:00:45 +00:00
Stephen Fewer
3824a2938c
...update the project files. I have added in an extra post build step for elevator.dll so it can work on NT4 (when used with rundll32.exe for getsystem technique #2 ). The post build step uses the editbin.exe to set the major OS/Subsystem version to 4 instead of 5 so NT4 will load it, (visual c++ 2008 cant build NT4 binaries, only 2000 and above).
...
git-svn-id: file:///home/svn/framework3/trunk@8318 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 01:12:35 +00:00
Stephen Fewer
0e08aa0094
Add in KiTrap0D to the priv getsystem command.
...
git-svn-id: file:///home/svn/framework3/trunk@8317 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 01:09:57 +00:00
HD Moore
284af1260a
Disable debug tracing
...
git-svn-id: file:///home/svn/framework3/trunk@8312 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:10:58 +00:00
HD Moore
f3408fd327
Fixes #744 . The core issue was the migrate code waiting on SetEvent, but the migrate stub was blocked on a WSASocket due to a pending packet_receive in the main server thread. Simply settin the thread termination signal did not work, as the SSL_read was already in progress. This change forcible terminates the main server thread before waiting on the event in order to bypass this deadlock. The downside is a failed migrate has no way to recover if it makes it this far.
...
git-svn-id: file:///home/svn/framework3/trunk@8309 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 22:55:41 +00:00
natron
69ad365b46
Added STDERR to pure java payload, cleaned up user's view.
...
git-svn-id: file:///home/svn/framework3/trunk@8308 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 22:53:36 +00:00
Stephen Fewer
5793ab128c
modularize the source for each technique in elevator too.
...
git-svn-id: file:///home/svn/framework3/trunk@8299 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 16:30:09 +00:00
Stephen Fewer
8eb036d704
modularize the source for each technique, making it cleaner to add in new techniques at a later stage.
...
git-svn-id: file:///home/svn/framework3/trunk@8298 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 15:04:27 +00:00
Stephen Fewer
62c1a99c8e
update the workspace files.
...
git-svn-id: file:///home/svn/framework3/trunk@8295 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 13:46:51 +00:00
Stephen Fewer
fad278566b
Add in the elevator dll, used by getsystem for a number of things.
...
git-svn-id: file:///home/svn/framework3/trunk@8294 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 13:45:31 +00:00
Stephen Fewer
e58847009c
Add in the new getsystem command to the priv extension.
...
git-svn-id: file:///home/svn/framework3/trunk@8293 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 13:40:55 +00:00
Stephen Fewer
f82b6c5952
Update RDI by adding in the LoadRemoteLibraryR function to use RDI to inject into arbitrary processes. Current limitation is it only works on x86->x86 and x64->x64 scenarios, due to the offsets used in parsing the PE file being determined at compile time (e.g. if we compile LoadRemoteLibraryR into an x86 binary it wont be able to load x64 images). Solution is to not rely on compiler for the offset but to do it manually which shouldn't be too much work.
...
git-svn-id: file:///home/svn/framework3/trunk@8292 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 13:37:55 +00:00
Stephen Fewer
9f4332ce60
bug fix for the stdapi command rev2self. was not playing nice with new thread token stuff.
...
git-svn-id: file:///home/svn/framework3/trunk@8291 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 13:33:24 +00:00
Stephen Fewer
095b6ee7ed
move these macros from base_dispatch.c to common.h as they are useful to use elsewhere.
...
git-svn-id: file:///home/svn/framework3/trunk@8290 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 13:32:16 +00:00
natron
cd5e5880d2
Initial commit of Msf::Exploit::Java mixin and multi/browser/java_signed_applet exploit.
...
git-svn-id: file:///home/svn/framework3/trunk@8267 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 19:46:39 +00:00
HD Moore
cf26fcb9ad
Fixes #784 . Adds .NET server support
...
git-svn-id: file:///home/svn/framework3/trunk@8256 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 07:02:07 +00:00
pusscat
227dd5ba12
Remove test trap ;)
...
git-svn-id: file:///home/svn/framework3/trunk@8243 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 20:20:16 +00:00
Joshua Drake
e765288c6c
lol, fix funny $Id$ replacement
...
git-svn-id: file:///home/svn/framework3/trunk@8241 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 20:10:56 +00:00
HD Moore
4b637c4912
Updated with new target system, signature for 2000 SP4, fixed SP4 usage, but the priv esclation is non-functional, use twunk16/debug depending on what is available.
...
git-svn-id: file:///home/svn/framework3/trunk@8240 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 19:13:28 +00:00
HD Moore
a898901ad3
Switch to twunk_16 for Windows 7 compatibility
...
git-svn-id: file:///home/svn/framework3/trunk@8230 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 18:07:48 +00:00
HD Moore
9f37906ba9
Tweaks for reliability
...
git-svn-id: file:///home/svn/framework3/trunk@8226 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 16:55:53 +00:00
Stephen Fewer
4e4a65b9a4
Complete overhaul of process migration. Migration across x86->x86, x64->x64, wow64->x64 and x64->wow64 all supported using a number of techniques.
...
git-svn-id: file:///home/svn/framework3/trunk@8198 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 19:46:18 +00:00
Stephen Fewer
cfcbfd5d3c
bug fix x64 migrate shellcodes for wow64->x64 migration.
...
git-svn-id: file:///home/svn/framework3/trunk@8197 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 19:37:10 +00:00
Stephen Fewer
538a647671
The stub for wow64->x64 migration.
...
git-svn-id: file:///home/svn/framework3/trunk@8195 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 17:12:41 +00:00
Stephen Fewer
1e63f357cb
For now just adding in the new APC migrate stubs and the wow64->x64 exec stub. (fix up the build scripts and use a dedicated migrate directory for this stuff).
...
git-svn-id: file:///home/svn/framework3/trunk@8193 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 14:03:53 +00:00
HD Moore
c419511386
Minor changes to make scripting easier and allow it to escalate a specific pid
...
git-svn-id: file:///home/svn/framework3/trunk@8168 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-19 22:30:15 +00:00
HD Moore
752f8db83b
Add KiTrap0d to the external/source/ as a reference
...
git-svn-id: file:///home/svn/framework3/trunk@8167 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-19 22:22:19 +00:00
Stephen Fewer
f3fd2eae80
Commit the new x64 migrate stub. Compatible with x64->x64 migration (and x86->x64 migration once the remote thread issue is resolved)
...
git-svn-id: file:///home/svn/framework3/trunk@8163 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-19 18:39:56 +00:00
Stephen Fewer
d032955959
Commit the new x86 migrate stub. Compatible with x86->x86 migration and x64->x86 migration, on NT4 and up (where applicable).
...
git-svn-id: file:///home/svn/framework3/trunk@8160 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-19 12:55:24 +00:00
Stephen Fewer
159e240f3a
updated stapi project file.
...
git-svn-id: file:///home/svn/framework3/trunk@8158 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-19 11:07:21 +00:00
Stephen Fewer
757276d70f
First cut for improved process listing. Now works well on NT4 and up. One issue with getting the path for x64 processes on an x86 meterpreter.
...
git-svn-id: file:///home/svn/framework3/trunk@8156 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-19 10:40:02 +00:00
Stephen Fewer
0286a67f1e
small bug fix to get getuid working on NT4
...
git-svn-id: file:///home/svn/framework3/trunk@8155 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-19 10:36:12 +00:00
HD Moore
55dc3aa192
Support for slackware's mktemp, fixes #762
...
git-svn-id: file:///home/svn/framework3/trunk@8112 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 12:48:30 +00:00
HD Moore
42b3a5774d
Adds the process username to the ps output (when possible).
...
git-svn-id: file:///home/svn/framework3/trunk@8056 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 03:41:21 +00:00
HD Moore
4d7aec7c2d
Fixes #745 . This commit changes how token manipulation works, adds the steal_token, drop_token, and getprivs commands. Tested on NT 4.0, 2000 SP4, XP SP3, 2003 SP2, Vista, and Windows 7
...
git-svn-id: file:///home/svn/framework3/trunk@8055 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 00:35:10 +00:00
HD Moore
98f83bbab1
Adds reg queryclass
...
git-svn-id: file:///home/svn/framework3/trunk@8046 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 15:52:30 +00:00
Joshua Drake
2283e029db
crossing fingers, big cr removal batch
...
git-svn-id: file:///home/svn/framework3/trunk@8038 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 22:24:22 +00:00
HD Moore
d0969746a4
Mostly cosmetic changes from local tree
...
git-svn-id: file:///home/svn/framework3/trunk@7970 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 03:31:20 +00:00
HD Moore
f648a6605e
Update the build script versions
...
git-svn-id: file:///home/svn/framework3/trunk@7945 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-22 13:39:17 +00:00
HD Moore
68aafc8e13
Fixes #658 by adding a 250ms sleep to the dispatch of the close call.
...
git-svn-id: file:///home/svn/framework3/trunk@7934 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 19:53:10 +00:00
Joshua Drake
b37c34579b
add exploit module for cve-2009-3869
...
NOTE: no policy change is required for this exploit to succeed.
git-svn-id: file:///home/svn/framework3/trunk@7899 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-17 04:52:40 +00:00
Joshua Drake
255724d640
compile java applet with 1.3, Fixes #685
...
git-svn-id: file:///home/svn/framework3/trunk@7850 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 17:26:19 +00:00
Joshua Drake
34408c5e3e
add exploit module for CVE-2009-3867 (JRE getSoundbank)
...
git-svn-id: file:///home/svn/framework3/trunk@7827 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 21:18:31 +00:00
HD Moore
3e98ff9d9a
Stop breaking tar on OS X, thanks
...
git-svn-id: file:///home/svn/framework3/trunk@7815 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 22:25:29 +00:00
Stephen Fewer
be588716c5
Bug fix for meterpreter on NT4 (Tested on NT4.0 SP6). Add a function thread_open() in thread.c to wrap the use kernel32!OpenThread and ntdll!NtOpenThread for backwards compatibility.
...
git-svn-id: file:///home/svn/framework3/trunk@7806 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 18:12:51 +00:00
HD Moore
6da0fda5ed
Updated meterpreter binaries with a slight change to the thread schedule (solves a looping problem when the socket is dead).
...
git-svn-id: file:///home/svn/framework3/trunk@7793 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 05:42:47 +00:00
HD Moore
ff19b649f3
See #662 . This should fix most of the meterpreter-side issues with sockets, there is still a second piece of this which is unflushed data on the local forwards from the ruby code.
...
git-svn-id: file:///home/svn/framework3/trunk@7761 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 22:08:06 +00:00
HD Moore
792724c3f3
Cleanups to the socket code, its still not perfect, but much more usable now
...
git-svn-id: file:///home/svn/framework3/trunk@7750 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 14:52:07 +00:00
Stephen Fewer
4f8cfc27d4
Replace the use of Critical Sections for locking with Mutex's (thread.c). This appears to resolve a deadlock issue with OpenSSL on some Windows systems. This commit resolves a bug in interactive processes where an interactive waiter thread will chew cpu due to a tight loop introduced by anonymous pipes not blocking (process.c). Dynamic lock creation for OpenSSL has been re-enabled should a future version of OpenSSL require it, AFAIK the current version used, v0.8.9, does not use dynamic lock creation (server_setup.c). Channels have been given locks to help synchronize concurrent access to a single channel.
...
git-svn-id: file:///home/svn/framework3/trunk@7732 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 13:04:41 +00:00
HD Moore
dfa0d155fc
See #607 . Switch sniffer code to use mutexes
...
git-svn-id: file:///home/svn/framework3/trunk@7728 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 05:19:46 +00:00
Stephen Fewer
a273c9f07c
Initial commit of the multi-threaded meterpreter.
...
git-svn-id: file:///home/svn/framework3/trunk@7698 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 17:37:21 +00:00
HD Moore
8aef3d560c
Fixes #579
...
git-svn-id: file:///home/svn/framework3/trunk@7694 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 11:35:24 +00:00
HD Moore
cbb0fb10e7
Tweak for 3.3.1
...
git-svn-id: file:///home/svn/framework3/trunk@7649 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 20:14:55 +00:00
HD Moore
8ba8945f53
Fixes #579 . Clean up the runtime environment for ruby, update the version
...
git-svn-id: file:///home/svn/framework3/trunk@7633 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-28 16:38:52 +00:00
HD Moore
ffcd613450
Commit the rc2 installer
...
git-svn-id: file:///home/svn/framework3/trunk@7527 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 04:05:45 +00:00
HD Moore
5507d686da
Remove rm of old touched file
...
git-svn-id: file:///home/svn/framework3/trunk@7480 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 07:15:13 +00:00
HD Moore
d38ac81282
Hopefully the last round of tweaks for the windows installer
...
git-svn-id: file:///home/svn/framework3/trunk@7479 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 07:13:09 +00:00
HD Moore
1e7be6650a
This method seems to work on Windows 7 - $stdin reads on a closed rxvt lead to the hung ruby procs.
...
git-svn-id: file:///home/svn/framework3/trunk@7478 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 07:02:40 +00:00
HD Moore
ecc06247ab
Still sorting out permission checks
...
git-svn-id: file:///home/svn/framework3/trunk@7477 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 06:38:03 +00:00
HD Moore
ab33e5403d
Fixes #490 . Fixes #497 . Fixes #479 (hopefully in all cases). Updates to the cygwin scripts and batch files
...
git-svn-id: file:///home/svn/framework3/trunk@7475 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 06:18:32 +00:00
HD Moore
63383842e5
Fixes #496 . Adds a Cygwin Shell link (and a pdf icon)
...
git-svn-id: file:///home/svn/framework3/trunk@7474 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 05:59:46 +00:00
HD Moore
74eb0ed34c
Add the used icons
...
git-svn-id: file:///home/svn/framework3/trunk@7472 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 05:41:47 +00:00
HD Moore
879f0b306b
Check the cygwin scripts into SVN
...
git-svn-id: file:///home/svn/framework3/trunk@7471 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 05:30:58 +00:00
Stephen Fewer
8c48a9a3f5
Commit the PassiveX DLL updated to build with Visual Studio C++ 2008. Removed some compiler warnings. Use VirtualProtect to make second stage RWX. Use WSASocketA() over socket() for second stage compatibility. Seems to now work with the shell stage (Tested on XPSP2/IE7) but still not working with meterpreter.
...
git-svn-id: file:///home/svn/framework3/trunk@7461 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:39:38 +00:00
HD Moore
4321b992dc
Improved the msfupdate script, retry on dirty svn directories, warn the user if automatic updates are disabled, and indicate the msfconsole is in the system path after the install
...
git-svn-id: file:///home/svn/framework3/trunk@7437 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 01:26:46 +00:00
pusscat
9e85a3bf0f
Update binaries and readme file
...
git-svn-id: file:///home/svn/framework3/trunk@7433 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 20:16:05 +00:00
pusscat
a8576a584f
Initial import of David Weston's "smart file" loading that allows (among other things) importation of buffers annotated with 010's map files!
...
git-svn-id: file:///home/svn/framework3/trunk@7431 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 19:56:33 +00:00
HD Moore
1a094cec0d
Update for 3.3
...
git-svn-id: file:///home/svn/framework3/trunk@7424 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 07:02:43 +00:00
HD Moore
a87fc61a63
Updated banners
...
git-svn-id: file:///home/svn/framework3/trunk@7414 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:54:53 +00:00
HD Moore
dbdf4df415
Minor tweaks to the Linux installers
...
git-svn-id: file:///home/svn/framework3/trunk@7410 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:14:18 +00:00
HD Moore
7b8d08a635
Fixes #466 and #467 . Binaries and source to be stored outside the tree
...
git-svn-id: file:///home/svn/framework3/trunk@7372 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 02:55:18 +00:00
HD Moore
df9a43ac61
See #376
...
git-svn-id: file:///home/svn/framework3/trunk@7344 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 03:21:14 +00:00
HD Moore
ea54f3e013
Minor tweaks for formatting
...
git-svn-id: file:///home/svn/framework3/trunk@7343 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 01:18:37 +00:00
pusscat
bcc8d5d8ca
Update all binaries
...
git-svn-id: file:///home/svn/framework3/trunk@7341 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 21:52:00 +00:00
pusscat
c7030e7705
Add tenketsu heap logging
...
git-svn-id: file:///home/svn/framework3/trunk@7340 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 21:49:24 +00:00
HD Moore
21e82d8b69
This patch implements a much more flexible executable creation scheme at the cost of exe size. This also adds the "-x" option to msfencode, allowing the user to specify their own executable template for generation.
...
git-svn-id: file:///home/svn/framework3/trunk@7315 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-01 04:11:43 +00:00
HD Moore
e5e89906d0
Switch the meterpreter to SSLv3 and try to generate a slightly more realistic CN for the certificate. The goal is to work through a wider range of inline proxies.
...
git-svn-id: file:///home/svn/framework3/trunk@7311 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-31 20:44:23 +00:00
HD Moore
31276e1626
Fixes #427 . Finally found a solution that works for 1.8 and 1.9, this allows lorcon modules to run in the background or foreground and handle interrupts from the console gracefully. Its still a hack
...
git-svn-id: file:///home/svn/framework3/trunk@7293 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-28 00:19:17 +00:00
HD Moore
7b22b2cc04
Mostly working codebase, still hanging on some instances, depends on latest svn of lorcon2. See #427
...
git-svn-id: file:///home/svn/framework3/trunk@7292 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-27 20:13:20 +00:00
HD Moore
5234fe8ff8
Fixes 416. Adds the rm/del commands to meterpreter, fixes build problems triggered by the POSIX code merge
...
git-svn-id: file:///home/svn/framework3/trunk@7291 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-27 02:31:07 +00:00
HD Moore
276a3f8052
Use _WIN32 instead of __WIN32__ to be consistent
...
git-svn-id: file:///home/svn/framework3/trunk@7290 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-27 01:13:35 +00:00
HD Moore
3b99a513ec
Fixes #352 and fixes #350 . Can no longer reproduce memory corruption or packet loss with this code
...
git-svn-id: file:///home/svn/framework3/trunk@7287 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 22:49:43 +00:00
HD Moore
b662d044a6
Fixes #412 . Still an issue with lorcon not yielding back when there is no traffic, but this is a different bug
...
git-svn-id: file:///home/svn/framework3/trunk@7286 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 22:36:24 +00:00
HD Moore
ddeb80e0da
See #412 . Fix compile warnings and errors on 1.9, still needs testing
...
git-svn-id: file:///home/svn/framework3/trunk@7285 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 21:09:40 +00:00
HD Moore
7d7c565a37
Merge in the POSIX stdapi extension, still some work left to finish
...
git-svn-id: file:///home/svn/framework3/trunk@7266 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 04:34:20 +00:00
HD Moore
9fda642939
Prevent the packet loop from blocking ruby
...
git-svn-id: file:///home/svn/framework3/trunk@7234 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-23 15:58:09 +00:00
HD Moore
070f85d6b5
Adds Lorcon::Device.write() for compatibility with Lorcon1
...
git-svn-id: file:///home/svn/framework3/trunk@7233 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-23 14:40:47 +00:00
HD Moore
1acf372dce
Roll Lorcon2 into the metasploit tree, still testing the modules. See #378
...
git-svn-id: file:///home/svn/framework3/trunk@7228 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-23 04:32:26 +00:00
HD Moore
21de84f6ad
Adds ruby-lorcon2 to the tree, (from lorcon2 trunk). Still some bugs to go, see #378
...
git-svn-id: file:///home/svn/framework3/trunk@7227 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-22 15:46:01 +00:00
HD Moore
e07bce0101
Copyright updates reflecting the news
...
git-svn-id: file:///home/svn/framework3/trunk@7222 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-21 12:58:56 +00:00
HD Moore
00b2915554
Fixes #342 . Set ReverseConnectRetries to a value between 1 and 255 (default is 5). On failure it will ExitProcess (still better than a cpu spin)
...
git-svn-id: file:///home/svn/framework3/trunk@7217 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-20 20:31:14 +00:00
HD Moore
62b06f5e16
Add Alexander Sotirov's metsvc to svn
...
git-svn-id: file:///home/svn/framework3/trunk@7213 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-20 18:42:47 +00:00
kris
93dd1f2901
Fix pcaprub compilation errors (not warnings) for Ruby 1.9
...
git-svn-id: file:///home/svn/framework3/trunk@7119 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-03 02:45:15 +00:00
HD Moore
bf5068f6b1
Fixes #288 and #320 . This should fix the BSoD issue with the sniffer module (other than the mac filter change, this matches the vendor's example) and confirmed that the keyscan_dump fix works
...
git-svn-id: file:///home/svn/framework3/trunk@7066 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-26 16:26:05 +00:00
et
a89914d448
Finally screenshot capture. BMP at this time
...
git-svn-id: file:///home/svn/framework3/trunk@7063 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-26 04:05:09 +00:00
James Lee
6a7a023844
I will not commit when sleep deprived. I will not commit when sleep deprived. I will not commit...
...
git-svn-id: file:///home/svn/framework3/trunk@7061 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-25 06:40:42 +00:00
James Lee
bc2c38c332
shave an instruction from the new allports stager
...
git-svn-id: file:///home/svn/framework3/trunk@7060 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-25 06:13:13 +00:00
HD Moore
ee9a8f4f76
Adds support for the reverse_tcp_allports stager for Windows. This payload tries to connect back on all ports, one at a time, from LPORT to 65535. This is incredibly slow (depends on the default socket timeout) and requires the user to forward all TCP ports of LHOST to a single listening port in the handler. Inspired by a few user requests and this blog post: http://clinicallyawesome.com/post/196352889/blind-connect-back-through-restrictive-firewall
...
git-svn-id: file:///home/svn/framework3/trunk@7058 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-25 05:44:50 +00:00
James Lee
e30e850ba7
shave a few bytes off of the windows stagers
...
git-svn-id: file:///home/svn/framework3/trunk@7035 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-14 08:45:01 +00:00
Stephen Fewer
1937839e79
Patch meterpreter's sysinfo command to resolve the system language and architecture.
...
git-svn-id: file:///home/svn/framework3/trunk@7028 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-10 13:09:48 +00:00
Stephen Fewer
36d60d5d12
Commit the x64 build of the meterpreter incognito extension.
...
git-svn-id: file:///home/svn/framework3/trunk@7009 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-07 09:25:25 +00:00
Stephen Fewer
ff9efacffa
Commit the x64 build of the meterpreter priv extension.
...
git-svn-id: file:///home/svn/framework3/trunk@7008 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-07 09:17:29 +00:00
Stephen Fewer
402608ec6f
Commit the openssl x64 static libraries required for compilation. These are freshly built using the latest stable release (openssl-0.9.8k). Instructions for re-building the libraries also included.
...
git-svn-id: file:///home/svn/framework3/trunk@7001 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-04 01:58:17 +00:00
Stephen Fewer
5dee5819b1
Commit the source code for the cross compilable reflective dll injection module. Some minor modifications to the stdapi extension were also required. All the projects (.vcproj) now have an x64 debug/release target as well as an x86 counterpart.
...
git-svn-id: file:///home/svn/framework3/trunk@7000 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-04 01:53:58 +00:00
Stephen Fewer
1cb3c42589
First commit! update vnc server with the new exitfunk hash values as well as modify ReflectiveLoader to retrieve kernel32 base address dynamically ala its meterpreter counterpart.
...
git-svn-id: file:///home/svn/framework3/trunk@6989 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-31 10:28:26 +00:00
HD Moore
87ea275a17
Fixes #299 - corrects the win32 build environment and source to build properly again
...
git-svn-id: file:///home/svn/framework3/trunk@6987 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-30 01:57:25 +00:00
pusscat
4361028a45
New binaries
...
git-svn-id: file:///home/svn/framework3/trunk@6984 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-28 16:01:36 +00:00
HD Moore
97725a489c
Round 3 of x64 support from Stephen Fewer - new payloads!
...
git-svn-id: file:///home/svn/framework3/trunk@6980 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-27 19:29:54 +00:00
HD Moore
cf10a62dcc
Merge in the beginnings of x64 support from Stephen Fewer
...
git-svn-id: file:///home/svn/framework3/trunk@6972 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-23 23:47:33 +00:00
pusscat
56881d35d2
Fix a pile of identBuf parsing issues that occur if you forget an argument for a specific buf type
...
git-svn-id: file:///home/svn/framework3/trunk@6970 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-21 12:48:16 +00:00
pusscat
1bfd5a1cd6
Add new winxp bins
...
git-svn-id: file:///home/svn/framework3/trunk@6969 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-20 13:13:11 +00:00
pusscat
f3131404b9
Replace # wih REM for xp
...
git-svn-id: file:///home/svn/framework3/trunk@6967 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-19 17:37:20 +00:00
HD Moore
a811f28535
Patch from snfernandez to fix posix extension loading
...
git-svn-id: file:///home/svn/framework3/trunk@6954 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-12 23:15:08 +00:00
pusscat
d61860eda0
Add searchVtptr readme info
...
git-svn-id: file:///home/svn/framework3/trunk@6953 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-12 21:51:42 +00:00
pusscat
c3011bd07c
Addition of searchVtptr
...
git-svn-id: file:///home/svn/framework3/trunk@6952 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-12 21:31:45 +00:00
HD Moore
41121f5870
Major merge of Meterpreter POSIX codebase from JR, Win32 projects may need a few more fixes to work properly
...
git-svn-id: file:///home/svn/framework3/trunk@6949 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-10 02:02:16 +00:00
HD Moore
d5ffcc1907
fix the posix build (patch from JR)
...
git-svn-id: file:///home/svn/framework3/trunk@6945 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-09 17:28:44 +00:00
HD Moore
79df0ab405
Merge in JR's ulibc code
...
git-svn-id: file:///home/svn/framework3/trunk@6944 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-09 02:27:52 +00:00
HD Moore
da32f1bdea
Updated meterpreter code/binaries to scrub memory after use, works around Peter's memoryze signatures from BH/DC 2009
...
git-svn-id: file:///home/svn/framework3/trunk@6942 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-08 14:22:32 +00:00
pusscat
b9c2d57630
Update heap modeler coalesce functionality, as well as searchOpcode
...
git-svn-id: file:///home/svn/framework3/trunk@6941 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-06 20:09:38 +00:00
HD Moore
9a1e07c4f3
First round of posix meterpreter commits from jr
...
git-svn-id: file:///home/svn/framework3/trunk@6934 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-01 14:21:58 +00:00
HD Moore
26ca5ec646
Nuke the compiled bins
...
git-svn-id: file:///home/svn/framework3/trunk@6926 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-01 03:21:22 +00:00
HD Moore
c173bff563
Updated reflective stuff to match the new hashing function
...
git-svn-id: file:///home/svn/framework3/trunk@6923 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-31 17:57:51 +00:00
HD Moore
49b7dcb30c
Overhaul of the metasploit payloads from Stephen Fewer - smaller/cleaner/new hashing/support for WinNT 4.0 -> Win7 with size reductions for the stagers and minimal size increases for the singles
...
git-svn-id: file:///home/svn/framework3/trunk@6922 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-31 17:50:10 +00:00
HD Moore
a97abcf837
Cleaning up pcaprub, interface closing will still be handled by the GC
...
git-svn-id: file:///home/svn/framework3/trunk@6859 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-21 19:36:37 +00:00
pusscat
4fd458a309
Update some identBuf documentation
...
git-svn-id: file:///home/svn/framework3/trunk@6853 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-21 14:54:34 +00:00
James Lee
0044635e3b
remove a temp commit leftover
...
git-svn-id: file:///home/svn/framework3/trunk@6834 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-18 20:59:10 +00:00
HD Moore
5577fac39e
Closes #297 . Switches to the dnet headers for the sniffer packet decodes
...
git-svn-id: file:///home/svn/framework3/trunk@6822 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-17 19:39:31 +00:00
HD Moore
9db072b2e4
cleans up the pcaprub code a little bit during packet receives
...
git-svn-id: file:///home/svn/framework3/trunk@6820 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-17 16:14:07 +00:00
HD Moore
697d89c8cf
Wait on the pcap file handle to reduce cpu consumption during sniffing
...
git-svn-id: file:///home/svn/framework3/trunk@6814 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-17 02:24:21 +00:00
HD Moore
2c4acca92a
Fixes #296 . Removes polarssl references
...
git-svn-id: file:///home/svn/framework3/trunk@6811 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-16 16:00:29 +00:00
HD Moore
975093efca
Updated VC++ project files to fix the directory paths/includes for OpenSSL
...
git-svn-id: file:///home/svn/framework3/trunk@6774 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 03:14:20 +00:00
HD Moore
148ca687f5
Updated libraries and source code now using OpenSSL
...
git-svn-id: file:///home/svn/framework3/trunk@6773 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 03:10:39 +00:00
HD Moore
6b0974f618
Goodbye PolarSSL (your license stinks).
...
git-svn-id: file:///home/svn/framework3/trunk@6772 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 03:03:53 +00:00
HD Moore
e8784d68fb
Fixes up the sniffer to handle large packet captures better, fixes a regression in the sysinfo command.
...
git-svn-id: file:///home/svn/framework3/trunk@6768 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-12 13:17:37 +00:00
HD Moore
f76d73a823
Free packet memory when the capture is stopped
...
git-svn-id: file:///home/svn/framework3/trunk@6765 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-11 18:19:42 +00:00
HD Moore
4989f9bdbe
Fixes a bug where if the sniffer SDK could not initialize, it would still be treated as initialized the next time it was checked.
...
git-svn-id: file:///home/svn/framework3/trunk@6764 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-11 17:52:40 +00:00
HD Moore
645ca020e9
Fixes a memory corruption issue with the SSL file descriptor (was using a stack reference instead of the Remote->fd reference), adds the source code sans the Packet SDK for the sniffer module
...
git-svn-id: file:///home/svn/framework3/trunk@6763 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-11 17:32:50 +00:00
HD Moore
608ca7aae8
This patch removes some of the meterpreter compiler warnings and fixes migration over SSL
...
git-svn-id: file:///home/svn/framework3/trunk@6761 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 22:44:33 +00:00
HD Moore
7b516e06fe
Transfer the migration payload over SSL, still working on a crash bug after migration completes
...
git-svn-id: file:///home/svn/framework3/trunk@6756 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 03:22:10 +00:00
HD Moore
48e1e5f351
Merge Stephen Fewer's patches to enable support for Windows 7 (fixes support for NT and 2000 as well)
...
git-svn-id: file:///home/svn/framework3/trunk@6744 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-05 20:24:37 +00:00
HD Moore
0ad96dd656
Adds a top-level SEH handler around the initialization stub, prevents a fatal error from preventing EXITFUNC from being called.
...
git-svn-id: file:///home/svn/framework3/trunk@6722 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-27 19:39:10 +00:00
HD Moore
43372de9f0
Fix a bug in the new SSL code that broke large transfers
...
git-svn-id: file:///home/svn/framework3/trunk@6720 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-27 01:52:36 +00:00
HD Moore
aaff989294
Add the PolarSSL lib file and output directory to make building easier
...
git-svn-id: file:///home/svn/framework3/trunk@6719 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-26 23:22:07 +00:00
HD Moore
a74d3a3f38
Switches meterpreter to SSL by default, using the PolarSSL library. To build this, just place polarssl.lib into an workspace/common/Release/
...
git-svn-id: file:///home/svn/framework3/trunk@6718 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-26 23:18:53 +00:00
HD Moore
1fba3f678b
Adds Windows 7 support for the primary stagers: http://www.harmonysecurity.com/blog/2009/06/retrieving-kernel32s-base-address.html
...
git-svn-id: file:///home/svn/framework3/trunk@6677 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 04:35:44 +00:00
HD Moore
b8efb1bbf9
Add Stephen Fewer's shiny exploit for the Java deserialization flaw
...
git-svn-id: file:///home/svn/framework3/trunk@6664 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-16 17:19:44 +00:00
James Lee
0a8235eb44
removing them
...
git-svn-id: file:///home/svn/framework3/trunk@6570 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-20 17:51:45 +00:00
James Lee
1ab4a0457b
preparing to remove unnecessary exes trigger AV
...
git-svn-id: file:///home/svn/framework3/trunk@6569 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-20 17:50:49 +00:00
et
746a3c533a
ext. sample dll. not ready for production enviroments
...
git-svn-id: file:///home/svn/framework3/trunk@6506 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-29 03:38:42 +00:00
et
205a57da77
ext code and project adjustments
...
git-svn-id: file:///home/svn/framework3/trunk@6500 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-27 04:34:28 +00:00
et
03d8541b3f
espia early stages
...
git-svn-id: file:///home/svn/framework3/trunk@6499 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-27 03:43:22 +00:00
HD Moore
f059fbece7
Source code and VS project changes for cleaner build and new keyboard logging code
...
git-svn-id: file:///home/svn/framework3/trunk@6374 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-23 05:26:11 +00:00
HD Moore
67ed4d2b68
Commit the patched reflective DLL injection tree for VNC from Stephen Fewer
...
git-svn-id: file:///home/svn/framework3/trunk@6373 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-23 05:19:33 +00:00
HD Moore
678370d57f
Swapping out the old code for the new reflective DLL based tree
...
git-svn-id: file:///home/svn/framework3/trunk@6372 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-23 05:18:22 +00:00
HD Moore
ac7aa759cd
Swapping in the latest patched copy of Meterpreter. See #275
...
git-svn-id: file:///home/svn/framework3/trunk@6357 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-22 18:56:28 +00:00
HD Moore
07f59c2590
Swapping out old Meterpreter code for Stephen Fewer's latest patched copy
...
git-svn-id: file:///home/svn/framework3/trunk@6356 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-22 18:55:36 +00:00
HD Moore
24b324ccce
Swap the tarball for the extracted source tree
...
git-svn-id: file:///home/svn/framework3/trunk@6354 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-19 20:10:27 +00:00
HD Moore
13706d1bde
Tons of new Mac OS X code from Dino Dai Zovi and Charlie Miller, more to follow
...
git-svn-id: file:///home/svn/framework3/trunk@6353 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-18 23:28:24 +00:00
HD Moore
8c0b0fdf69
Import a new patch from Darren Kemp, adds open_dead and pcap_dump
...
git-svn-id: file:///home/svn/framework3/trunk@6335 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-12 01:07:38 +00:00
pusscat
73ae8dabfb
Big fixes for file importation with indentBuf
...
git-svn-id: file:///home/svn/framework3/trunk@6302 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-05 19:57:26 +00:00
kris
f20c6fa08c
fix lorcon test case sending 11x as many packets as it's supposed to
...
git-svn-id: file:///home/svn/framework3/trunk@6232 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-17 15:44:32 +00:00
James Lee
567f4844fb
Make Pcap.next really non-blocking
...
git-svn-id: file:///home/svn/framework3/trunk@6212 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-12 16:21:13 +00:00
HD Moore
9bb89b8387
Remove debugging line
...
git-svn-id: file:///home/svn/framework3/trunk@6211 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-11 05:20:12 +00:00
root
345a816394
Fix up offline mode for pcaprun
...
git-svn-id: file:///home/svn/framework3/trunk@6210 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-10 15:54:52 +00:00
pusscat
37f579bbe7
- Remove issue with nulls controlling registers during hunts
...
- Remove size requirement for file inputs; now it will grab th whole file by default
- Remove issue with treating tracked bufs like strings in listBuf
git-svn-id: file:///home/svn/framework3/trunk@6173 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-22 21:28:05 +00:00
pusscat
0f6ba79619
Add support for sucking in files directly to indentBuf and memDiff
...
git-svn-id: file:///home/svn/framework3/trunk@6159 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-16 17:14:46 +00:00
pusscat
55bc55afed
Fix tab spacing issues for odd numbers
...
git-svn-id: file:///home/svn/framework3/trunk@6158 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-15 22:27:23 +00:00
pusscat
3b4596ab2e
Update Win7 and XPSP2 binaries
...
git-svn-id: file:///home/svn/framework3/trunk@6157 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-15 21:02:25 +00:00
pusscat
474353e7b6
Initial import of the memDiff jutsu
...
git-svn-id: file:///home/svn/framework3/trunk@6156 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-15 20:25:44 +00:00
et
34c0b3a2fa
Added Burp Proxy v1.x support for Wmap by Spinbad
...
git-svn-id: file:///home/svn/framework3/trunk@6132 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-12 02:57:19 +00:00
druid
145ab89354
Removed Makefile and mkmf.log
...
git-svn-id: file:///home/svn/framework3/trunk@6122 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 06:34:11 +00:00
druid
cad513b703
MSF fork of the RubyForge ruby-serialport library
...
git-svn-id: file:///home/svn/framework3/trunk@6117 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 05:35:23 +00:00
pusscat
72588d6f9a
Add Windows7 beta build 7000 x86 binaries!
...
git-svn-id: file:///home/svn/framework3/trunk@6103 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 22:12:39 +00:00
pusscat
df1821be31
Update to word and byt primitive tracking
...
git-svn-id: file:///home/svn/framework3/trunk@6090 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-08 16:10:28 +00:00
pusscat
45fb3c4a82
Add success splash on load, add list functionality, update bins
...
git-svn-id: file:///home/svn/framework3/trunk@6085 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-07 21:21:16 +00:00
pusscat
fa334604b9
Add trackVal jutsu
...
git-svn-id: file:///home/svn/framework3/trunk@6084 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-07 17:50:31 +00:00
druid
5e930f686b
Added build and install instructions
...
git-svn-id: file:///home/svn/framework3/trunk@6057 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-02 21:04:06 +00:00
pusscat
2cb135dc02
Uh... add files...
...
git-svn-id: file:///home/svn/framework3/trunk@6025 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 16:57:01 +00:00
pusscat
9c6ffc3f03
Add !sympath to the readme
...
git-svn-id: file:///home/svn/framework3/trunk@6019 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-18 20:53:00 +00:00
pusscat
457787df2c
Add a bit more sanity checking to the map parser
...
git-svn-id: file:///home/svn/framework3/trunk@6018 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-18 20:33:35 +00:00
pusscat
a1ea598656
Add working map file imports with the !symport command
...
git-svn-id: file:///home/svn/framework3/trunk@6017 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-18 18:20:04 +00:00
pusscat
9463f4ca2b
Add dirty dirty IDA map file parsing code - soon to be integrated when I can figure out the IDebugSymbols object
...
git-svn-id: file:///home/svn/framework3/trunk@6016 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-17 21:59:40 +00:00
Ramon de C Valle
5b225cea89
Updated unixasm on external source tree
...
git-svn-id: file:///home/svn/framework3/trunk@5942 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-17 10:34:26 +00:00
HD Moore
a97179a236
Zip up the reflective directories, saving some space
...
git-svn-id: file:///home/svn/framework3/trunk@5939 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-17 06:17:16 +00:00
et
b4cbe4ff8d
Multiple bug fixes. Fixed query modules now resolved to correct function. Corrected in proxy and wmap code handling of RHOSTS as hostnames are not in use. Fixed reporting as target port was not handled properly and modules modified to reflect new wmap_target methods.
...
git-svn-id: file:///home/svn/framework3/trunk@5869 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 04:38:05 +00:00
HD Moore
093e605d0d
Import the Reflective DLL Injection skeleton project
...
git-svn-id: file:///home/svn/framework3/trunk@5843 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-05 06:12:49 +00:00
HD Moore
d573c31be9
Remove the output directory from svn
...
git-svn-id: file:///home/svn/framework3/trunk@5840 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 20:10:11 +00:00
HD Moore
38980c079e
Remove the output directory from svn
...
git-svn-id: file:///home/svn/framework3/trunk@5839 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 20:09:38 +00:00
HD Moore
187f79eddf
Switch the DLLs for vnc/meterp to Stephen Fewer's reflective versions, check in the reflectve_meterpreter source code project
...
git-svn-id: file:///home/svn/framework3/trunk@5837 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 20:08:24 +00:00
HD Moore
08d296240a
Add the license to the actual .[ch] files and remove the inaccurate readme
...
git-svn-id: file:///home/svn/framework3/trunk@5811 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-30 22:30:32 +00:00
HD Moore
675e03c272
Clarify the licensing between reflective and vnc
...
git-svn-id: file:///home/svn/framework3/trunk@5810 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-30 22:22:58 +00:00
HD Moore
ac70cc88eb
Remove the giant program database
...
git-svn-id: file:///home/svn/framework3/trunk@5809 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-30 22:21:46 +00:00
HD Moore
345837485f
Remove the Release object directory
...
git-svn-id: file:///home/svn/framework3/trunk@5808 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-30 22:21:01 +00:00
HD Moore
835ce24792
Add the modified VNC DLL from Stephen Fewer
...
git-svn-id: file:///home/svn/framework3/trunk@5807 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-30 22:20:37 +00:00
Ramon de C Valle
233dd73a27
Added unixasm sources to the external source tree
...
git-svn-id: file:///home/svn/framework3/trunk@5736 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-10 18:23:18 +00:00
HD Moore
422e58c51f
Close the listening socket, allows the same shellcode to beused on the same port repeatedly, thanks antoine!
...
git-svn-id: file:///home/svn/framework3/trunk@5705 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-01 16:16:34 +00:00
HD Moore
3c30d7aefd
Correct a typo in offline mode detection
...
git-svn-id: file:///home/svn/framework3/trunk@5701 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-30 21:46:01 +00:00
et
1bf3c76c9c
added MZ's ratproxy patch for wmap
...
git-svn-id: file:///home/svn/framework3/trunk@5696 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-28 00:09:50 +00:00
HD Moore
a75978a218
Patch from Stephen Fewer from Harmony Security, makes the midstager uses VirtualAlloc with RWX, solves a number of issues, specifically stack space starvation for large payloads.
...
git-svn-id: file:///home/svn/framework3/trunk@5683 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 22:54:30 +00:00
pusscat
c4a58660aa
Modify the readme to be more explicit about the build process
...
git-svn-id: file:///home/svn/framework3/trunk@5667 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-17 19:24:03 +00:00
pusscat
64b8bba5f7
Add new binaries for specific versions
...
git-svn-id: file:///home/svn/framework3/trunk@5665 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-17 15:18:37 +00:00
pusscat
de60bd8e35
Add tenketsu test program
...
git-svn-id: file:///home/svn/framework3/trunk@5650 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-02 14:33:41 +00:00
pusscat
9f83c9d5b4
Update binaries for searchOpcodes changes
...
git-svn-id: file:///home/svn/framework3/trunk@5643 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-26 15:05:49 +00:00
pusscat
2a093a3f2a
Add searchOpcode tag for !jutsu
...
git-svn-id: file:///home/svn/framework3/trunk@5642 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-25 20:51:17 +00:00
HD Moore
7d2bb9536a
Updated README, include the templates and other src
...
git-svn-id: file:///home/svn/framework3/trunk@5637 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-22 18:45:33 +00:00
pusscat
ed379dddf5
Remove mangekyo build script... oops!
...
git-svn-id: file:///home/svn/framework3/trunk@5636 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-22 14:39:10 +00:00
HD Moore
d53dd66701
Adds initial support for IPv6, including two stager. Tested Meterpreter over IPv6 stages on XP and Vista. Using this is still tricky, I will add a wiki page tomorrow to explain the ScopeID stuff for link-local testing. This commit also includes the raw (oversized) assembler for the stagers as well as the entire old metasploit assembly set (useful for development).
...
git-svn-id: file:///home/svn/framework3/trunk@5635 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-22 06:34:57 +00:00
pusscat
058e338028
Add injectsu and detours binaries
...
git-svn-id: file:///home/svn/framework3/trunk@5634 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-20 19:39:12 +00:00
HD Moore
8dc54f35d3
Merging from the byakugan branch
...
git-svn-id: file:///home/svn/framework3/trunk@5633 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-20 19:27:03 +00:00
HD Moore
f41234b110
Offline support for pcaprub
...
git-svn-id: file:///home/svn/framework3/trunk@5555 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-14 05:37:38 +00:00
HD Moore
3c64c454df
Patches to README and extconf.rb from Civ <civ[at]8thdaytech.com>
...
git-svn-id: file:///home/svn/framework3/trunk@5545 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-29 21:37:10 +00:00
HD Moore
8c244f4422
This patch makes pcap.next non-blocking from a Ruby thread perspective. It does eat more CPU if there are no select() loops in the calling Ruby parent, but this isnt too common and never an issue for MSF
...
git-svn-id: file:///home/svn/framework3/trunk@5534 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-22 17:14:11 +00:00
Matt Miller
7ecda0a786
update comment
...
git-svn-id: file:///home/svn/framework3/trunk@5513 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-26 10:27:22 +00:00
Matt Miller
d94bfaf373
better support for nx with dllinject payloads/meterp
...
git-svn-id: file:///home/svn/framework3/trunk@5510 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-26 06:34:12 +00:00
Matt Miller
e63a121341
merge incognito updates from Luke Jennings
...
git-svn-id: file:///home/svn/framework3/trunk@5499 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-28 16:57:49 +00:00
HD Moore
1ea29ba8f0
Fixes #218 . Updates the http password capture module. Removes a bogus makefile from the tree
...
git-svn-id: file:///home/svn/framework3/trunk@5452 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-22 06:34:52 +00:00
HD Moore
3ca6c2de44
Fix the test case
...
git-svn-id: file:///home/svn/framework3/trunk@5437 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-10 21:12:12 +00:00
HD Moore
4f7e0ec141
Change test script to match new api
...
git-svn-id: file:///home/svn/framework3/trunk@5428 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-03 19:02:41 +00:00
HD Moore
b2f9397be2
Commit a patch from warl0ck
...
git-svn-id: file:///home/svn/framework3/trunk@5418 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-14 19:50:56 +00:00
HD Moore
151d928280
Nuke ruby-pcapx (pcaprub replaces it)
...
git-svn-id: file:///home/svn/framework3/trunk@5345 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-25 03:09:04 +00:00
HD Moore
0f5d0164a3
Adds auto-execute support (hex edit the binary and change the # * 8192 to a list of commands, separated by newlines, ending with a NULL byte, keeping the same buffer size).
...
git-svn-id: file:///home/svn/framework3/trunk@5180 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-23 23:22:27 +00:00
HD Moore
13426097eb
Adds the 'script' command
...
git-svn-id: file:///home/svn/framework3/trunk@5178 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-23 22:23:34 +00:00
HD Moore
33ec424e2c
Enable self-destruction by default.
...
git-svn-id: file:///home/svn/framework3/trunk@5176 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-22 05:29:49 +00:00
HD Moore
39401d2638
Remove a typo
...
git-svn-id: file:///home/svn/framework3/trunk@5175 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-21 03:16:18 +00:00
HD Moore
f38ed1f233
Woops, forgot to add cmd_net.c
...
git-svn-id: file:///home/svn/framework3/trunk@5174 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-21 03:12:24 +00:00
HD Moore
ea3cebc3ed
Added the download command
...
git-svn-id: file:///home/svn/framework3/trunk@5172 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-21 02:54:07 +00:00
HD Moore
adbd594a5b
The cp command now handles destination directory names and preserves permissions
...
git-svn-id: file:///home/svn/framework3/trunk@5170 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-20 20:40:41 +00:00
HD Moore
492d286157
Adds the cp command
...
git-svn-id: file:///home/svn/framework3/trunk@5168 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-20 20:12:19 +00:00
HD Moore
39ed1257d1
Replaces system/exec to use execve/waitpid
...
git-svn-id: file:///home/svn/framework3/trunk@5166 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-20 19:56:47 +00:00
HD Moore
a3e365c2b5
Adding ipwn source/binary
...
git-svn-id: file:///home/svn/framework3/trunk@5165 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-20 18:27:09 +00:00