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