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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
9c7f5d7130
Simple fix for bad calls to negotiate, remove useless disconnect call in the relay daemon
...
git-svn-id: file:///home/svn/framework3/trunk@5460 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-26 22:36:42 +00:00
HD Moore
509fc09382
Lots of updates related to <secret project X>.
...
git-svn-id: file:///home/svn/framework3/trunk@5424 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-02 04:46:13 +00:00
HD Moore
ad43a641f8
Patch from grutz (see #169 ). Added constants for SMB2
...
git-svn-id: file:///home/svn/framework3/trunk@5226 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-27 17:42:32 +00:00
HD Moore
21d971139b
New HTTP NTLM code from Kurt Grutzmacher <grutz@jingojango.net>
...
git-svn-id: file:///home/svn/framework3/trunk@5143 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-12 01:24:57 +00:00
HD Moore
bff51b5578
Typo fix
...
git-svn-id: file:///home/svn/framework3/trunk@5067 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-30 05:21:02 +00:00
HD Moore
b4fab66d40
Fixes #128 . Applying a one-line typo fix from antoine. Thanks!
...
git-svn-id: file:///home/svn/framework3/trunk@5052 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-16 13:43:52 +00:00
HD Moore
24aac8b5ae
Fixes #127 . Applying patch from Alex that solves ASN.1 encoding issues.
...
git-svn-id: file:///home/svn/framework3/trunk@5049 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-16 01:13:25 +00:00
HD Moore
d0b15d3d72
Lots of SMB fun, all preparation for Black Hat talk :-) More to come...
...
git-svn-id: file:///home/svn/framework3/trunk@5015 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-03 04:20:50 +00:00
HD Moore
ddfe651bc8
This adds support for smb_pipeio=trans
...
git-svn-id: file:///home/svn/framework3/trunk@4915 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-15 16:48:15 +00:00
HD Moore
58a804e510
Small bug fix to allow pipeio on Novell
...
git-svn-id: file:///home/svn/framework3/trunk@4914 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-15 15:44:39 +00:00
HD Moore
e8c5c53e4b
This adds pass-the-hash support from grutz.
...
git-svn-id: file:///home/svn/framework3/trunk@4890 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-09 12:39:29 +00:00
HD Moore
ab6f961ea4
Removed the buggy errors.txt loader, embedded the error messages into the files
...
git-svn-id: file:///home/svn/framework3/trunk@4584 4d416f70-5f16-0410-b530-b9f4589650da
2007-03-27 02:44:05 +00:00
HD Moore
a4b06e1653
fixes a file descriptor leak in the SMB and DCERPC exception translation code
...
git-svn-id: file:///home/svn/framework3/trunk@4423 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 03:07:40 +00:00
HD Moore
2980467f1b
Formatting updates
...
git-svn-id: file:///home/svn/framework3/trunk@4315 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-04 01:54:10 +00:00
HD Moore
0b71dc5d04
A few updates to add NT Trans2 secondary requests, fix an authentication issue, and support a new denial of service module
...
git-svn-id: file:///home/svn/framework3/trunk@3885 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-14 05:41:54 +00:00
HD Moore
7a0c8d2c8d
Cleanup
...
git-svn-id: file:///home/svn/framework3/trunk@3846 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-28 00:24:34 +00:00
HD Moore
651a1a7965
Bug fix to support NT 4.0
...
git-svn-id: file:///home/svn/framework3/trunk@3822 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-12 23:07:25 +00:00
HD Moore
775183661d
Split trans into two routines, one of which sets maxparm/maxdata to zero, which is required to trigger the mailslot bug. Thanks Nico!
...
git-svn-id: file:///home/svn/framework3/trunk@3741 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-13 03:04:53 +00:00
HD Moore
35568b570a
Demo code added for MS06-035, mailslot write added to client.rb
...
git-svn-id: file:///home/svn/framework3/trunk@3740 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-11 20:02:45 +00:00
HD Moore
d1efbad1e7
Minor updates
...
git-svn-id: file:///home/svn/framework3/trunk@3722 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-23 06:20:52 +00:00
HD Moore
b2895bec0d
Minor sanity checks added
...
git-svn-id: file:///home/svn/framework3/trunk@3697 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-17 17:36:19 +00:00
bmc
049b71e236
move username & password to the test suite config thingie
...
git-svn-id: file:///home/svn/incoming/trunk@3652 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-01 15:30:26 +00:00
bmc
c9a3258f81
removing dup trans function with a no_response argument to trans
...
git-svn-id: file:///home/svn/incoming/trunk@3650 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-01 15:18:53 +00:00
bmc
09786d3eaa
tiny cleanups
...
git-svn-id: file:///home/svn/incoming/trunk@3649 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-31 21:49:46 +00:00
bmc
2f33ece43b
* cleanup extra whitespaces at the end of the line
...
* collect = good
git-svn-id: file:///home/svn/incoming/trunk@3648 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-30 17:18:27 +00:00
HD Moore
c3e0146443
Cleanups to SMB tests, minor fixes.
...
git-svn-id: file:///home/svn/incoming/trunk@3646 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-30 16:11:00 +00:00
HD Moore
18bb4f9e6d
Fixed spaces before paranethesis issues in dcerpc/packet.rb
...
Fixed comment in smb/client.rb
Fixed ReadAndX in smb/client.rb
Updated ReadAndX struct in constants.rb
git-svn-id: file:///home/svn/incoming/trunk@3643 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-15 16:44:44 +00:00
HD Moore
71ac31446f
SupportWords for a tree connect response are arbitrary new words that increment the WordCount, hopefully this wont break response parsing for the actual payload/bytecount. The current struct2 system can't take abitrary WordCount responses into account yet :-/
...
git-svn-id: file:///home/svn/incoming/trunk@3635 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-05 13:53:16 +00:00
HD Moore
64827d1238
New evasion options for controlling how many fake uuids to place before and after the real uid when eexploiting DCERPC bugs
...
Added a new evasion option for picking readAndX/writeAndX or transNamedPipe methods for DCERPC delivery, however a struct2 issue seems to be breaking this (will investigate tomorrow).
Fixed a typo in the initialize method of the OpenPipe class
git-svn-id: file:///home/svn/incoming/trunk@3634 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-03 05:53:37 +00:00
HD Moore
1fd5d698a2
Migrated client.rb to new smb time api (missed one)
...
Removed debugging print from the SMB mixin
git-svn-id: file:///home/svn/incoming/trunk@3632 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-03 04:49:47 +00:00
HD Moore
44f578bf41
Changed 'boolean' flags to true/false from 0/1 in client.rb
...
Updated constants.rb to more accurately reflect packet structure in SMB responses
Updated client.rb to match the changes to constants
Updated utils.rb to include smb to unix conversation routines for time fields
Updated utils.rb to create security blobs for both client and server packets
git-svn-id: file:///home/svn/incoming/trunk@3631 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-03 04:43:19 +00:00
HD Moore
1a54cc810a
Fixed numerous issues involving smb/dcerpc interaction
...
Fixed 'bad' use of method definition (space after method name, will be depreciated soon)
git-svn-id: file:///home/svn/incoming/trunk@3626 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-30 19:49:27 +00:00
HD Moore
42bc7496cf
All sorts of fun changes to smb/dcerpc, the basics are:
...
1) Clean up SMB constants, add new ones, define which ones are supported by dialect
2) DCERPC over SMB uses a 'OpenPipe' class, not an 'OpenFile'
3) A new DCERPC option called 'smb_pipeio' allows the user to switch between Read/Write and TransactNamedPipe()
git-svn-id: file:///home/svn/incoming/trunk@3622 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-26 16:59:44 +00:00
HD Moore
f4736c3eae
Minor improvements
...
git-svn-id: file:///home/svn/incoming/trunk@3593 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-08 06:35:35 +00:00
bmc
93870878fe
* no self wrapper to unicode
...
* update tests to make more sense when they fail
git-svn-id: file:///home/svn/incoming/trunk@3557 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-07 20:19:30 +00:00
HD Moore
feca661373
Fixed typos in the license
...
Fixed exception issues
git-svn-id: file:///home/svn/incoming/trunk@3552 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-07 06:50:25 +00:00
HD Moore
93045fa927
Tab fixes
...
git-svn-id: file:///home/svn/incoming/trunk@3451 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 05:28:16 +00:00
HD Moore
f468b10cff
Tweaks
...
git-svn-id: file:///home/svn/incoming/trunk@3286 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-31 18:03:02 +00:00
HD Moore
88658064df
/usr/bin/ruby vs /usr/bin/env ruby
...
git-svn-id: file:///home/svn/incoming/trunk@3242 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-17 06:46:23 +00:00
HD Moore
6063908cd4
Catch ugly Interrupt error in msfconsole, fixed tabs in simpleclient
...
git-svn-id: file:///home/svn/incoming/trunk@3213 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-13 06:27:34 +00:00
HD Moore
f9edc88699
SMB/DCERPC errors/exceptions
...
Added default tab targets for TARGET/PAYLOAD/ENCODER/NOP
git-svn-id: file:///home/svn/incoming/trunk@3212 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-13 06:22:56 +00:00
HD Moore
557153e01c
Code from Brian Caswell
...
git-svn-id: file:///home/svn/incoming/trunk@3210 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-13 06:08:40 +00:00
HD Moore
526b9f199d
Changes from Brian Caswell
...
git-svn-id: file:///home/svn/incoming/trunk@3165 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-02 02:35:30 +00:00
HD Moore
9bf0d901cf
Added the egghunter mixin
...
Consolidated all unicode routines to go through Rex::Text.to_unicode()
Added a new function for sending evil blobs through smb
git-svn-id: file:///home/svn/incoming/trunk@3114 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-26 02:34:39 +00:00
HD Moore
4edf57d731
ms04_011 works perfectly
...
updated smb, evasion can be set via SMBEvasion datastore (temporary)
added the first osx exploit, cant test for a week or so
git-svn-id: file:///home/svn/incoming/trunk@3044 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-17 19:41:54 +00:00
HD Moore
16c5e232f5
Addition of get_once() in io::stream, rewritten recv code for smb/dcerpc, error handling in exploit mixins
...
git-svn-id: file:///home/svn/incoming/trunk@3042 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-16 17:56:07 +00:00
HD Moore
3150bd2f3a
SMB mixin is mostly working now
...
git-svn-id: file:///home/svn/incoming/trunk@3037 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-15 23:02:17 +00:00
Matt Miller
da05fa0415
somewhat gracefully handle missing ossl, fix missing method
...
git-svn-id: file:///home/svn/incoming/trunk@3014 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-03 04:43:19 +00:00
HD Moore
a5cde85299
More SMB
...
git-svn-id: file:///home/svn/incoming/trunk@2954 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-03 13:51:05 +00:00
HD Moore
cb69d58ca5
Still working on the simpleclient interface
...
git-svn-id: file:///home/svn/incoming/trunk@2946 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-02 06:53:39 +00:00
HD Moore
cfbeff077e
Added SimpleClient, moderate bug fixes
...
git-svn-id: file:///home/svn/incoming/trunk@2873 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-23 09:14:03 +00:00
HD Moore
17e2527f07
Evasion code is more sane, mostly working
...
git-svn-id: file:///home/svn/incoming/trunk@2870 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-23 06:27:22 +00:00
HD Moore
40da41eb8d
Massive overhaul to packet parsing and error handling
...
Introducing the new evasion system
git-svn-id: file:///home/svn/incoming/trunk@2867 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-23 03:43:04 +00:00
HD Moore
3114a95235
wee eh
...
git-svn-id: file:///home/svn/incoming/trunk@2866 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-22 09:04:54 +00:00
HD Moore
ea4448bee4
More SMB - DCERPC transactions work, woop!
...
git-svn-id: file:///home/svn/incoming/trunk@2865 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-22 09:04:40 +00:00
HD Moore
04abd76d8d
More SMB stuff
...
git-svn-id: file:///home/svn/incoming/trunk@2863 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-22 04:04:06 +00:00
HD Moore
053e2ba70d
More SMB work
...
git-svn-id: file:///home/svn/incoming/trunk@2857 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-19 23:35:51 +00:00
HD Moore
0f569bc65d
Fixed up DCERPC test cases
...
Started on SMB
git-svn-id: file:///home/svn/incoming/trunk@2856 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-16 09:27:41 +00:00
HD Moore
eda702774d
Fixed missing end tag
...
git-svn-id: file:///home/svn/incoming/trunk@2767 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-16 09:37:18 +00:00
HD Moore
1c2ddba531
Fixed name
...
git-svn-id: file:///home/svn/incoming/trunk@2766 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-16 09:36:37 +00:00
HD Moore
a820ba273c
Fixed name
...
git-svn-id: file:///home/svn/incoming/trunk@2764 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-16 07:38:31 +00:00
HD Moore
95023a82e9
SMB Crypt library
...
git-svn-id: file:///home/svn/incoming/trunk@2332 4d416f70-5f16-0410-b530-b9f4589650da
2005-03-27 00:23:10 +00:00