Commit Graph

849 Commits (ff28b148d18d30c16dc90ee5f12bdae5e3a935a3)

Author SHA1 Message Date
HD Moore ff28b148d1 Fix from nico
git-svn-id: file:///home/svn/framework3/trunk@3745 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-18 01:32:21 +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
bmc 6e6b1bb2a7 * NDR has been moved, so remove the tests for now, removing the code later
git-svn-id: file:///home/svn/framework3/trunk@3734 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-28 13:35:19 +00:00
HD Moore 2b603db2bb Merge from side branch to fix a bug
git-svn-id: file:///home/svn/framework3/trunk@3732 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-27 23:00:49 +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
HD Moore c6436b501a IPv6 needed this fix as well
git-svn-id: file:///home/svn/incoming/trunk@3673 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-16 03:56:08 +00:00
Matt Miller 3e37b5993f fix unpack in from_sockaddr
git-svn-id: file:///home/svn/incoming/trunk@3672 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-16 03:11:53 +00:00
Matt Miller 4f21fc4709 fix for pack crap
git-svn-id: file:///home/svn/incoming/trunk@3671 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-16 03:03:40 +00:00
bmc 3c2a871399 * fix dotted_ip? to be more strict
git-svn-id: file:///home/svn/incoming/trunk@3670 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-15 22:41:57 +00:00
bmc e70b6f7cfe * add dotted quad validation tests (to prove the current one is broken :P )
git-svn-id: file:///home/svn/incoming/trunk@3669 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-15 22:41:31 +00:00
Matt Miller 54540f7eb7 fix regex
git-svn-id: file:///home/svn/incoming/trunk@3668 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-15 21:17:05 +00:00
Matt Miller e312f588a2 delay issue on win32 fixed by wrapping socket calls
git-svn-id: file:///home/svn/incoming/trunk@3667 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-15 20:53:20 +00:00
HD Moore 14dabc399e Added DOS aux modules
Temporarily added RRAS_MAGIC


git-svn-id: file:///home/svn/incoming/trunk@3666 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-15 15:52:01 +00:00
bmc f4545e50ed fix comment
git-svn-id: file:///home/svn/incoming/trunk@3663 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-14 22:12:36 +00:00
bmc d89f5fa9d1 * change where NDR is grabbed from
git-svn-id: file:///home/svn/incoming/trunk@3660 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-13 21:27:01 +00:00
bmc 9352454791 * add warnings, gonna go away soon
git-svn-id: file:///home/svn/incoming/trunk@3659 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-13 21:26:34 +00:00
bmc 1ec5099398 ndr is really just an encoding mechanism, and its not unique to DCERPC. so... move it here
git-svn-id: file:///home/svn/incoming/trunk@3658 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-13 20:33:01 +00:00
HD Moore 989fb37f33 Woops, forgot to keep it compatible with ipv4 :/
git-svn-id: file:///home/svn/incoming/trunk@3657 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-08 21:09:00 +00:00
HD Moore ebf46cf535 Fixes for IPv6 compatibility
git-svn-id: file:///home/svn/incoming/trunk@3656 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-08 21:02:58 +00:00
Matt Miller 1a61d3d2fb changes to support native win32
git-svn-id: file:///home/svn/incoming/trunk@3654 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-08 20:53:15 +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 ac2d76eb71 add default smb username & password for testing in the test config
git-svn-id: file:///home/svn/incoming/trunk@3651 4d416f70-5f16-0410-b530-b9f4589650da
2006-06-01 15:29:39 +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 7d0690ed2e Cleanups in preparation for alpha-r4
git-svn-id: file:///home/svn/incoming/trunk@3645 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-30 15:44:48 +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 43387ea793 register_options() always overrides the datastore
resolves the problem reported by Nicolas P.


git-svn-id: file:///home/svn/incoming/trunk@3642 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-11 16:11:06 +00:00
pusscat c02749067f Add nonupper encoder, like nonalpha, but with badchar support instead of lowercase char range
git-svn-id: file:///home/svn/incoming/trunk@3641 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-08 15:04:50 +00:00
HD Moore f959995bb1 Added the missing BSD license
git-svn-id: file:///home/svn/incoming/trunk@3638 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-06 17:13:22 +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 304001a454 Removal of obsolete DCERPC code
git-svn-id: file:///home/svn/incoming/trunk@3633 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-03 05:23:52 +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
pusscat 5bfe1048e0 change the randbase 0x41 fix to work for shell_reverse_tcp
git-svn-id: file:///home/svn/incoming/trunk@3625 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-27 16:23:02 +00:00
HD Moore f9b23371b8 aux -> auxiliary to fix a windows isue
git-svn-id: file:///home/svn/incoming/trunk@3624 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-27 05:16:03 +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 d0b3483d41 Fixored
git-svn-id: file:///home/svn/incoming/trunk@3621 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-26 16:51:05 +00:00
pusscat 0f142d18e4 Fix to ensure that 0x41 isn't randomly generated to prematurely break our decode loop
git-svn-id: file:///home/svn/incoming/trunk@3620 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-26 15:50:05 +00:00
HD Moore 55e7111d6a Blacklist bytes making up the actual badchars too
git-svn-id: file:///home/svn/incoming/trunk@3619 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-26 05:26:17 +00:00
HD Moore 07e157efdf Working on encoder fixes
git-svn-id: file:///home/svn/incoming/trunk@3618 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-26 05:14:55 +00:00
Matt Miller 55c3c1247b support to use proper pointer representation and 64-bit integers in struct
git-svn-id: file:///home/svn/incoming/trunk@3617 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-24 21:09:36 +00:00
bmc df49cfabb0 * add SSL TCP server support, using runtime generated/signed keys
* add HTTPS support

note, SSL service tests don't work.  Right now, the tests just bail early.  The
client spins forever trying to get data.  When the client & server are in
seperate processes, this isn't a problem.  A threaded test implementation is
closer, as data sent from the client gets to the server just fine.


git-svn-id: file:///home/svn/incoming/trunk@3616 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-24 18:49:00 +00:00
pusscat 71e3323dbd Adjust verboten ranges
git-svn-id: file:///home/svn/incoming/trunk@3615 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-24 17:49:04 +00:00
pusscat 25b60466ad Fix ecx count
Fix jle -> jge


git-svn-id: file:///home/svn/incoming/trunk@3614 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-24 15:42:40 +00:00