Stephen Fewer
5e2295a9a8
Add in an aux module to create a socks4 proxy server. If you add in a route via a meterpreter session to the framework routing table the proxy server will use that route where appropriate. (Also modified the servers opts hash to optionally take a 'Comm' param if you want to programmatically create a socks4 server which will always use a specific meterpreter session for all socket creation - by default this does not happen and it uses the rex socket switchboard as per normal rex socket creation).
...
git-svn-id: file:///home/svn/framework3/trunk@10337 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 18:23:03 +00:00
Stephen Fewer
5c2717a189
Add in a Socks4a proxy server.
...
git-svn-id: file:///home/svn/framework3/trunk@10330 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 12:11:30 +00:00
HD Moore
cf440fc6c9
Rename for consistency
...
git-svn-id: file:///home/svn/framework3/trunk@10324 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-15 08:40:57 +00:00
Stephen Fewer
6f4eaeb8e3
Delete the ruby side railgun meterpreter extension and add in the new stdapi railgun stuff. Railgun with stdapi works the same (e.g. just use client.railgun.user32.MesageBoxA(...) ). The module definitions are lazy loaded on demand to avoid the performance hit if we load them all at once when stdapi is initially loaded.
...
git-svn-id: file:///home/svn/framework3/trunk@10319 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-14 23:28:52 +00:00
Stephen Fewer
e85b8adcf8
Add Ruby side meterpreter packet support for QWORD Tlv's.
...
git-svn-id: file:///home/svn/framework3/trunk@10318 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-14 23:23:15 +00:00
HD Moore
44a67d0440
Typo fix
...
git-svn-id: file:///home/svn/framework3/trunk@10315 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-14 18:20:17 +00:00
HD Moore
792285cb87
Clean up monitor threads
...
git-svn-id: file:///home/svn/framework3/trunk@10309 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 21:07:02 +00:00
HD Moore
778132ad02
Remove the select spin loop in favor of a thread.join
...
git-svn-id: file:///home/svn/framework3/trunk@10308 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 20:57:38 +00:00
HD Moore
7ccf4e2f11
Change stream writes to be non-blocking, this has been pretty heavily tested over the last couple days, and should preserve the original behavior as well. This fixes a deadlock in Ruby in certain conditions
...
git-svn-id: file:///home/svn/framework3/trunk@10306 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-13 14:39:17 +00:00
James Lee
eddd6d481d
add some documentation for request_cgi
...
git-svn-id: file:///home/svn/framework3/trunk@10293 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-11 17:31:26 +00:00
Joshua Drake
eec9b59609
add docs dir
...
git-svn-id: file:///home/svn/framework3/trunk@10274 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-09 15:49:06 +00:00
Joshua Drake
1405bda8a4
properly set defaults for ip start and end, fixes #2500
...
git-svn-id: file:///home/svn/framework3/trunk@10261 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-08 17:06:31 +00:00
Joshua Drake
e8e796868e
default to nil
...
git-svn-id: file:///home/svn/framework3/trunk@10237 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-04 00:08:12 +00:00
James Lee
0b8eebcace
make sure sets has something in it. lib/msf/core/exploit.rb sends this a nil if the user didn't specify anything
...
git-svn-id: file:///home/svn/framework3/trunk@10235 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-03 23:48:46 +00:00
Tod Beardsley
4388b886c8
jduck tricked me on purpose.
...
git-svn-id: file:///home/svn/framework3/trunk@10222 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-02 16:22:48 +00:00
Tod Beardsley
e7aa1a86ec
Avoid xml encoding spaces.
...
git-svn-id: file:///home/svn/framework3/trunk@10221 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-02 16:20:30 +00:00
Tod Beardsley
832960b6df
Whoops forgot the x.
...
git-svn-id: file:///home/svn/framework3/trunk@10216 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-01 23:26:35 +00:00
Tod Beardsley
1d1805306e
Adds xml_char_encode. Like html_encode, but allows xml-safe character through.
...
git-svn-id: file:///home/svn/framework3/trunk@10214 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-01 22:40:07 +00:00
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
Joshua Drake
6d333eb185
style compliance fixes
...
git-svn-id: file:///home/svn/framework3/trunk@10173 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 21:26:59 +00:00
Joshua Drake
d02687b755
add dest adjust option to omelete hunter
...
git-svn-id: file:///home/svn/framework3/trunk@10172 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 21:19:42 +00:00
Joshua Drake
8dd489ad3b
expose the payload exe filename, remove the concat operator
...
git-svn-id: file:///home/svn/framework3/trunk@10169 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 17:23:47 +00:00
Joshua Drake
a3a20ebb05
default to no concatenation
...
git-svn-id: file:///home/svn/framework3/trunk@10168 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 17:16:44 +00:00
Stephen Fewer
fbf64adf2a
Commit the ruby side for meterpreter file search. If available, will leverage Windows Search to speed up searching an indexed directory. Examples of usage as follows:
...
Find all .PDF files on the host system:
meterpreter>search *.pdf
Find all files on bob's desktop:
meterpreter>search -d 'c:\users\bob\desktop' -f *
Find all files in the root drive c: but don't search subdirectories:
meterpreter>search -d c: -r false -f *
If Windows Search is available (Vista and above by default, XP/2003 by addon) we can also search any indexed IE history and indexed email
meterpreter>search -d iehistory -f *
meterpreter>search -d mapi -f *
git-svn-id: file:///home/svn/framework3/trunk@10167 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 14:59:38 +00:00
Joshua Drake
a119cb7b71
dont let close exceptions slow us down
...
git-svn-id: file:///home/svn/framework3/trunk@10163 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-27 04:44:02 +00:00
Joshua Drake
6e48076249
fixes #2435 , add BROADCAST option to DHCP server, use in cases where sending to 255.255.255.255 fails
...
git-svn-id: file:///home/svn/framework3/trunk@10159 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-26 19:34:53 +00:00
Joshua Drake
330281eadd
see #684 , adds checksum support, updates modules to use it, fixes some wfs_delay/WfsDelay issues
...
git-svn-id: file:///home/svn/framework3/trunk@10150 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:55:37 +00:00
Joshua Drake
a0e7901c19
add syscall name comment
...
git-svn-id: file:///home/svn/framework3/trunk@10147 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 20:23:38 +00:00
Joshua Drake
9557980607
oops, semicolon is a comment except when used in metasm_shell
...
git-svn-id: file:///home/svn/framework3/trunk@10144 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 17:46:06 +00:00
Joshua Drake
1477ae6b92
merge in checksum support, add quick-n-dirty unit test
...
git-svn-id: file:///home/svn/framework3/trunk@10143 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 16:52:13 +00:00
Joshua Drake
623e4ef3ac
add forward search, reset between eggs, move options into a hash
...
git-svn-id: file:///home/svn/framework3/trunk@10132 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-25 01:21:12 +00:00
Joshua Drake
49beb83081
add the "makerc" command for quick resource script generation, fixes #738
...
git-svn-id: file:///home/svn/framework3/trunk@10119 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 21:19:01 +00:00
Joshua Drake
b6577681c6
another omelet update from Peter, this time with in-line assembly
...
git-svn-id: file:///home/svn/framework3/trunk@10118 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 21:03:00 +00:00
James Lee
bd96c10cc0
only read the history file if we have no history
...
git-svn-id: file:///home/svn/framework3/trunk@10117 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 20:56:50 +00:00
Joshua Drake
6e66831517
couple minor fixes to omelet mixin/class
...
git-svn-id: file:///home/svn/framework3/trunk@10116 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 19:53:15 +00:00
Joshua Drake
d2bada79a9
typo in error string
...
git-svn-id: file:///home/svn/framework3/trunk@10109 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 17:37:06 +00:00
Joshua Drake
08fc366d0b
add omlet mixin from Peter Van Eeckhoutte
...
git-svn-id: file:///home/svn/framework3/trunk@10108 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 17:35:41 +00:00
Joshua Drake
62f6c9b961
fix some 1.8/1.9 incompatabilities, should be last commit on #2329
...
git-svn-id: file:///home/svn/framework3/trunk@10106 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-23 16:45:38 +00:00
Joshua Drake
8c9d08b1e8
add egg override param for egghunter
...
git-svn-id: file:///home/svn/framework3/trunk@10098 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-22 20:19:19 +00:00
James Lee
5d95f48848
add preliminary support for the new java payloads. Working meterpreter and shell stages with tcp bind and reverse stagers, see #406
...
git-svn-id: file:///home/svn/framework3/trunk@10073 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 07:01:23 +00:00
James Lee
d9337f3cca
add a Jar class to Rex::Zip
...
git-svn-id: file:///home/svn/framework3/trunk@10057 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 17:08:29 +00:00
James Lee
d5149b8e23
less verbose Entry#inspect
...
git-svn-id: file:///home/svn/framework3/trunk@10056 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 17:04:42 +00:00
Stephen Fewer
a9a4e3f2da
Add meterpreter client side support for cleaning up loaded extensions upon server termination by calling the loaded extensions cleanup() method if available.
...
git-svn-id: file:///home/svn/framework3/trunk@10055 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-19 11:37:22 +00:00
Joshua Drake
48e91af25d
remove client ip send, remove puts lines, fixes #2329
...
git-svn-id: file:///home/svn/framework3/trunk@10049 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 23:35:28 +00:00
Joshua Drake
8463e026bd
read responses until EOF per RFC
...
git-svn-id: file:///home/svn/framework3/trunk@10045 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 22:41:07 +00:00
Joshua Drake
06dca2addb
fix this unit test
...
git-svn-id: file:///home/svn/framework3/trunk@10044 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 22:36:13 +00:00
Joshua Drake
b8991c541e
add a NO RECV flag to the client call function
...
git-svn-id: file:///home/svn/framework3/trunk@10038 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 17:21:10 +00:00
Joshua Drake
626f7e0c66
add a flag indication not to recv to various smb/client methods
...
git-svn-id: file:///home/svn/framework3/trunk@10037 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 17:20:55 +00:00
Joshua Drake
24d10866b6
add update_checksum, size, and length methods
...
git-svn-id: file:///home/svn/framework3/trunk@10036 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 04:39:38 +00:00
Joshua Drake
d46d4313e7
reduce verbosity for printed exceptions when processing on_request
...
git-svn-id: file:///home/svn/framework3/trunk@10029 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-17 22:57:52 +00:00
Joshua Drake
9ba0916937
fix port bug, add diff from sj, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@10015 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 20:21:14 +00:00
Joshua Drake
3a0402de2a
a few minor cleanups
...
git-svn-id: file:///home/svn/framework3/trunk@10013 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 06:42:17 +00:00
Jonathan Cran
10c2bfb64e
added validation for the meterpreter route command - thanks robin for pointing it out
...
git-svn-id: file:///home/svn/framework3/trunk@9993 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 06:12:05 +00:00
Joshua Drake
f48afb37a7
merge tftp.diff from scriptjunkie, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9991 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 03:25:43 +00:00
Joshua Drake
939bf2a881
merge dhcp.diif from scriptjunkie, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9990 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 03:11:30 +00:00
Joshua Drake
23a0064f9d
merge cleanup.diff from scriptjunkie, rewrote set_option, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9970 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-07 06:45:02 +00:00
Joshua Drake
7f8bbbc535
add dhcp/pxe stuff from scriptjunkie, see #2329
...
git-svn-id: file:///home/svn/framework3/trunk@9963 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-06 17:37:28 +00:00
Joshua Drake
52b2d0a495
add support for various options
...
git-svn-id: file:///home/svn/framework3/trunk@9962 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-06 17:21:22 +00:00
Joshua Drake
1c7ead1699
remove duped p_filesz entry, fixes #2307
...
git-svn-id: file:///home/svn/framework3/trunk@9937 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-27 18:03:18 +00:00
Carlos Perez
1ae81367ac
Forgot, TABS not spaces for indent
...
git-svn-id: file:///home/svn/framework3/trunk@9921 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-25 01:54:29 +00:00
Carlos Perez
d279123b77
Added functions for managing services in the railgun api and created new calls to use this functions for starting, stopping and creating services, Thanks to Scriptjunkie for the calls and example code that I used to base the mixin calls on
...
git-svn-id: file:///home/svn/framework3/trunk@9920 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-25 01:32:50 +00:00
James Lee
3ae1a26aef
include a bunch more firefox fingerprints. thanks Mark Fioravanti for the patch
...
git-svn-id: file:///home/svn/framework3/trunk@9917 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-23 22:20:05 +00:00
Joshua Drake
25bc9f2973
add error printing for HttpServer exploits
...
git-svn-id: file:///home/svn/framework3/trunk@9909 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 23:24:51 +00:00
James Lee
b8b5d0586d
generate job info from available properties in rpc. fixes #2236
...
git-svn-id: file:///home/svn/framework3/trunk@9902 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 08:57:11 +00:00
HD Moore
6b25b1024e
Always try to read the NB header first to get the length
...
git-svn-id: file:///home/svn/framework3/trunk@9826 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 17:07:10 +00:00
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
HD Moore
e765553d26
Fix BufferItem references
...
git-svn-id: file:///home/svn/framework3/trunk@9811 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 19:34:32 +00:00
HD Moore
9d859e4dce
Implements the client side of multi-call railgun
...
git-svn-id: file:///home/svn/framework3/trunk@9807 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 19:19:36 +00:00
Tod Beardsley
e67e231659
Adds Rex::Text.to_hex_ascii(), replaces the gsub on the banner checks to use it.
...
git-svn-id: file:///home/svn/framework3/trunk@9804 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 18:52:27 +00:00
James Lee
301d220c80
get rid of debugging alerts. wtf
...
git-svn-id: file:///home/svn/framework3/trunk@9800 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-13 07:58:50 +00:00
HD Moore
a430970ddd
Wrap the write() calls to catch exceptions from the socket api
...
git-svn-id: file:///home/svn/framework3/trunk@9794 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 17:55:20 +00:00
HD Moore
16134447d9
Cleanup / cosmetic for dcerpc, make EBADF pretend to be EOFError in terms of what exception is raised
...
git-svn-id: file:///home/svn/framework3/trunk@9752 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 19:05:16 +00:00
HD Moore
adf33feb0e
Catch an odd corner case with zero timeouts - this broke dcerpc over tcp
...
git-svn-id: file:///home/svn/framework3/trunk@9749 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 17:58:59 +00:00
HD Moore
2d65cb602b
Fix boolean handling
...
git-svn-id: file:///home/svn/framework3/trunk@9747 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 16:34:18 +00:00
Joshua Drake
573fc216dd
add write support, tftproot, output dir for tftp server
...
git-svn-id: file:///home/svn/framework3/trunk@9742 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 23:34:29 +00:00
HD Moore
a4c6280ae0
Minor cleanups for railgun, fix 1.8/1.9 differences, remove use of string encoding routines for 1.8 back-compat
...
git-svn-id: file:///home/svn/framework3/trunk@9736 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 18:53:49 +00:00
Joshua Drake
3049d527ef
there is no comm variable here, fixes #2200
...
git-svn-id: file:///home/svn/framework3/trunk@9728 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 20:49:49 +00:00
HD Moore
9915be8935
Add the railgun client extensions
...
git-svn-id: file:///home/svn/framework3/trunk@9712 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 16:31:24 +00:00
HD Moore
843b6ffa00
Make the http client try harder
...
git-svn-id: file:///home/svn/framework3/trunk@9698 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 23:08:28 +00:00
Joshua Drake
24fbbfb906
use fat_offset, from Dino, fixes #2183
...
git-svn-id: file:///home/svn/framework3/trunk@9682 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 17:16:35 +00:00
HD Moore
f3afedf490
Fix an issue caused by pad_data being a string not an integer, this caused the evasion code to return a nil. Fixed a couple of ambiguities in how options are passed
...
git-svn-id: file:///home/svn/framework3/trunk@9674 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-05 13:38:39 +00:00
Tod Beardsley
2250a83913
Updates meterpreter autoroute to accept CIDR notation.
...
git-svn-id: file:///home/svn/framework3/trunk@9667 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-03 01:27:24 +00:00
Tod Beardsley
fb273e83a9
Updates autoroute to enforce sensible netmasks. This is serious business.
...
git-svn-id: file:///home/svn/framework3/trunk@9664 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 18:42:56 +00:00
Tod Beardsley
01139ed655
Adding an autoroute meterpreter script, and enabling route housekeeping to be stored and retrived via Sessions directly, rather than through Rex::Socket::SwitchBoard.
...
git-svn-id: file:///home/svn/framework3/trunk@9663 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 17:38:56 +00:00
James Lee
1c9059eeb1
standardize job context as an Array and always copy datastore for jobs. fixes #2096 and fixes #2098
...
git-svn-id: file:///home/svn/framework3/trunk@9652 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 22:02:46 +00:00
HD Moore
864fcafb4a
See #2167 . This should make all platforms equal now in terms of how read selects are handled. It looks like OS X needs the same workaround as Windows
...
git-svn-id: file:///home/svn/framework3/trunk@9641 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 14:49:49 +00:00
HD Moore
aecb6cd43f
Prevent a loop condition noted by commonism
...
git-svn-id: file:///home/svn/framework3/trunk@9631 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-28 14:40:11 +00:00
James Lee
96cd7bddae
compatibility for 1.9. fixes #2143
...
git-svn-id: file:///home/svn/framework3/trunk@9622 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 05:52:05 +00:00
James Lee
83d3e3cbac
1.9 fixes, see 2143
...
git-svn-id: file:///home/svn/framework3/trunk@9618 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 04:03:58 +00:00
James Lee
01702e8506
don't rescue IOError.
...
git-svn-id: file:///home/svn/framework3/trunk@9616 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 00:31:00 +00:00
James Lee
6e01b03767
IO.select has different behavior when a socket is closed, go back to Rex::ThreadSafe.select; fixes portfwd
...
git-svn-id: file:///home/svn/framework3/trunk@9615 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 00:28:49 +00:00
James Lee
161ae211c4
add a capabilities hash to the meterpreter client for determining whether libs are available on the server. eventually there should be a way to request this from the server directly instead of inferring it from platform
...
git-svn-id: file:///home/svn/framework3/trunk@9561 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 23:15:48 +00:00
Tod Beardsley
50c59a9ab1
Skip nmap port imports where the result is unknown and the target is really localhost.
...
git-svn-id: file:///home/svn/framework3/trunk@9553 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 03:03:11 +00:00
James Lee
ebe48096f3
put the original suspend handler back, even if it was nil. fixes 2102
...
git-svn-id: file:///home/svn/framework3/trunk@9547 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 22:41:53 +00:00
James Lee
3e38aa9cd4
put the old sigint handler back, fixes #2103
...
git-svn-id: file:///home/svn/framework3/trunk@9546 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 21:57:46 +00:00
Tod Beardsley
3d98f22ef4
Un-private-ing :range
...
git-svn-id: file:///home/svn/framework3/trunk@9537 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-16 19:12:31 +00:00
James Lee
f6901861fa
allow host specifications like 'range, range' e.g. '10.1.1.0/24, 10.2.2.1'. Note that the space is required
...
git-svn-id: file:///home/svn/framework3/trunk@9489 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 17:20:14 +00:00
Joshua Drake
e32abab8dc
a HTTP -> an HTTP ( http://www.english-zone.com/grammar/a-anlessn.html )
...
git-svn-id: file:///home/svn/framework3/trunk@9488 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-11 16:12:05 +00:00
James Lee
32c24b944a
actually increment the loop variable; document the deficiencies of the employed technique
...
git-svn-id: file:///home/svn/framework3/trunk@9449 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 23:56:35 +00:00
James Lee
7044c65f22
make sure we have a newline in a chunk length before parsing it, tighten up the regex. fixes 2063 (I hope)
...
git-svn-id: file:///home/svn/framework3/trunk@9448 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 23:43:32 +00:00
James Lee
6950cae916
more legible inspect for meterpreter packets
...
git-svn-id: file:///home/svn/framework3/trunk@9445 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-07 15:20:24 +00:00
Tod Beardsley
e4c2a74915
DIY on the iconv stuff. just load the arrays once, plz.
...
git-svn-id: file:///home/svn/framework3/trunk@9407 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-03 17:35:58 +00:00
Tod Beardsley
a5a318f623
Workaround for a lack of Iconv for performing EBCDIC/ASCII conversions
...
git-svn-id: file:///home/svn/framework3/trunk@9406 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-03 17:28:45 +00:00
HD Moore
87379e798a
Bump the timeout for hashdump, handle large DCs better, thanks Chris!
...
git-svn-id: file:///home/svn/framework3/trunk@9385 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 16:45:34 +00:00
James Lee
5b6b13e7e8
check for existence before using stuff
...
git-svn-id: file:///home/svn/framework3/trunk@9384 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 16:35:10 +00:00
HD Moore
845407a356
Allow interrupts to break out of recvfrom
...
git-svn-id: file:///home/svn/framework3/trunk@9380 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-29 06:52:47 +00:00
Joshua Drake
288b700e75
remove silly debugging statements
...
git-svn-id: file:///home/svn/framework3/trunk@9377 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-26 22:46:22 +00:00
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
Tod Beardsley
110e0c8404
Allow for an IP range notation of "10.1.1.1-10.255.255.255" . This is equivalent to "10.1-255.1-255.1-255" but is more natural for some people not familiar with the nmap-style notation. Note that there must be no spaces around the hyphen. In the case of "10.1.1.1 - 10.255.255.255", this will merely fail normally. In the case of "10.1.1.1- 10.255.255.255," you will end up with a funny range of 10.1.1.1-255 and 10.255.255.255, since the space after the hyphen denotes "until the end of the octet space."
...
git-svn-id: file:///home/svn/framework3/trunk@9368 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-25 22:44:55 +00:00
Tod Beardsley
563ab310dc
Strengthening up the checks for valid formats for CIDR address ranges when passed to Rex::Socket::RangeWalker
...
git-svn-id: file:///home/svn/framework3/trunk@9366 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-25 20:46:00 +00:00
Tod Beardsley
1a2be34a63
Fixes #2002 . Needed to work with some pipelining to get this all to work right, but it seems to function now pretty well -- if the target takes Basic, do basic, if the target takes NTLM, do NTLM. Should implement Digest too, but I don't think hardly anyone uses that.
...
git-svn-id: file:///home/svn/framework3/trunk@9346 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-22 17:58:01 +00:00
Joshua Drake
83adc3f391
switch to ::IO.select
...
git-svn-id: file:///home/svn/framework3/trunk@9339 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 05:02:52 +00:00
HD Moore
872575209f
Fix a corner case with udp send destinations already having a ::ffff: prefix
...
git-svn-id: file:///home/svn/framework3/trunk@9338 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 05:01:14 +00:00
Joshua Drake
21130bc38a
replace hardcoded numbers with friendly constants
...
git-svn-id: file:///home/svn/framework3/trunk@9334 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 00:15:10 +00:00
Joshua Drake
957b1432ed
add simple tftp server
...
git-svn-id: file:///home/svn/framework3/trunk@9333 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-21 00:03:04 +00:00
James Lee
15cee53b41
move tab completion setup out of init_ui. fixes #1180
...
git-svn-id: file:///home/svn/framework3/trunk@9332 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 23:47:49 +00:00
HD Moore
dfa7fb7d0b
Move away from Kernel.select in exchange for IO.select, solves some issues with windows compatibility
...
git-svn-id: file:///home/svn/framework3/trunk@9330 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 20:42:17 +00:00
HD Moore
a29371647f
Force cygwin to use the Rex::ThreadSafe.select code
...
git-svn-id: file:///home/svn/framework3/trunk@9322 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-18 15:11:19 +00:00
Joshua Drake
670bacb9bc
a couple rex/ole fixes
...
git-svn-id: file:///home/svn/framework3/trunk@9287 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-12 05:33:35 +00:00
James Lee
c0494dcbc0
compat fix for 1.8.6, there are probably many more bugs like this
...
git-svn-id: file:///home/svn/framework3/trunk@9281 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-11 07:37:57 +00:00
HD Moore
cdc591488c
Bug fix
...
git-svn-id: file:///home/svn/framework3/trunk@9276 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-10 23:55:58 +00:00
Joshua Drake
3d023ec1fa
add comment about pe.read
...
git-svn-id: file:///home/svn/framework3/trunk@9272 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-10 16:18:19 +00:00
HD Moore
542782e7e6
Match existing mime implementations more closely
...
git-svn-id: file:///home/svn/framework3/trunk@9258 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-09 17:01:52 +00:00
HD Moore
14363ca2e8
Rex::MIME::Message can now parse as well as write
...
git-svn-id: file:///home/svn/framework3/trunk@9257 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-09 16:53:16 +00:00
HD Moore
5f23151c22
Replace the core of the text generation methods; previously, these could result in an oddball string result that would not auto-convert into ASCII-8BIT. Looks like a strange corner case in Ruby 1.9
...
git-svn-id: file:///home/svn/framework3/trunk@9254 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-09 02:58:55 +00:00
Joshua Drake
cd213c29c5
change offset_to_rva into file_offset_to_va, add comments
...
git-svn-id: file:///home/svn/framework3/trunk@9242 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-07 21:45:21 +00:00
Carlos Perez
abe2cb9919
cd can now change directory giving it a Windows ENV variable
...
git-svn-id: file:///home/svn/framework3/trunk@9237 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-07 02:05:26 +00:00
Joshua Drake
873f8bd1ed
added a couple of convenience methods
...
not sure if these are correct, but they worked for me
git-svn-id: file:///home/svn/framework3/trunk@9230 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-05 20:07:15 +00:00
James Lee
9fe0186ddb
document in a comment the fact that vulns don't have service info yet
...
git-svn-id: file:///home/svn/framework3/trunk@9213 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 18:16:23 +00:00
James Lee
1ab399d0ea
use a stream parser to import NeXpose raw xml, short-circuit find_or_create_ref to avoid going to the task queue when possible
...
git-svn-id: file:///home/svn/framework3/trunk@9199 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 19:16:52 +00:00
HD Moore
7631b193fd
Glue to tie Metasploit mixins into Rex::Script::Meterpreter
...
git-svn-id: file:///home/svn/framework3/trunk@9193 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 00:09:01 +00:00
HD Moore
5bc9a572e6
Add a close method to the file output
...
git-svn-id: file:///home/svn/framework3/trunk@9189 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-01 17:13:14 +00:00
HD Moore
4308689fd9
Remove diagnostic line
...
git-svn-id: file:///home/svn/framework3/trunk@9165 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-27 23:08:06 +00:00
HD Moore
49635c4ab0
Call the right select:
...
git-svn-id: file:///home/svn/framework3/trunk@9164 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-27 22:55:17 +00:00
HD Moore
936190125e
Bug fix for Ruby 1.9 (error can close the server socket, not the client socket). Small jRuby compatibility improvement
...
git-svn-id: file:///home/svn/framework3/trunk@9155 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-27 14:39:09 +00:00
Joshua Drake
a953c47cfb
remove carriage returns
...
git-svn-id: file:///home/svn/framework3/trunk@9140 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-26 18:29:24 +00:00
James Lee
01f9c0b616
only do the UA string search in firefox if we don't have a perfect match on buildId
...
git-svn-id: file:///home/svn/framework3/trunk@9129 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-24 21:31:12 +00:00
James Lee
13171ad1c6
add a fingerprint for ff 3.6.3 on windows
...
git-svn-id: file:///home/svn/framework3/trunk@9128 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-24 19:36:58 +00:00
James Lee
928389e8b0
update comments to explain the reason for not running init_ui
...
git-svn-id: file:///home/svn/framework3/trunk@9114 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-20 07:01:46 +00:00
James Lee
4243ce5bf4
preliminary fix for the meterpreter-breaks-tab-completion bug pending some testing, see #1180
...
git-svn-id: file:///home/svn/framework3/trunk@9113 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-20 03:59:27 +00:00
James Lee
8919688e1a
don't truncate the version when it doesn't contain a string, fixes #1711 , thanks Peorth Yggdrasil
...
git-svn-id: file:///home/svn/framework3/trunk@9104 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-19 22:12:35 +00:00
James Lee
6d788a9437
add print_good methods to rex input shells, fixes #1703
...
git-svn-id: file:///home/svn/framework3/trunk@9103 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-19 22:09:55 +00:00
James Lee
af901888d2
add detection for FF 3.6, thanks Peorth Yggdrasil
...
git-svn-id: file:///home/svn/framework3/trunk@9102 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-19 19:33:09 +00:00
Joshua Drake
32cd6b2101
fix reference to readline_compatible
...
git-svn-id: file:///home/svn/framework3/trunk@9060 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-13 17:09:42 +00:00
James Lee
6507c4fcea
clarify comments about what the checks for a deceitful UA are doing
...
git-svn-id: file:///home/svn/framework3/trunk@9054 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-12 04:44:33 +00:00
James Lee
548e242e75
add firefox detection based on navigator.buildID. Thanks, Mark Fioravanti\!
...
git-svn-id: file:///home/svn/framework3/trunk@9053 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-12 04:21:42 +00:00
HD Moore
108362cf95
Switch to recvfrom_nonsock, solves a hang with win32 + 1.9.1
...
git-svn-id: file:///home/svn/framework3/trunk@9045 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-10 17:31:40 +00:00
HD Moore
3ad0560d00
Use the kernel select in 1.9, its less buggy and doesn't have the issues that lead us to create our own in the first place
...
git-svn-id: file:///home/svn/framework3/trunk@9044 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-09 22:48:31 +00:00
Joshua Drake
df16eec4d7
revert r9038, see r9039, fixes #1531 , fixes #531
...
git-svn-id: file:///home/svn/framework3/trunk@9040 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 23:42:04 +00:00
Joshua Drake
9a8d14a5ec
use RL_PROMPT_ constants for places where a prompt is colorized (only)
...
git-svn-id: file:///home/svn/framework3/trunk@9039 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 23:37:49 +00:00
James Lee
a502c2647d
tell readline that the color escapes shouldn't be counted as part of the line length, thanks to Niklas Baumstark. fixes 1531, fixes 531
...
git-svn-id: file:///home/svn/framework3/trunk@9038 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 23:24:54 +00:00
HD Moore
3c4024a0c6
Expose the server client list, set the keepalive
...
git-svn-id: file:///home/svn/framework3/trunk@8992 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 06:05:06 +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
5f3def5bee
License corrections
...
git-svn-id: file:///home/svn/framework3/trunk@8982 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-02 21:34:15 +00:00
Joshua Drake
71a2064520
closes #1408 - merge patch from Mike Ryan
...
git-svn-id: file:///home/svn/framework3/trunk@8963 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-31 02:25:44 +00:00
HD Moore
09dd8c1fcc
Adds portlist_to_portspec and portspec_to_portlist. Merges in Qualys XML support from Sertan Kolat
...
git-svn-id: file:///home/svn/framework3/trunk@8949 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-28 23:02:28 +00:00
HD Moore
432f1676aa
Increase LocalRelay block size, return exploit_uuid in sessions
...
git-svn-id: file:///home/svn/framework3/trunk@8939 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 15:44:33 +00:00
HD Moore
cd71cfbad1
Handle buggy HTTP servers better
...
git-svn-id: file:///home/svn/framework3/trunk@8921 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 21:35:37 +00:00
HD Moore
3e29a2fd2f
Adds bgrun, bglist, bgkill to run Meterpreter scripts in the background
...
git-svn-id: file:///home/svn/framework3/trunk@8917 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 15:54:43 +00:00
James Lee
2a2682052b
patch from Mark Fioravanti for detecting chrome vs safari
...
git-svn-id: file:///home/svn/framework3/trunk@8897 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 16:13:59 +00:00
HD Moore
bb0db3cdf6
Closes command and meterpreter sessions in a much more consistent way
...
git-svn-id: file:///home/svn/framework3/trunk@8865 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-21 04:24:27 +00:00
HD Moore
eb31c8f24b
Fixes up SunRPC to use proper timeouts and track the socket context (needed for pivoting)
...
git-svn-id: file:///home/svn/framework3/trunk@8845 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 23:02:35 +00:00
Tod Beardsley
a29ff6f435
Adding a Rex library method for generating an array of mixed case strings.
...
git-svn-id: file:///home/svn/framework3/trunk@8841 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 17:47:08 +00:00
HD Moore
5dd404abd6
Fix an issue with 1.9.1 compat
...
git-svn-id: file:///home/svn/framework3/trunk@8818 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-14 16:20:24 +00:00
Joshua Drake
b6851b8ee4
modify cmd stager to take a raw payload string instead of a payload instance
...
git-svn-id: file:///home/svn/framework3/trunk@8805 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 21:47:01 +00:00
HD Moore
aa12dc912f
Add a file output type
...
git-svn-id: file:///home/svn/framework3/trunk@8792 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 18:58:20 +00:00
Stephen Fewer
be93341cff
Commit the ruby side for the new screenshot/session stuff.
...
git-svn-id: file:///home/svn/framework3/trunk@8788 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 17:11:27 +00:00
HD Moore
89c62bc838
Fixes #1079 . Handle a closed SSL socket gracefully
...
git-svn-id: file:///home/svn/framework3/trunk@8783 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 14:13:53 +00:00
HD Moore
6bd2a954cf
Lots of small changes, the big one is moving from sysread -> readpartial in the stream base class
...
git-svn-id: file:///home/svn/framework3/trunk@8764 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-10 06:43:46 +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
Joshua Drake
73da75a931
big update to cmd stager
...
1. returns array of commands instead of big blob of lines
2. combine lines together when possible (to reduce # of commands to execute)
3. add cmd stager usage in mssql_payload
4. remove extraneous stuff here and there
git-svn-id: file:///home/svn/framework3/trunk@8721 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-05 00:29:44 +00:00
Stephen Fewer
a44358df67
Simple fix for #1013 and the migration permission error message.
...
git-svn-id: file:///home/svn/framework3/trunk@8714 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 19:31:36 +00:00
James Lee
f40a9a5c4b
new ie fingerprint
...
git-svn-id: file:///home/svn/framework3/trunk@8707 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 07:17:10 +00:00
James Lee
dea2ba3420
try a little harder not to break things by making sure there's a space in front of comments before removing them
...
git-svn-id: file:///home/svn/framework3/trunk@8704 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 03:20:52 +00:00
James Lee
506fdb63ff
remove comments after obfuscating strings so things like ' http://example.com ' in a string doesn't get mangled. will still have problems with a string like that and no string obfu
...
git-svn-id: file:///home/svn/framework3/trunk@8702 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 20:51:29 +00:00
James Lee
7d348c3593
honor the SSL option in HttpServer, fixes #1001
...
git-svn-id: file:///home/svn/framework3/trunk@8699 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 18:47:04 +00:00
Joshua Drake
9148068acc
pass unlink_now flag to close for Tempfile instances
...
git-svn-id: file:///home/svn/framework3/trunk@8697 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 04:58:12 +00:00
James Lee
15b13d2472
make string obfuscation produce correct code more often (should be 100% now, but no guarantees). stops doing hex-encoding (more hassle than it's worth) and adds random split/concats (jduck's idea)
...
git-svn-id: file:///home/svn/framework3/trunk@8690 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-02 14:36:09 +00:00
James Lee
b16a08c4cd
whitespace
...
git-svn-id: file:///home/svn/framework3/trunk@8687 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-02 11:10:23 +00:00
HD Moore
ac517fafea
Remove the db dependency from Meterpreter scripts
...
git-svn-id: file:///home/svn/framework3/trunk@8676 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-28 19:29:43 +00:00
HD Moore
d03c26430c
Max is 32k
...
git-svn-id: file:///home/svn/framework3/trunk@8670 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 21:18:58 +00:00
James Lee
c4fe7193f1
print_raw receives color-substituted strings, don't override print
...
git-svn-id: file:///home/svn/framework3/trunk@8669 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 20:10:18 +00:00
HD Moore
303d99650a
Store the workspace in the script object
...
git-svn-id: file:///home/svn/framework3/trunk@8668 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 19:50:33 +00:00
James Lee
3b0c82b131
args should be an array, fixes 981
...
git-svn-id: file:///home/svn/framework3/trunk@8666 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 19:26:34 +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
HD Moore
c1609d0db1
Woops!
...
git-svn-id: file:///home/svn/framework3/trunk@8631 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 23:15:01 +00:00
HD Moore
2f195694f4
Switch shell to a base class, allow the base class to use a null sink for output when no user_output is set.
...
git-svn-id: file:///home/svn/framework3/trunk@8630 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 23:07:08 +00:00
James Lee
999feb879f
setup the input/output handles correctly for meterpreter sessions so we can get the output from scripts
...
git-svn-id: file:///home/svn/framework3/trunk@8618 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 16:46:47 +00:00
Joshua Drake
b391abd32d
adds scripting for command shell sessions
...
1. InitialAutoRunScript and AutoRunScript vars work
2. scripts/shells was created to hold them
3. *_shell methods were renamed shell_*
4. added "shell_command" method to command shell sessions
5. converted all uses of *_shell to shell_*
6. all payloads that produce command shell sessions include Msf::Sessions::CommandShellOptions
git-svn-id: file:///home/svn/framework3/trunk@8615 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 01:19:59 +00:00
HD Moore
a71e8d2af0
Fix up meterpreter script changes
...
git-svn-id: file:///home/svn/framework3/trunk@8611 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 20:16:45 +00:00
HD Moore
4220c33675
Stuff meterpreter scripts into a dedicated object
...
git-svn-id: file:///home/svn/framework3/trunk@8603 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 17:59:35 +00:00
James Lee
455434a9f2
typo fix, thanks SubINacls for catching it
...
git-svn-id: file:///home/svn/framework3/trunk@8597 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 06:25:19 +00:00
James Lee
4ad6c24a95
look for dead sesions with a reaper thread instead of on other session events, add Session#alive accessor for all session types; still need to figure out when a shell session is dead and set it accordingly. Add a reason argument to on_session_close to distinguish between killed sessions and dead sessions
...
git-svn-id: file:///home/svn/framework3/trunk@8596 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 05:59:30 +00:00
James Lee
06b369a79b
add a class method for route_exists?
...
git-svn-id: file:///home/svn/framework3/trunk@8591 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 22:30:37 +00:00
James Lee
a12670b311
check for existence before stat'ing. fixes #893
...
git-svn-id: file:///home/svn/framework3/trunk@8581 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 17:27:54 +00:00
Joshua Drake
b5e1e56f44
fix slicing of compressed deflate data
...
git-svn-id: file:///home/svn/framework3/trunk@8572 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-21 01:37:04 +00:00
Joshua Drake
4800d6841c
commit cmd stager stuff from bannedit
...
git-svn-id: file:///home/svn/framework3/trunk@8518 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 16:38:19 +00:00
Stephen Fewer
17de90a902
Modify the client core to use compression for the loading of extensions and migration for a speed boost.
...
git-svn-id: file:///home/svn/framework3/trunk@8517 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 15:01:06 +00:00
Stephen Fewer
4b4b2d62b1
Commit the Ruby side for channel/TLV compression.
...
git-svn-id: file:///home/svn/framework3/trunk@8516 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 14:58:23 +00:00
HD Moore
2539a6fc09
Updated nmap parsing, store notes for last boot and os matches
...
git-svn-id: file:///home/svn/framework3/trunk@8494 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 19:07:15 +00:00
HD Moore
bfa3ae28cb
Import OS and hostname information
...
git-svn-id: file:///home/svn/framework3/trunk@8491 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 18:32:37 +00:00
HD Moore
5dff9c4efc
Fixes #807 . Make the html encoded output standards compliant
...
git-svn-id: file:///home/svn/framework3/trunk@8462 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-12 05:08:16 +00:00
Joshua Drake
d4d271eef3
add OLE library as Rex::OLE
...
git-svn-id: file:///home/svn/framework3/trunk@8457 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 18:36:38 +00:00
Joshua Drake
7285e7a2bb
whitespace fixed, also see r8452 which fixes #805
...
git-svn-id: file:///home/svn/framework3/trunk@8453 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 07:48:56 +00:00
Joshua Drake
a3bf0fd94f
handle arch parameters passed as array
...
oops, these other two functions didn't benefit from the same level of checking as endian? did.
git-svn-id: file:///home/svn/framework3/trunk@8452 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 07:42:26 +00:00
Joshua Drake
13f837c340
fix zip module samples
...
git-svn-id: file:///home/svn/framework3/trunk@8447 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 00:18:37 +00:00
Joshua Drake
2c100083bf
add a zip implementation, Rex::Zip, see lib/rex/zip/samples for more info
...
git-svn-id: file:///home/svn/framework3/trunk@8439 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-10 17:27:40 +00:00
Stephen Fewer
6335fde3e1
Commit the Ruby side for the UDP socket pivoting. Change the TCP client channel so the respective StreamAbstraction is responsible for monitoring its own rsock.
...
git-svn-id: file:///home/svn/framework3/trunk@8431 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-09 16:45:46 +00:00
Joshua Drake
79d2ecc227
don't slice a nil buffer
...
git-svn-id: file:///home/svn/framework3/trunk@8403 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 01:42:11 +00:00
HD Moore
c8af3431b6
Typo
...
git-svn-id: file:///home/svn/framework3/trunk@8401 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 01:02:46 +00:00
HD Moore
5f76353e8e
Woops, add the missing support files
...
git-svn-id: file:///home/svn/framework3/trunk@8400 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 00:59:29 +00:00
Stephen Fewer
e19633354b
Bug fix for a rare edge case with channels. When creating a Rex::Post::Meterpreter::Stream instance we should initialize_abstraction() before super() as we can get a scenario where dio_write_handler() is called with data to write to the rsock but rsock has not yet been initialized. This happens if the channel is registered (client.add_channel(self) in Channel.initialize) to a session and a 'core_channel_write' request comes in before we have called self.initialize_abstraction()
...
git-svn-id: file:///home/svn/framework3/trunk@8386 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-06 20:12:52 +00:00
Stephen Fewer
fd2469db24
Commit the Ruby end for TCP server channels, the modified TCP client channels and the support for pivoting a reverse_tcp meterpreter.
...
git-svn-id: file:///home/svn/framework3/trunk@8384 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-06 17:59:25 +00:00
HD Moore
b3a588b8cc
Adds a module for kcope's samba filesystem traversal
...
git-svn-id: file:///home/svn/framework3/trunk@8369 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-05 06:38:24 +00:00
Joshua Drake
a052340703
a few fixes to sunrpc code
...
this fixes a couple of errors handling error messages
also, some whitespace/indenting adjustments
git-svn-id: file:///home/svn/framework3/trunk@8365 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-03 20:30:09 +00:00
Tod Beardsley
3fe8d0375b
Adds a print_debug message handler -- mostly useful during development to easily inspect objects.
...
git-svn-id: file:///home/svn/framework3/trunk@8353 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 21:03:07 +00:00
James Lee
55a82c1642
add simple detection for Chrome
...
git-svn-id: file:///home/svn/framework3/trunk@8330 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-30 21:09:38 +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
HD Moore
7d88f394b4
Use the impersonated token to spawn the shell by default
...
git-svn-id: file:///home/svn/framework3/trunk@8326 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 17:35:30 +00:00
Stephen Fewer
47b08fa6ef
simple patch to get all privileges after a successful getsystem
...
git-svn-id: file:///home/svn/framework3/trunk@8321 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 11:04:24 +00:00
Stephen Fewer
77da632e61
update the ruby side.
...
git-svn-id: file:///home/svn/framework3/trunk@8319 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 01:13:28 +00:00
James Lee
c396129d41
add a liveness test to meterpreter, fixes 698
...
git-svn-id: file:///home/svn/framework3/trunk@8314 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:53:15 +00:00
Tod Beardsley
a76480d42c
See #726 . Cleaning up my gross whitespace.
...
git-svn-id: file:///home/svn/framework3/trunk@8311 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:08:39 +00:00
Tod Beardsley
9c1ceb1b8a
Fixes #726 . Adding in the test cases (and some slight fixes) closes this ticket.
...
git-svn-id: file:///home/svn/framework3/trunk@8310 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:01:32 +00:00
Stephen Fewer
b36fe815f3
Add in the ruby side for the priv extensions getsystem command.
...
git-svn-id: file:///home/svn/framework3/trunk@8296 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 13:55:19 +00:00
Tod Beardsley
5087ae25f7
Fixed test_gzip. Both strings happen to work, but this gets rid of the assert_equal error.
...
git-svn-id: file:///home/svn/framework3/trunk@8235 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 02:50:10 +00:00
Tod Beardsley
1652c75b7f
Fixed Rex::Text.badchar_index to conform with the test requirement.
...
git-svn-id: file:///home/svn/framework3/trunk@8234 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 02:39:43 +00:00
Tod Beardsley
d817ac11b4
Adding a convenience method for generating random hexadecimal characters.
...
git-svn-id: file:///home/svn/framework3/trunk@8233 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 02:35:13 +00:00
James Lee
cdaeb27933
spaces -> tabs
...
git-svn-id: file:///home/svn/framework3/trunk@8232 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 00:01:55 +00:00
Tod Beardsley
359e1ad53a
See #726 . Adds a DB2 scanner and brute forcer.
...
git-svn-id: file:///home/svn/framework3/trunk@8223 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 15:58:24 +00:00
HD Moore
12ef5437df
1.0.0.0/8 has been allocated, switch to 50.50.50.50
...
git-svn-id: file:///home/svn/framework3/trunk@8221 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 13:27:19 +00:00
Stephen Fewer
b7fb95b302
fix for ps bug on OSX
...
git-svn-id: file:///home/svn/framework3/trunk@8220 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 10:49:51 +00:00
HD Moore
acceb274da
Integrate a sound plugin, based on Robin Wood's patch
...
git-svn-id: file:///home/svn/framework3/trunk@8215 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-24 18:33:32 +00:00
HD Moore
f9049e0d50
Load win32api for cygwin as well
...
git-svn-id: file:///home/svn/framework3/trunk@8214 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-24 17:31:50 +00:00
HD Moore
1e2f421432
Remove references to DL, since it has a conflicting API between 1.8 and 1.9. Update all methods to use Win32API and add a play_sound() method
...
git-svn-id: file:///home/svn/framework3/trunk@8213 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-24 17:28:03 +00:00
Stephen Fewer
651fd5e834
fix for ps bug where the wrong arch was sometimes defaulted to if no arch was returned.
...
git-svn-id: file:///home/svn/framework3/trunk@8211 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-23 16:50:44 +00:00
James Lee
ae673cccd7
add detections for newest IE8 on win7 and x64
...
git-svn-id: file:///home/svn/framework3/trunk@8206 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 23:47:50 +00:00
James Lee
7e5ad7bfa3
log more info about script failures
...
git-svn-id: file:///home/svn/framework3/trunk@8205 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 23:09:41 +00:00
Stephen Fewer
7b34b46b68
Commit the ruby side for the meterpreter migration overhaul.
...
git-svn-id: file:///home/svn/framework3/trunk@8199 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 19:47:36 +00:00
Joshua Drake
7d6607b517
add default compression level for zlib_deflate()
...
git-svn-id: file:///home/svn/framework3/trunk@8191 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-21 19:31:17 +00:00
James Lee
4d644ab895
add os_flavor detection for firefox
...
git-svn-id: file:///home/svn/framework3/trunk@8185 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-21 11:26:16 +00:00
Stephen Fewer
538d44aa8d
commit the changes on the ruby side for new ps command. We now get the process architecture and parent pid (when possible) of each process.
...
git-svn-id: file:///home/svn/framework3/trunk@8157 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-19 10:47:01 +00:00
Joshua Drake
c13841d902
base RegexScanner on Generic instead of JmpRegScanner
...
git-svn-id: file:///home/svn/framework3/trunk@8148 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 22:17:08 +00:00
HD Moore
a753666073
Switch sysread back to get_once(). This reverts a previous change, but the sysread breaks SSL support
...
git-svn-id: file:///home/svn/framework3/trunk@8124 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 21:40:30 +00:00
James Lee
7be26761f5
merge bannedit's WAR payload patch
...
git-svn-id: file:///home/svn/framework3/trunk@8119 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:15:15 +00:00
HD Moore
540beed83e
Prevent the dcerpc NDR string functions from modifying their argument directly
...
git-svn-id: file:///home/svn/framework3/trunk@8102 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-12 23:15:07 +00:00
James Lee
a9b1462e9d
add a callback for session commands. fixes 618
...
git-svn-id: file:///home/svn/framework3/trunk@8075 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-06 05:06:12 +00:00
James Lee
d261b39206
actually save the result of the merge
...
git-svn-id: file:///home/svn/framework3/trunk@8072 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-05 18:18:49 +00:00
HD Moore
6e45d1e32f
Sort by creation order vs pid
...
git-svn-id: file:///home/svn/framework3/trunk@8059 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 11:35:57 +00:00
HD Moore
1623b59a0c
Decrease indents to save screen space
...
git-svn-id: file:///home/svn/framework3/trunk@8058 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 11:28:43 +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
James Lee
02eb7ab80d
massive changes to the database api. Auxiliary::Report is now just a bunch of stubs into the main DBManager, most aux modules should just work, but they haven't all been tested. introduces a get_auth_info method for pulling credentials out of the db. other db api methods should be more standardized now. cross your fingers
...
git-svn-id: file:///home/svn/framework3/trunk@8028 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 23:48:45 +00:00
HD Moore
922cef26fa
Store the domain name in the SMB client object, along with other fields provided by NTLMSSP responses. Show the domain name and netbios name in the version scanner. Update MS06-070 to remove the default target, use the domain name from the server response, and use a more reliable return address for 2000 SP4.
...
git-svn-id: file:///home/svn/framework3/trunk@8022 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 14:00:49 +00:00
HD Moore
4c6fd97b0e
Handles some broken TCP stack implementations better (but not perfectly)
...
git-svn-id: file:///home/svn/framework3/trunk@7991 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-27 07:02:55 +00:00
James Lee
8f2138a464
and remove the empty xdr.rb
...
git-svn-id: file:///home/svn/framework3/trunk@7965 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-24 00:21:36 +00:00
HD Moore
b13e185943
Giant update from tebo, fixing up SunRPC and the nsfmount module
...
git-svn-id: file:///home/svn/framework3/trunk@7961 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 13:44:53 +00:00
HD Moore
7935656355
Fixes #708 . Enforces a timeout around SSL's connect()
...
git-svn-id: file:///home/svn/framework3/trunk@7938 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 22:48:40 +00:00
HD Moore
2d399f9b52
Handle the native win32 errno as well
...
git-svn-id: file:///home/svn/framework3/trunk@7923 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-19 15:08:37 +00:00
HD Moore
1eceebc950
Fixes #697 . This prevents a closed socket from being passed to select() and handles the case where a race condition allowed this to happen anyways (one thread closes, one thread selects). This should prevent most 'invalid handle' exceptions on Cygwin and prevent Win32 native from crashing due to the native exception.
...
git-svn-id: file:///home/svn/framework3/trunk@7922 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-19 15:02:26 +00:00
Joshua Drake
addcba5131
0x7f isn't printable!
...
git-svn-id: file:///home/svn/framework3/trunk@7915 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-18 20:40:08 +00:00
HD Moore
39d37065de
See #485 . This patch allows the very basics of metasploit to work under jRuby 1.4.0. Many, many things are still broken
...
git-svn-id: file:///home/svn/framework3/trunk@7906 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-17 08:02:11 +00:00
James Lee
06427b53c9
document the detection for 2k SP0
...
git-svn-id: file:///home/svn/framework3/trunk@7887 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-15 23:08:28 +00:00
HD Moore
a16feb01bc
Minor tweaks to http processing
...
git-svn-id: file:///home/svn/framework3/trunk@7805 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 18:12:38 +00:00
HD Moore
5ef9a1c040
Wipe the headers before reparsing
...
git-svn-id: file:///home/svn/framework3/trunk@7801 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 17:04:52 +00:00
HD Moore
006d5d51fc
Fixes #674 by adding 100-continue support
...
git-svn-id: file:///home/svn/framework3/trunk@7799 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 16:54:27 +00:00
HD Moore
d2694ce5b9
Ignore errors on shutdown for the relay
...
git-svn-id: file:///home/svn/framework3/trunk@7795 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 06:09:15 +00:00
HD Moore
e731426666
Fixes #662 . The socket pivoting is still not perfect, but this goes a long way
...
git-svn-id: file:///home/svn/framework3/trunk@7792 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 05:40:26 +00:00
James Lee
e0bd6dd6ed
don't bother checking for an address if our range is empty
...
git-svn-id: file:///home/svn/framework3/trunk@7779 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 21:28:44 +00:00
Joshua Drake
87c85b5176
removed executable generation routines from Rex::Text (use Msf::Util::EXE), Fixes #660
...
git-svn-id: file:///home/svn/framework3/trunk@7760 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 21:24:45 +00:00
HD Moore
54c10c0c3d
Fixes #623 and fixes #622 , implements a number of changes to the core channel dispatch code, sets timeouts on unmatched responses, and handles tcp relay writes with a threaded/timeout wrapper to avoid delays.
...
git-svn-id: file:///home/svn/framework3/trunk@7753 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 18:32:26 +00:00
James Lee
7427640fb0
don't wait for a message body that will never come. fixes 659
...
git-svn-id: file:///home/svn/framework3/trunk@7748 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 02:26:37 +00:00
Stephen Fewer
7d3ff93ec9
Fix a few bugs in the parsing of exception directories on PE64 binaries.
...
git-svn-id: file:///home/svn/framework3/trunk@7730 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 12:56:54 +00:00
Stephen Fewer
4fb212b54e
Go back to using select instead of sleep for the waiters.
...
git-svn-id: file:///home/svn/framework3/trunk@7729 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 12:55:31 +00:00
James Lee
02a62967e4
register the 'rex' log source, see #577
...
git-svn-id: file:///home/svn/framework3/trunk@7727 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-06 18:09:27 +00:00
HD Moore
1f5a0be9ca
Fixes #630 by correct the constant typo
...
git-svn-id: file:///home/svn/framework3/trunk@7726 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-06 14:51:15 +00:00
HD Moore
2c92856612
Fixes #604 . This fixes a long-standing race condition with meterpreter channels that received data as soon as they were open (TCP).
...
git-svn-id: file:///home/svn/framework3/trunk@7708 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 21:08:34 +00:00
James Lee
a96a23f95c
add cidr parsing for ipv6
...
git-svn-id: file:///home/svn/framework3/trunk@7707 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 20:17:28 +00:00
James Lee
1e6b6b3d62
fix ipv6 handling for single addresses
...
git-svn-id: file:///home/svn/framework3/trunk@7706 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:55:58 +00:00
James Lee
5952e29040
modify address range specification (for e.g. RHOSTS) to use nmap notation, fixes #182
...
git-svn-id: file:///home/svn/framework3/trunk@7705 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:37:14 +00:00
HD Moore
9b2d5fcd24
Fixes #605 by re-raising the correct exception class
...
git-svn-id: file:///home/svn/framework3/trunk@7701 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 18:38:59 +00:00
Stephen Fewer
a544d71f4e
A few small changes to the ruby side of meterpreters packet dispatcher stuff. Allow for blocking a request indefinatly and add in a new command 'wait' to stdapi.sys.process.
...
git-svn-id: file:///home/svn/framework3/trunk@7697 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 17:32:56 +00:00
James Lee
5182d1c927
allow the Connection header to specify keep-alive in a less strict manner. this is more rfc2616 compliant and fixes #601
...
git-svn-id: file:///home/svn/framework3/trunk@7677 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 07:40:37 +00:00
HD Moore
fc983ef7e3
Many bug fixes to db_autopwn, cross-referencing of OS-level vulnerabilities, small bug fixes to HTTP client API
...
git-svn-id: file:///home/svn/framework3/trunk@7676 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 01:36:17 +00:00
James Lee
7b4a942ed6
revert logging change from r7653 which broke meterpreter sessions
...
git-svn-id: file:///home/svn/framework3/trunk@7671 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-02 19:11:11 +00:00
James Lee
626d085dd4
expand ryan linn's idea of more verbose job info to include start time, see #586
...
git-svn-id: file:///home/svn/framework3/trunk@7668 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-02 03:32:48 +00:00
James Lee
0da80965d6
more info about a job, thanks Ryan Linn for the patch; fixes #586
...
git-svn-id: file:///home/svn/framework3/trunk@7665 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 23:11:12 +00:00
James Lee
125f0aab0a
map any attempt to log to an unknown logsink to the core logsink, fixes 577
...
git-svn-id: file:///home/svn/framework3/trunk@7653 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 22:03:53 +00:00
HD Moore
ed7b7ac6f0
Fixes #491 and fixes #543 by updating the HTTP stack and validating configuration options
...
git-svn-id: file:///home/svn/framework3/trunk@7652 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 21:15:06 +00:00
HD Moore
1189ac1dcd
Updates to the PE class to support TLS/Exceptions
...
git-svn-id: file:///home/svn/framework3/trunk@7651 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 20:18:37 +00:00
HD Moore
b8804e48cd
Add (incomplete) support for TLS callbacks
...
git-svn-id: file:///home/svn/framework3/trunk@7648 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 19:48:35 +00:00
HD Moore
ff93072d1e
Fixes #578 . Only register a new meterpreter sink if one doesnt already exist
...
git-svn-id: file:///home/svn/framework3/trunk@7632 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-28 16:34:46 +00:00
James Lee
9d2ab30f9d
create the history file if it doesn't exist
...
git-svn-id: file:///home/svn/framework3/trunk@7627 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 07:13:21 +00:00
James Lee
d6a732d619
move histfile reading into rex
...
git-svn-id: file:///home/svn/framework3/trunk@7625 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 06:03:05 +00:00
James Lee
3412a38146
register a 'meterpreter' logsink
...
git-svn-id: file:///home/svn/framework3/trunk@7622 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 02:46:04 +00:00
James Lee
fd61df4e9e
add full support for persistent history, works in msfweb as well. fixes #523
...
git-svn-id: file:///home/svn/framework3/trunk@7621 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 02:18:02 +00:00
James Lee
723aa65df0
refuse to migrate into the current process. fixes #418
...
git-svn-id: file:///home/svn/framework3/trunk@7618 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 23:24:01 +00:00
James Lee
d5e09a90e2
add minver and maxver options and prepare for universal module ranking
...
git-svn-id: file:///home/svn/framework3/trunk@7598 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 21:40:02 +00:00
James Lee
f8d84a7dc9
prevent loading the same dispatcher multiple times. fixes #560
...
git-svn-id: file:///home/svn/framework3/trunk@7587 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 01:07:19 +00:00
James Lee
6e7c4a77a9
add detection for ie6 on xpsp2
...
git-svn-id: file:///home/svn/framework3/trunk@7572 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-20 06:08:09 +00:00
James Lee
3b6126bfd9
actually commit what i said i was committing. =(
...
git-svn-id: file:///home/svn/framework3/trunk@7567 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 06:35:44 +00:00
HD Moore
a92fbb1ff4
Fixes #526 . Correct socket name and call to super in the socket output io
...
git-svn-id: file:///home/svn/framework3/trunk@7548 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 23:35:34 +00:00
HD Moore
8cadfe66cf
Mostly cosmetic
...
git-svn-id: file:///home/svn/framework3/trunk@7530 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 15:16:08 +00:00
James Lee
e296ec92ea
more uninitalized var warnings
...
git-svn-id: file:///home/svn/framework3/trunk@7513 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-14 06:21:22 +00:00
James Lee
8471baa62a
fix another uninitialized class var warning
...
git-svn-id: file:///home/svn/framework3/trunk@7494 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:00:16 +00:00
James Lee
8c28c38da3
remove busted unit test
...
git-svn-id: file:///home/svn/framework3/trunk@7482 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 19:49:35 +00:00
James Lee
78c88c888f
don't backtrace just because the client cancelled
...
git-svn-id: file:///home/svn/framework3/trunk@7453 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 19:38:18 +00:00
James Lee
3dfaf32bc8
trying out bold colors
...
git-svn-id: file:///home/svn/framework3/trunk@7450 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 16:49:26 +00:00
James Lee
2cbb32550c
fix meterp sessions getting initialized improperly, fix msf> prompt in exploit context after color cmd
...
git-svn-id: file:///home/svn/framework3/trunk@7449 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 16:10:39 +00:00
HD Moore
2c3cace80c
Fix up the classes needed by msfweb. Fixes #495
...
git-svn-id: file:///home/svn/framework3/trunk@7447 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:59:49 +00:00
James Lee
3628a3d3c6
fix sessions breaking right away when interacting. command dispatcher still appears to be hosed
...
git-svn-id: file:///home/svn/framework3/trunk@7446 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:55:42 +00:00
HD Moore
3db9bbfaae
See #493 . Initialize the prompt
...
git-svn-id: file:///home/svn/framework3/trunk@7445 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:33:14 +00:00
James Lee
daf58b6deb
get rid of the single-character escapes so we're less likely to see accidental color substitutions
...
git-svn-id: file:///home/svn/framework3/trunk@7443 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 07:12:56 +00:00
James Lee
fd4e4154cd
add a new 'color' command that lets the user force color on or off.
...
git-svn-id: file:///home/svn/framework3/trunk@7442 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 06:58:01 +00:00
James Lee
a8d9da0d3d
initial color support. will add ability to change colors from console soon. see #344
...
git-svn-id: file:///home/svn/framework3/trunk@7440 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 03:27:48 +00:00
James Lee
e73d4ead7f
handle a broken socket gracefully, fixes a backtrace in msfd
...
git-svn-id: file:///home/svn/framework3/trunk@7432 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 20:10:53 +00:00
pusscat
493f56be57
https://metasploit.com/redmine/issues/430
...
Change this line so that 0xf0 is now used as an xor base
git-svn-id: file:///home/svn/framework3/trunk@7428 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 18:47:46 +00:00
Joshua Drake
927fe6b6c2
update pattern_offset to show all ocurrences
...
git-svn-id: file:///home/svn/framework3/trunk@7425 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 17:50:53 +00:00
HD Moore
176e999f08
Merge patches from Ryan Linn. Fixes #438
...
git-svn-id: file:///home/svn/framework3/trunk@7413 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:33:40 +00:00
HD Moore
6885ffa48f
Improvements to the SSL TCP Server mixin
...
git-svn-id: file:///home/svn/framework3/trunk@7409 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:13:25 +00:00
James Lee
1b7fb68f52
More useful error when given invalid register name, fix error message to be consistent with code when offset is too large
...
git-svn-id: file:///home/svn/framework3/trunk@7407 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-08 19:42:58 +00:00
HD Moore
cae79f8b3b
Add a comment describing the extension
...
git-svn-id: file:///home/svn/framework3/trunk@7394 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 21:00:13 +00:00
HD Moore
836624570b
Disabling unfinished ESPIA commands
...
git-svn-id: file:///home/svn/framework3/trunk@7393 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:58:57 +00:00
HD Moore
d82d687ea6
Fixes #478 . Handles the screenshot command better, defaults to a random bmp
...
git-svn-id: file:///home/svn/framework3/trunk@7392 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:58:24 +00:00
HD Moore
c5ace6ef28
Use the open_file API
...
git-svn-id: file:///home/svn/framework3/trunk@7391 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:47:45 +00:00
HD Moore
5d129bdb53
Add open_file() to work around url vs file handling issues on cygwin
...
git-svn-id: file:///home/svn/framework3/trunk@7390 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:43:00 +00:00
HD Moore
1dad276f58
...and back again. Looks like cygwin / 1.9.1 DL is a little different
...
git-svn-id: file:///home/svn/framework3/trunk@7389 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:28:25 +00:00
HD Moore
1a280c3a0a
Switch to shell open
...
git-svn-id: file:///home/svn/framework3/trunk@7388 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:26:05 +00:00
HD Moore
1bb29e2835
See #478 . Handle cygwin better for open url
...
git-svn-id: file:///home/svn/framework3/trunk@7387 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:22:28 +00:00
HD Moore
0604fbfd71
Workaround broken cygpath behavior with the cygwin path contains 8.3 names
...
git-svn-id: file:///home/svn/framework3/trunk@7377 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:43:14 +00:00
HD Moore
34d76a72e0
Fixes #462 . Handle proxy errors like regular socket errors. This can lead to missing results in tests, so we may need to add special proxy exception checks to the scanner mixin
...
git-svn-id: file:///home/svn/framework3/trunk@7352 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 16:36:06 +00:00
HD Moore
45391a9ba9
Fixes byte vs char handling on Ruby 1.9.1, partial solution for see #430 .
...
git-svn-id: file:///home/svn/framework3/trunk@7349 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 05:31:54 +00:00
HD Moore
83fece42fe
Handle HTTP failures more gracefully
...
git-svn-id: file:///home/svn/framework3/trunk@7335 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 18:10:09 +00:00
HD Moore
1b5cc24eab
See #434 . Some libraries used the wrong exception class
...
git-svn-id: file:///home/svn/framework3/trunk@7325 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 18:20:02 +00:00
HD Moore
075b8c5fa4
Fixes #434 . Always use Timeout.timeout() -- on Ruby 1.9 this results in the Timeout::TimeoutError exception vs RuntimeError
...
git-svn-id: file:///home/svn/framework3/trunk@7323 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 18:14:57 +00:00
HD Moore
176996fe61
Fixes #452 . Solves a number of crashes caused by Regexp.new() on 1.9 without an explicit language specified
...
git-svn-id: file:///home/svn/framework3/trunk@7320 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 17:09:13 +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
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
6dcffd0373
Catch attempts to migrate to a name vs a pid
...
git-svn-id: file:///home/svn/framework3/trunk@7289 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-27 00:56:56 +00:00
HD Moore
8d8bc45dfd
Adds a shortcut for getting a shell (execute -f cmd -c -i -H) is now just "shell"
...
git-svn-id: file:///home/svn/framework3/trunk@7288 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-27 00:47:00 +00:00
HD Moore
5e137e92fd
Fixes #381 . To scan for TLSv1 only services, set SSLVersion TLS1
...
git-svn-id: file:///home/svn/framework3/trunk@7282 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 19:48:15 +00:00
HD Moore
478a7ce8ab
Fixes #410 . Calls the real _close function, not the best solution, but will do until we fix the IO::Stream override.
...
git-svn-id: file:///home/svn/framework3/trunk@7281 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 19:06:50 +00:00
HD Moore
f9f690b0e7
Updated prefetch script and creation of Rex::Script::Completed as a clean way to exit meterpreter scripts
...
git-svn-id: file:///home/svn/framework3/trunk@7257 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 20:50:07 +00:00
HD Moore
e3f68f2639
Another large number of warnings fixed by Yoann Guillot
...
git-svn-id: file:///home/svn/framework3/trunk@7248 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 17:18:23 +00:00
HD Moore
b38a74c961
Another mega-patch from Yoann Guillot: fixes warnings generated by method calls with a space betwee the method and the parans, corrects a problem with the alpha encoders that causes them to overwrite the allowed charset, hardcodes the metasm output size of some modules in order to reduce load time, more to come
...
git-svn-id: file:///home/svn/framework3/trunk@7246 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 16:40:19 +00:00
kris
b75ef037c3
more tabs vs spaces, and fix a few mismatched indentation levels (def/end, etc)
...
git-svn-id: file:///home/svn/framework3/trunk@7211 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-20 17:24:33 +00:00
HD Moore
a17d96a1ab
Remove the last usage of ReadWriteLock in the Socket class. Fixes #383
...
git-svn-id: file:///home/svn/framework3/trunk@7182 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-18 09:24:36 +00:00
HD Moore
8d9356f40d
Minor tweak allows the 'quit' command to work inside of a resource script
...
git-svn-id: file:///home/svn/framework3/trunk@7177 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-17 16:53:21 +00:00
kris
efe44ba6b5
bleh.. a bit of tabs vs spaces
...
git-svn-id: file:///home/svn/framework3/trunk@7171 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-16 18:27:18 +00:00
kris
a4679bc3fc
sort meterp use -l output so exts like priv and priv.x64 are grouped together
...
git-svn-id: file:///home/svn/framework3/trunk@7141 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-11 18:24:38 +00:00
kris
4ba9438e56
Append newline to meterpreter use -l output (was running into prompt)
...
git-svn-id: file:///home/svn/framework3/trunk@7134 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-09 04:33:59 +00:00
kris
672fd9e977
Meterpreter ipconfig Ruby 1.9 fix. This fixes string indexing errors and
...
(after that was fixed) the fact that sprintf "%02X" now decides to bail when
given a nil instead of it giving zeros.
git-svn-id: file:///home/svn/framework3/trunk@7133 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-08 16:46:13 +00:00
HD Moore
087a248f16
Remove debugging line;
...
git-svn-id: file:///home/svn/framework3/trunk@7127 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-04 23:16:28 +00:00
HD Moore
c628302e72
Define the full class name for the history variable;
...
git-svn-id: file:///home/svn/framework3/trunk@7118 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-02 16:17:27 +00:00
HD Moore
304ed6b0a6
During a recursive download, ensure that the local directories are created properly
...
git-svn-id: file:///home/svn/framework3/trunk@7117 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-02 14:57:25 +00:00
HD Moore
35fcf8c2b2
Swap around rbreadline - load it by default, but also allow the old readline with the -L (--real-readline) parameter to msfconsole. This also fixes absolute path handling for msfconsole command passthrough
...
git-svn-id: file:///home/svn/framework3/trunk@7115 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-02 14:17:03 +00:00
HD Moore
5f010aa4b9
Fix some remaining 1.9 compatibility issues
...
git-svn-id: file:///home/svn/framework3/trunk@7105 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-01 16:01:53 +00:00
James Lee
53e3f166f8
make x86/nonupper raise the right exception type, prettify some formatting
...
git-svn-id: file:///home/svn/framework3/trunk@7083 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-28 05:23:23 +00:00
HD Moore
714e887a60
Fixes #313 . Makes some usage changes to ET's screenshot method, tested on XP SP3 with no problems
...
git-svn-id: file:///home/svn/framework3/trunk@7073 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-27 18:42:34 +00:00
Stephen Fewer
1a220d6dc5
add java payload jsp_shell_reverse_tcp.
...
git-svn-id: file:///home/svn/framework3/trunk@7071 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-27 18:35:07 +00:00
HD Moore
5be5a20ba7
fixes #285 . Corrects SSL init to be after proxies, fixes issues with 1.9.1 compatibility and SOCKS support
...
git-svn-id: file:///home/svn/framework3/trunk@7070 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-27 15:36:30 +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
HD Moore
479add54e1
Mostly fix file information in listings -- Ruby 1.8.x used the builtin FileStat, 1.9 now users our own, and the offsets were off from the stat structure
...
git-svn-id: file:///home/svn/framework3/trunk@7054 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-23 21:20:09 +00:00
HD Moore
5e37dfa040
Fixes #325 . Dont pass nil to the FileStat constructor, be strict about class path
...
git-svn-id: file:///home/svn/framework3/trunk@7049 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-20 22:12:46 +00:00
HD Moore
602b1a2efd
Adds the 'clearev' command, see #317
...
git-svn-id: file:///home/svn/framework3/trunk@7048 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-20 22:05:44 +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
HD Moore
09eb693a97
Fix cygwin check
...
git-svn-id: file:///home/svn/framework3/trunk@7003 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-04 15:11:28 +00:00
Stephen Fewer
d584b4d314
Fixed migrate for x64 meterpreter (Tested on Win 7 and 2003).
...
git-svn-id: file:///home/svn/framework3/trunk@6999 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-04 01:40:48 +00:00
et
04491c7fb1
Fix small bug when str nil
...
git-svn-id: file:///home/svn/framework3/trunk@6979 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-27 04:56:38 +00:00
HD Moore
97fed166a3
Fixes #312 . Thanks for the patch!
...
git-svn-id: file:///home/svn/framework3/trunk@6978 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-27 01:28:48 +00:00
HD Moore
ec61dca868
Patch to make table output on the console more readable by removing the last column's padding, submitted by jduck. Thanks!
...
git-svn-id: file:///home/svn/framework3/trunk@6974 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-25 09:50:14 +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
James Lee
4dc13a9e8c
fix a bug in colorization where %c gets replaced before %cya; wouldn't have been a problem until colorization gets put back in
...
git-svn-id: file:///home/svn/framework3/trunk@6962 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-18 04:54:58 +00:00
James Lee
bd2da7c12a
revert overzealous commit
...
git-svn-id: file:///home/svn/framework3/trunk@6961 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-18 04:53:35 +00:00
James Lee
08d50e0a5b
fix a bug in colorization where %c gets replaced before %cya; wouldn't have been a problem until colorization gets put back in
...
git-svn-id: file:///home/svn/framework3/trunk@6960 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-18 04:49:16 +00:00
HD Moore
b14a4ddf0b
Lots of shiny new NTLM goodness from Ryan Linn
...
git-svn-id: file:///home/svn/framework3/trunk@6958 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-17 20:00:05 +00:00
James Lee
1ceb752986
clean up opera detection code a bit, and add 9.62 platform detection
...
git-svn-id: file:///home/svn/framework3/trunk@6939 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-06 05:54:36 +00:00
HD Moore
02443b3721
One more cleanup, everything loads cleanly now
...
git-svn-id: file:///home/svn/framework3/trunk@6930 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-01 04:08:25 +00:00
James Lee
89eb1c5cc9
differentiate between firefox and safari and use some more standards-friendly string idioms
...
git-svn-id: file:///home/svn/framework3/trunk@6910 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-28 03:55:47 +00:00
James Lee
8e32779329
remove redundant code
...
git-svn-id: file:///home/svn/framework3/trunk@6909 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-28 00:02:25 +00:00
James Lee
ce4e63e209
more reliable os detection on firefox
...
git-svn-id: file:///home/svn/framework3/trunk@6908 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-27 17:54:55 +00:00
HD Moore
2902a47d6d
Remove busted unicode from the javascript os detect, this caused errors on 1.9.1
...
git-svn-id: file:///home/svn/framework3/trunk@6894 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-25 03:46:08 +00:00
James Lee
739207bf4a
merge browser_autopwn back into trunk. This changes the database schema slightly, so make sure to db_destroy and db_create before using the database features.
...
git-svn-id: file:///home/svn/framework3/trunk@6873 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-22 20:14:35 +00:00
HD Moore
756b1ab020
Add the OpenSSL require to meterpreter
...
git-svn-id: file:///home/svn/framework3/trunk@6869 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-22 18:37:51 +00:00
HD Moore
b3e36e5692
Reduce the size of the generated executables (works better with sqlmap and other tools that need small exes). Payloads are now capped at 2048 and the amount of random data appended to the exe has been reduced.
...
git-svn-id: file:///home/svn/framework3/trunk@6849 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-20 13:55:29 +00:00
James Lee
529ded22ae
reverting last commit; somebody didn't cross their fingers
...
git-svn-id: file:///home/svn/framework3/trunk@6847 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-19 20:48:47 +00:00
James Lee
c3dc1ecb55
reintegrate browser_autopwn into trunk; cross your fingers and hope this works
...
git-svn-id: file:///home/svn/framework3/trunk@6846 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-19 17:27:36 +00:00
HD Moore
f8c2a203fd
OSVDB references updates from Steve Tornio
...
git-svn-id: file:///home/svn/framework3/trunk@6812 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-16 16:02:24 +00:00
kris
3f5ee3d34b
Don't raise "Invalid codepage 1252, only 1252 supported" in Rex::Text.to_unicode
...
for uhwtfms-half. It always failed if passed something other than an empty str
git-svn-id: file:///home/svn/framework3/trunk@6793 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-14 00:01:04 +00:00
kris
df9283d1b2
strip Rex::ExtTime.sec_to_s return val to remove ever-present trailing space
...
git-svn-id: file:///home/svn/framework3/trunk@6790 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 23:32:35 +00:00
kris
c7515f15d7
a few simple changes (e.g., pack('V') -> pack_dword() where applicable)
...
git-svn-id: file:///home/svn/framework3/trunk@6785 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 22:26:27 +00:00
HD Moore
5fb316b383
Integrates L4teral's JS encoder/encrypter
...
git-svn-id: file:///home/svn/framework3/trunk@6784 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 22:17:11 +00:00
HD Moore
303e4eab71
Enable broadcast support for all datagram sockets, remove the broadcast parameter entirely.
...
git-svn-id: file:///home/svn/framework3/trunk@6780 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 15:24:46 +00:00
HD Moore
bab394fa8f
Typo fix - thanks Robin Wood!
...
git-svn-id: file:///home/svn/framework3/trunk@6779 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 15:11:11 +00:00
HD Moore
9068b9a133
Adds the Broadcast parameter to the Rex::Socket class, allows udp/ip sockets to send to broadcast addresses
...
git-svn-id: file:///home/svn/framework3/trunk@6778 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 13:19:31 +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
82cf85680c
Adds the sniffer extension for testing
...
git-svn-id: file:///home/svn/framework3/trunk@6762 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-11 13:39:43 +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
kris
c83e84f2d1
fix Rex::Socket::SubnetWalker num_ips; off by one
...
git-svn-id: file:///home/svn/framework3/trunk@6760 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 22:39:30 +00:00
kris
913181b16a
factor out some code
...
git-svn-id: file:///home/svn/framework3/trunk@6759 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 21:45:52 +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
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
45afe789af
Test case update
...
git-svn-id: file:///home/svn/framework3/trunk@6717 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-26 03:01:11 +00:00
HD Moore
e27691c543
Performance and debugging improvements from Yoann Guillot
...
git-svn-id: file:///home/svn/framework3/trunk@6712 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-25 17:59:51 +00:00
HD Moore
977447f56a
Add support for section dumping
...
git-svn-id: file:///home/svn/framework3/trunk@6686 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 17:53:53 +00:00
HD Moore
2283e0ffe4
Update executable template and API
...
git-svn-id: file:///home/svn/framework3/trunk@6682 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 17:42:17 +00:00
HD Moore
cd12fc0ca2
Ruby 1.9.1 fixes for incognito (thanks Carlos!)
...
git-svn-id: file:///home/svn/framework3/trunk@6681 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 16:55:40 +00:00
HD Moore
d9792d4beb
More ruby-1.9.1 compatibility fixes
...
git-svn-id: file:///home/svn/framework3/trunk@6679 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 14:26:22 +00:00
HD Moore
58fb65d4ef
Another ruby 1.9.1 compatibility fix
...
git-svn-id: file:///home/svn/framework3/trunk@6674 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 02:42:00 +00:00
HD Moore
e6e8a42090
Enforce maximum thread count on windows platforms
...
git-svn-id: file:///home/svn/framework3/trunk@6672 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-19 21:46:40 +00:00
James Lee
7cb96ed11f
typo
...
git-svn-id: file:///home/svn/framework3/trunk@6665 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-17 01:34:33 +00:00
HD Moore
f78482d3f5
Indicate lack of support for ruby 1.9.0, indicate experimental support for ruby 1.9.1
...
git-svn-id: file:///home/svn/framework3/trunk@6661 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 21:30:56 +00:00
HD Moore
5757685b59
Remove the mutex/cv from the meterp handler, use a boring timeout instead, prevents a race on ruby 1.9.1
...
git-svn-id: file:///home/svn/framework3/trunk@6660 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 21:20:30 +00:00
HD Moore
5646e02a8a
Fix 1.9.1 compat for msfelfscan
...
git-svn-id: file:///home/svn/framework3/trunk@6659 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 20:18:38 +00:00
HD Moore
c1cc193901
Quick update to allow address filtering (find unicode addresses,etc) via the -F [regex] parameter
...
git-svn-id: file:///home/svn/framework3/trunk@6630 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-08 15:59:38 +00:00
HD Moore
0e35efaea2
Force binary string encoding in ruby 1.9.1, fix up a bad index call in x86.rb
...
git-svn-id: file:///home/svn/framework3/trunk@6618 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 03:02:42 +00:00
HD Moore
2b4e0f440b
Fix up the encoding xor to work with both old and new ruby
...
git-svn-id: file:///home/svn/framework3/trunk@6617 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 02:30:12 +00:00
HD Moore
51f0e8fc53
Another 1.9.1 compat change, this time for msfmachscan
...
git-svn-id: file:///home/svn/framework3/trunk@6616 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 01:43:48 +00:00
HD Moore
90af8f03db
Fixes up msfpescan/msfelfscan to work with both 1.8.6 and 1.9.1
...
git-svn-id: file:///home/svn/framework3/trunk@6615 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 01:39:54 +00:00
HD Moore
f7a7a528be
Moer ruby 1.9.1 fixes for msfpescan
...
git-svn-id: file:///home/svn/framework3/trunk@6614 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 01:24:35 +00:00
HD Moore
f81392f938
Dont crash if the PE has no resources
...
git-svn-id: file:///home/svn/framework3/trunk@6613 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-02 23:40:36 +00:00
HD Moore
147a292825
Minor fixes for ruby 1.9.1 compatibility, still quite a bit more to go
...
git-svn-id: file:///home/svn/framework3/trunk@6612 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-02 23:36:58 +00:00
HD Moore
3bc44cc395
Consolidate exe generation into a single to_executable() function. Will reduce code in exploit modules dropping later today...
...
git-svn-id: file:///home/svn/framework3/trunk@6586 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-27 13:37:41 +00:00
HD Moore
6bb267f31d
Add disasm method to -r
...
git-svn-id: file:///home/svn/framework3/trunk@6532 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 20:22:25 +00:00
natron
6f8d309949
Passivex fixed. Reverting r6318 for rex/proto/http/packet. Works on IE8, tests on IE6/7 welcome.
...
git-svn-id: file:///home/svn/framework3/trunk@6514 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-30 20:38:57 +00:00
James Lee
fa23424b46
add -l to use and don't list already-loaded extensions in tab completion
...
git-svn-id: file:///home/svn/framework3/trunk@6509 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-30 06:09:42 +00:00
et
a8b64c56b5
Handle encoding of special chars
...
git-svn-id: file:///home/svn/framework3/trunk@6508 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-29 04:04:40 +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
James Lee
3a2b0929ab
stupid typo
...
git-svn-id: file:///home/svn/framework3/trunk@6497 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-25 02:12:54 +00:00
HD Moore
3ede3a1d41
Patch from int_80
...
git-svn-id: file:///home/svn/framework3/trunk@6496 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-23 17:49:04 +00:00
Patrick Webster
0b14dac349
Added rand_text_highascii method.
...
git-svn-id: file:///home/svn/framework3/trunk@6487 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-16 03:02:41 +00:00
HD Moore
67ab1cca92
Fixed #280 . Fix namespace lookup for "FileUtils", thanks grymoire
...
git-svn-id: file:///home/svn/framework3/trunk@6454 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-02 18:58:36 +00:00
HD Moore
26b9903b0d
Changes Auxiliary::Scanner to use a new module instance for each thread, updates associated mixins and modules to support this change.
...
git-svn-id: file:///home/svn/framework3/trunk@6401 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 05:49:33 +00:00
HD Moore
89ecdd9ac8
Mostly working setdesktop code, removed grabdesktop
...
git-svn-id: file:///home/svn/framework3/trunk@6393 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-25 23:14:14 +00:00
HD Moore
753c7aa7d5
Apply patch to fix SSL server support
...
git-svn-id: file:///home/svn/framework3/trunk@6391 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-25 16:41:10 +00:00
HD Moore
dc68188c3b
Patch may resolv slowdowns during local file reads
...
git-svn-id: file:///home/svn/framework3/trunk@6382 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-23 21:04:39 +00:00
HD Moore
5be1222a1c
Adds the meterpreter client-side code for the keylogger
...
git-svn-id: file:///home/svn/framework3/trunk@6370 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-23 01:25:11 +00:00
HD Moore
7debb6d52b
Make sure Rex::Compat is loaded (triggers on msfpescan -D)
...
git-svn-id: file:///home/svn/framework3/trunk@6352 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-17 21:48:17 +00:00
natron
5069038ecd
Fixes meterpreter's migrate function to work on DEP-enabled boxes (ticket 275). Patch by Stephen Fewer (harmonysecurity.com).
...
git-svn-id: file:///home/svn/framework3/trunk@6347 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-16 21:10:58 +00:00
James Lee
934d08bde2
fix unit tests to reflect new output
...
git-svn-id: file:///home/svn/framework3/trunk@6325 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-09 05:19:26 +00:00
James Lee
6d9a70c6ad
fix codepage_map_cache for unit tests
...
git-svn-id: file:///home/svn/framework3/trunk@6324 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-09 05:18:33 +00:00
James Lee
491fb6b683
fix double header line bug introduced by my last commit
...
git-svn-id: file:///home/svn/framework3/trunk@6321 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 19:55:47 +00:00
James Lee
96c8f6127c
Replace += with << for Strings in a bunch of places.
...
git-svn-id: file:///home/svn/framework3/trunk@6318 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 07:55:47 +00:00
HD Moore
19749865b0
Performance patch from Yoann Guillot <john-metasploit[at]ofjj.net>
...
git-svn-id: file:///home/svn/framework3/trunk@6316 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 23:41:47 +00:00
HD Moore
95f6aa0d02
Revert last commit temporarily
...
git-svn-id: file:///home/svn/framework3/trunk@6313 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 23:00:17 +00:00
HD Moore
aa4274a3bb
Upgrading metasm...
...
git-svn-id: file:///home/svn/framework3/trunk@6312 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 22:58:19 +00:00
James Lee
616d0fdd46
add background command to meterpreter
...
git-svn-id: file:///home/svn/framework3/trunk@6257 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-27 03:12:20 +00:00
kris
08745cc6fd
several typos
...
git-svn-id: file:///home/svn/framework3/trunk@6240 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-21 19:22:06 +00:00
kris
e05b74a00c
Don't use old OpenSSL::Digest::Digest
...
git-svn-id: file:///home/svn/framework3/trunk@6239 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-21 17:48:36 +00:00
James Lee
08fbd064d1
make the help command a little more helpful
...
git-svn-id: file:///home/svn/framework3/trunk@6230 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-17 04:53:06 +00:00
kris
2c039a87d2
return host info if available in HostCommunicationError's addr_to_s
...
git-svn-id: file:///home/svn/framework3/trunk@6208 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-06 14:15:54 +00:00
kris
4e0bc60ce1
just use alias
...
git-svn-id: file:///home/svn/framework3/trunk@6207 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-05 21:49:50 +00:00
kris
a49c339a9a
Use CRLF in http proxy request for some stringent servers
...
git-svn-id: file:///home/svn/framework3/trunk@6206 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-05 21:29:15 +00:00
kris
c60077bb1c
Revamp/fix-up http proxying by using Rex to parse the response (instead of
...
really strict matching)
git-svn-id: file:///home/svn/framework3/trunk@6182 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-24 14:48:18 +00:00
James Lee
fd435b48d9
http proxy support patch from Frederik Braun
...
git-svn-id: file:///home/svn/framework3/trunk@6181 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-24 06:32:06 +00:00
James Lee
1d499a9756
fix empty body when Content-Length is not set
...
git-svn-id: file:///home/svn/framework3/trunk@6176 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-23 21:10:58 +00:00
kris
6777023871
Notify handlers of socket creation for bare raw IP and TCP server sockets
...
git-svn-id: file:///home/svn/framework3/trunk@6149 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 00:27:37 +00:00
kris
8c8370e9b9
Notify handlers of before and after socket creation events for raw IP
...
git-svn-id: file:///home/svn/framework3/trunk@6148 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 00:15:33 +00:00
HD Moore
dc264cdcf3
Fix from Tom Hessman when the EDITOR environment variable is not set (relayed via Ed)
...
git-svn-id: file:///home/svn/framework3/trunk@6147 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 16:19:56 +00:00
HD Moore
4e2d29ec68
Fix from Ed Skoudis when EDITOR is not set
...
git-svn-id: file:///home/svn/framework3/trunk@6146 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 14:43:22 +00:00
HD Moore
331eaaa602
Add basic framework for the new TTY architecture
...
git-svn-id: file:///home/svn/framework3/trunk@6136 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 06:46:32 +00:00
James Lee
49cd8d7223
typo fix
...
git-svn-id: file:///home/svn/framework3/trunk@6114 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 04:48:06 +00:00
kris
a61baaa1eb
deleting broken/useless timed_read()
...
git-svn-id: file:///home/svn/framework3/trunk@6110 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-10 17:46:23 +00:00
kris
754c1c5711
Add 127.0.0.1 -> ::1 conversion for IPv4-addressed IPv6 sockets
...
git-svn-id: file:///home/svn/framework3/trunk@6072 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-04 18:42:55 +00:00
James Lee
0fa92221dd
add tab completion for meterpreter use command
...
git-svn-id: file:///home/svn/framework3/trunk@6064 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-04 06:41:01 +00:00
James Lee
f50672c7eb
add opera detection for js_os_detect
...
git-svn-id: file:///home/svn/framework3/trunk@6061 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-02 21:28:05 +00:00
kris
a0aa29bb18
typos
...
git-svn-id: file:///home/svn/framework3/trunk@6054 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-29 07:47:37 +00:00
kris
2d1ae98917
Convert 'Retries' and 'Timeout' values to integers if given
...
git-svn-id: file:///home/svn/framework3/trunk@6053 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-29 05:04:49 +00:00
kris
b012696f1f
just use boolean @@support_ipv6 instead of "yes"/"no"
...
git-svn-id: file:///home/svn/framework3/trunk@6047 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-26 07:11:49 +00:00
kris
b03360f5e0
use pack_word in push_word and pack_dword in push_dword
...
git-svn-id: file:///home/svn/framework3/trunk@6046 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-25 02:00:46 +00:00
kris
cc233af814
add pack_word() method
...
git-svn-id: file:///home/svn/framework3/trunk@6045 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-25 01:55:05 +00:00
kris
0e8ce1cc46
Move my portspec parsing code from scanner/portscan/tcp to Rex as
...
Socket.portspec_crack and use it to also replace the incomplete
parsing code used for db_autopwn
git-svn-id: file:///home/svn/framework3/trunk@6033 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-20 20:34:05 +00:00
kris
90f906d8c5
Add assignment to to_ruby and to_perl output, and allow changing of variable
...
name in to_java output
git-svn-id: file:///home/svn/framework3/trunk@6032 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-20 07:40:27 +00:00
kris
cdcf5cf1fd
add a few key descriptions
...
git-svn-id: file:///home/svn/framework3/trunk@6024 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 09:33:16 +00:00
kris
84b6d9daf4
remove extra (server-only) setsockopt(SO_REUSEADDR)
...
git-svn-id: file:///home/svn/framework3/trunk@6023 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 08:02:53 +00:00
kris
248f1e9fc3
Remove "#{xxx.to_s}" redundancies ('s/\(#{[^}]*\)\.to_s}/\1}/g')
...
git-svn-id: file:///home/svn/framework3/trunk@6022 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 07:11:08 +00:00
kris
bfc23d2886
use self.peerhost (which could use 'PeerAddr') instead of 'PeerHost'
...
git-svn-id: file:///home/svn/framework3/trunk@6021 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 06:54:22 +00:00
kris
560f2df2dd
fix PeerAddr
...
git-svn-id: file:///home/svn/framework3/trunk@6020 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 06:50:04 +00:00
HD Moore
5822ab75a7
Adds an exploit module (universal) for the new internet explorer xml bug. This module shows off the .NET memory techniques discovered by Alexander Sotirov and Mark Dowd. This code should bypass DEP, ASLR, and NX :-)
...
git-svn-id: file:///home/svn/framework3/trunk@6012 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-12 01:45:00 +00:00
HD Moore
cb8230f817
Fixes #263 . Correct the max read() size for DCERPC over SMB
...
git-svn-id: file:///home/svn/framework3/trunk@6007 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-11 03:50:30 +00:00
HD Moore
71c5175a85
This patch introduces a really basic RPC service. It is still a long way from its final version
...
git-svn-id: file:///home/svn/framework3/trunk@5991 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-02 22:09:34 +00:00
James Lee
63e3e3a0e9
remove some verbosity and dead code from js osdetect
...
git-svn-id: file:///home/svn/framework3/trunk@5973 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-21 05:37:28 +00:00
HD Moore
7d2f0c1bc0
Log a backtrack on meterpreter command errors, make debugging easier
...
git-svn-id: file:///home/svn/framework3/trunk@5968 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-20 05:54:55 +00:00
HD Moore
77bc8d90a3
Apply patch to not exit the console on ^C
...
git-svn-id: file:///home/svn/framework3/trunk@5947 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-18 19:41:13 +00:00
HD Moore
652100cb54
Use a temporary file for the glade.xml
...
git-svn-id: file:///home/svn/framework3/trunk@5936 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-17 05:02:13 +00:00
kris
a35a9b7bdb
add x86 push_word method
...
git-svn-id: file:///home/svn/framework3/trunk@5932 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-16 22:54:03 +00:00
James Lee
b3ecce5cf4
look for files in absolute paths. fixes #252
...
git-svn-id: file:///home/svn/framework3/trunk@5928 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-16 21:10:35 +00:00
HD Moore
5d0ebc18cf
See #250 . Adds a wait() wrapper to the HTTP service as well
...
git-svn-id: file:///home/svn/framework3/trunk@5927 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-16 21:00:44 +00:00
HD Moore
a7595fce6c
Fixes #250 . Solves an old bug with background jobs not working right, fixes the 'background modules dont work' bug as well.
...
git-svn-id: file:///home/svn/framework3/trunk@5926 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-16 20:54:41 +00:00
kris
81be31d751
sort Meterpreter ps output by pid
...
git-svn-id: file:///home/svn/framework3/trunk@5921 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-15 06:20:34 +00:00
HD Moore
cf3475644e
Remove debugging code
...
git-svn-id: file:///home/svn/framework3/trunk@5917 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 18:28:15 +00:00
kris
19fa03649a
Add lpwd/getlwd Meterpreter commands
...
git-svn-id: file:///home/svn/framework3/trunk@5916 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 17:30:24 +00:00
kris
360bd6d222
Fix Meterpreter lcd command
...
git-svn-id: file:///home/svn/framework3/trunk@5915 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 17:22:28 +00:00
Ramon de C Valle
73b02f1899
Updated lib/rex/constants.rb
...
git-svn-id: file:///home/svn/framework3/trunk@5898 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 01:55:25 +00:00
HD Moore
b4a5cb455b
Short variable names to fit more into memory
...
git-svn-id: file:///home/svn/framework3/trunk@5896 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-12 23:51:36 +00:00
HD Moore
616491a552
Play nice with ruby implementations without readline and openssl
...
git-svn-id: file:///home/svn/framework3/trunk@5895 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-12 22:47:21 +00:00
HD Moore
f5374fe2d2
Syntax fixups
...
git-svn-id: file:///home/svn/framework3/trunk@5894 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-12 19:31:11 +00:00
HD Moore
a70e982369
Adds utlities for creating VBA scripts from an EXE (or payload)
...
git-svn-id: file:///home/svn/framework3/trunk@5893 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-12 19:15:24 +00:00
HD Moore
71448fd876
Typo for hashes
...
git-svn-id: file:///home/svn/framework3/trunk@5891 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 22:57:18 +00:00
HD Moore
10266c8e51
Better short read detection from antoine.
...
git-svn-id: file:///home/svn/framework3/trunk@5889 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 17:53:13 +00:00
HD Moore
250848ac5c
Handle windows error on broadcast addresses
...
git-svn-id: file:///home/svn/framework3/trunk@5886 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 07:41:07 +00:00
HD Moore
81347ba308
Fix ENONET for BSD
...
git-svn-id: file:///home/svn/framework3/trunk@5885 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 06:19:44 +00:00
HD Moore
cca9c39eab
Typo fix from Rhyss
...
git-svn-id: file:///home/svn/framework3/trunk@5881 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 05:39:23 +00:00
HD Moore
e9b3919ace
Normalize exceptions across socket libraries
...
git-svn-id: file:///home/svn/framework3/trunk@5879 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 05:11:40 +00:00
kris
aba3f95026
an empty string is better than a nil type-error (found by playing around, not
...
from a faulty module or whathaveyou)
git-svn-id: file:///home/svn/framework3/trunk@5878 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 04:01:21 +00:00
HD Moore
bbb53dd9ea
Default max_read to 1M, solves intermittent issues
...
git-svn-id: file:///home/svn/framework3/trunk@5876 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 23:03:16 +00:00
HD Moore
b11939759e
Fix an ugly error when the response was too small
...
git-svn-id: file:///home/svn/framework3/trunk@5875 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 22:56:25 +00:00
HD Moore
8628a9d2c1
Fixes #193 . Add a unicode-capable workaround for windows, patch code to go through the compat lib
...
git-svn-id: file:///home/svn/framework3/trunk@5873 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 21:44:58 +00:00
HD Moore
6dd840e4b3
Fixes #201 . Better error processing of client sockets
...
git-svn-id: file:///home/svn/framework3/trunk@5872 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 21:30:35 +00:00
HD Moore
e2a70dd615
Fixes #111 . Merge in patch to fix memdump support, still not perfect, but usable
...
git-svn-id: file:///home/svn/framework3/trunk@5871 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 21:18:12 +00:00
kris
23274e6efc
Fix Meterpreter route error message
...
git-svn-id: file:///home/svn/framework3/trunk@5868 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 04:17:31 +00:00
kris
cce1166199
Fix Meterpreter's portfwd default "list" behavior
...
git-svn-id: file:///home/svn/framework3/trunk@5867 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 03:56:23 +00:00
kris
21c1eecfa7
Update Meterpreter upload and download commands so that passing one non-option
...
argument sets both the source and destination file/dir (and make it so that
these commands only expect at least one argument instead of two)
git-svn-id: file:///home/svn/framework3/trunk@5866 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 02:07:41 +00:00
HD Moore
4250d1e132
Handle socket errors more gracefully
...
git-svn-id: file:///home/svn/framework3/trunk@5864 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-09 23:02:18 +00:00
HD Moore
2d498ed3c5
Fixes #149 . This doesnt address quite the bug, but solves a case where the DNS server does not reply and the Windows version of ruby acts stupid. The bug mentioned in this ticket is addressed by a newer ruby version.
...
git-svn-id: file:///home/svn/framework3/trunk@5863 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-09 22:59:21 +00:00
HD Moore
7367c2cbd4
Fixes #248 . Catch empty returns from pgets
...
git-svn-id: file:///home/svn/framework3/trunk@5860 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-09 21:40:03 +00:00
HD Moore
ecc853d453
Fixes #246 . Revert to older readline behavior, the priority change should prevent the readline idle loop from consuming process time.
...
git-svn-id: file:///home/svn/framework3/trunk@5859 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-09 08:44:36 +00:00
kris
97fee9e16f
Return "0 secs" instead of "" in Rex::ExtTime.sec_to_s()
...
git-svn-id: file:///home/svn/framework3/trunk@5855 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-08 22:35:37 +00:00
James Lee
75feaa6fab
allow passing args to meterpreter scripts through AutoRunScript
...
git-svn-id: file:///home/svn/framework3/trunk@5853 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-08 19:39:06 +00:00
James Lee
0193cd5219
fix session vs client variable problems with meterpreter AutoRunScript and make usage actually reflect what the code does
...
git-svn-id: file:///home/svn/framework3/trunk@5834 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 06:40:12 +00:00
HD Moore
b53695f7db
The psexec module now uses a service-compatible exe, shellcode is spawned in a subprocess and the service cleans up properly
...
git-svn-id: file:///home/svn/framework3/trunk@5829 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-03 23:06:37 +00:00
HD Moore
f1789fc1b2
Adds the check() method and scanner module to ms08-067, massively upgrades the smb/version scanner, with better SP detection and remote language pack detection.
...
git-svn-id: file:///home/svn/framework3/trunk@5823 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-03 09:17:08 +00:00
HD Moore
a4d53893ac
Improvements to opty2 from vlad902:
...
1) Fixed a minor bug, sometimes Opty2 would generate C1 /6 instructions which most processors will execute but which are not technically valid (they would exist for SAL but SAL is an alias for SHL so it is defined as C1 /4).
2) I changed the 0x90 nop instruction so that it is no longer considered that 0x90 changes the eax register.
3) Removed o16/0x66 prepend byte from 0x0f, this is currently unused anyways but might prevent some poor person from debugging it in the future.
4) Previously short jumps would only make positive jumps, I added the capability for them to make a "-1" jump which would basically just start executing at the offset byte. For example it could generate something like EB FF XX YY ... where EB FF jumps to FF XX YY ...
5) I added support for the instructions mov reg, segreg (8C), mov reg, imm8/imm32 (C6/C7), and lea reg, mem (8D). I implemented LEA so that it only allows memory references to be in ModR/M form and not be in SIB form (I don't think it's possible to allow SIB in the way Opty2 works at the moment).
git-svn-id: file:///home/svn/framework3/trunk@5804 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-30 07:30:52 +00:00
HD Moore
1df0612f61
Adds a case-sensitivity permutation routine
...
git-svn-id: file:///home/svn/framework3/trunk@5780 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-22 22:43:13 +00:00
HD Moore
65419ad206
Adds routines/tools for cracking the NTLM hash from the plaintext case-insensive LANMAN password
...
git-svn-id: file:///home/svn/framework3/trunk@5779 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-22 22:42:52 +00:00
Ramon de C Valle
f124597a56
Code cleanups
...
git-svn-id: file:///home/svn/framework3/trunk@5773 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 21:03:39 +00:00
HD Moore
e016ff2d76
cleanup patch from antoine
...
git-svn-id: file:///home/svn/framework3/trunk@5748 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-13 14:22:38 +00:00
HD Moore
a87cbe1c5e
Add disassembly mode to msfpescan for -a
...
git-svn-id: file:///home/svn/framework3/trunk@5717 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-05 02:40:55 +00:00
HD Moore
0f03e872f1
Fixes ^C and ^Z session handling
...
git-svn-id: file:///home/svn/framework3/trunk@5706 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-01 17:32:55 +00:00
James Lee
43886f3697
typo fix, thanks Kris Katterjohn
...
git-svn-id: file:///home/svn/framework3/trunk@5702 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-30 23:24:52 +00:00
HD Moore
af9a8eba9a
Swap back to 8192 until the exploits which use it are updated.
...
git-svn-id: file:///home/svn/framework3/trunk@5694 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-27 17:13:11 +00:00
HD Moore
14e8e75cb6
Another, smaller, win32 wrapper
...
git-svn-id: file:///home/svn/framework3/trunk@5693 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-27 05:02:36 +00:00
HD Moore
16d2825b83
Wrap the shellcode in SEH
...
git-svn-id: file:///home/svn/framework3/trunk@5692 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 23:35:47 +00:00
HD Moore
b94d10f53c
Switch the exe back to windows mode (vs console)
...
git-svn-id: file:///home/svn/framework3/trunk@5691 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 23:01:58 +00:00
HD Moore
4d47f49c1c
Randomize the timedatestamp
...
git-svn-id: file:///home/svn/framework3/trunk@5690 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 22:37:41 +00:00
HD Moore
6d5ac7eead
Switches the executable template to something a little nicer and adds exe output to msfencode
...
git-svn-id: file:///home/svn/framework3/trunk@5689 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 22:34:51 +00:00
HD Moore
e341e46f6b
Remove debugging comment
...
git-svn-id: file:///home/svn/framework3/trunk@5688 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 13:33:09 +00:00
HD Moore
37d9c3db1d
Corrects an issue where a scope ID is passed to IPv4 addresses, cleans up the parsing.
...
git-svn-id: file:///home/svn/framework3/trunk@5687 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 05:39:06 +00:00
HD Moore
1310e0e94c
Imported msfmachscan from Darren Kemp
...
git-svn-id: file:///home/svn/framework3/trunk@5682 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 22:14:33 +00:00
HD Moore
b3c3b29ed1
Wrong fix, right bug.
...
git-svn-id: file:///home/svn/framework3/trunk@5681 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 20:47:01 +00:00
HD Moore
8491ef3ff9
Correct File namespace (thanks MJM)
...
git-svn-id: file:///home/svn/framework3/trunk@5680 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 20:39:28 +00:00
James Lee
36a06e7576
initial commit of php findsock. This patch makes all http connections global and removes the "close if (!pipelining)" checks, so beware of bugs.
...
git-svn-id: file:///home/svn/framework3/trunk@5678 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 04:41:51 +00:00
HD Moore
b0225127cf
Patch for Ruby 1.9 compat (not there yet)
...
git-svn-id: file:///home/svn/framework3/trunk@5674 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-22 15:52:18 +00:00
Ramon de C Valle
bd753e8ece
Fixed identation
...
git-svn-id: file:///home/svn/framework3/trunk@5664 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-17 02:01:15 +00:00
Ramon de C Valle
58cef5775e
Added ARCH_POWER constant and fixed AIX payload modules
...
git-svn-id: file:///home/svn/framework3/trunk@5663 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-17 01:42:51 +00:00
HD Moore
6772685f3e
Merge patch from Julien TINNES for MIPS support (LE/BE)
...
git-svn-id: file:///home/svn/framework3/trunk@5658 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-15 18:50:34 +00:00
HD Moore
1fa95d6050
This patch adds support for IPv6 scope_ids to AddressRange parameters. Ranges consisting of a single address are not expanded
...
git-svn-id: file:///home/svn/framework3/trunk@5640 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-23 07:05:38 +00:00
HD Moore
947dad1f45
Expose the sslctx to the caller
...
git-svn-id: file:///home/svn/framework3/trunk@5639 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-23 05:12:43 +00:00