Commit Graph

107 Commits (615104b6abe6b221c210b61a46d00bb1255e9045)

Author SHA1 Message Date
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
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
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 676a582814 oops, forgot to add these
git-svn-id: file:///home/svn/incoming/trunk@3582 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-30 15:13:14 +00:00
bmc dbf0fcf0f2 * add object_id and random object_id call evasion
git-svn-id: file:///home/svn/incoming/trunk@3579 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-29 20:46:29 +00:00
bmc 839ad37dc4 * update testset
git-svn-id: file:///home/svn/incoming/trunk@3578 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-29 19:34:46 +00:00
bmc c96065fc3b * update testset, thanks to changes HD made
git-svn-id: file:///home/svn/incoming/trunk@3577 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-29 19:34:25 +00:00
bmc 9a0b748a4b * add header test suite
git-svn-id: file:///home/svn/incoming/trunk@3567 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-09 19:52:34 +00:00
bmc 5b675262be properlly support responses when we get a request like this:
(echo "GET / HTTP/1.0"; echo ) |nc IP PORT


git-svn-id: file:///home/svn/incoming/trunk@3566 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-09 19:51:37 +00:00
bmc 223d22c2e6 * object cleanups
* add tcp request fragmentation support


git-svn-id: file:///home/svn/incoming/trunk@3562 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-08 19:13:27 +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
bmc 279abda264 * uri encoding is now part of Rex::Text
* add junk param start
* add junk URI end


git-svn-id: file:///home/svn/incoming/trunk@3546 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-27 19:55:22 +00:00
bmc 524c0a3f74 * add 'none' encoding
git-svn-id: file:///home/svn/incoming/trunk@3521 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-10 15:44:15 +00:00
bmc 1351ceed1c * add support to hex/%u encode a URI
git-svn-id: file:///home/svn/incoming/trunk@3517 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-06 22:48:57 +00:00
bmc 0f6055c73c support both POST and SEARCH as basic post request types.
git-svn-id: file:///home/svn/incoming/trunk@3512 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-06 20:23:52 +00:00
vlad902 27e12952d0 Replace get_once with get()
git-svn-id: file:///home/svn/incoming/trunk@3487 4d416f70-5f16-0410-b530-b9f4589650da
2006-02-01 00:01:57 +00:00
bmc d668b87f68 * remove some comments
git-svn-id: file:///home/svn/incoming/trunk@3481 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-30 22:09:58 +00:00
bmc 05b9aacbc1 'none' is an ok content-encoding, just does nothing... (passed in from the exploit mixin)
git-svn-id: file:///home/svn/incoming/trunk@3475 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-30 17:31:32 +00:00
bmc 20fec01d68 * add junk pipelined request support
* fix socket creation on pipelined requests
* when a server says that the connection should be closed (Connection: closed), then close the connection, since its going to regardless, and we don't want to loose our state
* support non-standard line termination in headers.  ie \n instead of \r\n
* add junk headers (X-rand: rand)
* add header folding (for evasion)
* add parse_header_re (still leaving parse_header around, though its dead code ATM) that does the right thing on non-standard line endings
* move 'gzip' to a 'compression' option
* add 'deflate' compression option (really, just raw zlib, and only firefox does deflate right)
* fix a bunch of TE:chunked decoding bugs based based on the fact that Apache doesn't always close chunks appropriately
* modify parse_body to not return state, since it doesn't always do that, and the return isn't used... self.state is.
* add TE:chunked request support
* normalize URIs in requests before saving them
* Move params out of the URI, but when the uri is requested, and the method is GET, and there are params, return a URI that has the params that are approrpiately encoded (needed for junk_params, see below)
* move request.to_s support of params to use the request params array when a POST, allows use of junk params support (see below).  NOTE:  If the body is provided, use the body instead of params, in case you want to hardcode the params in a POST request, eg: php_xmlrpc_eval.rb
* Add junk params when building a param list, eg: a=b becomes asdfasdf=asdrt32a&asdfad=okhgasd&a=b&hjklasdf=hkasgd
* add URI junk slash support (eg: /////foo.html)
* param splitting now supports both '&', and ';', which CGI.pm and PHP both allow
* add URI junk directory support, eg: /asdf/../foo.html
* add param encoding support, eg: param A with value '=' is  A=%3d
* add URI junk self referring directory support, eg: /././foo.html


git-svn-id: file:///home/svn/incoming/trunk@3457 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 21:57:44 +00:00
HD Moore b4ad4a5d75 Tabs vs Spaces
git-svn-id: file:///home/svn/incoming/trunk@3453 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 05:33:08 +00:00
HD Moore e9b4b96f0d Tabs vs spaces
git-svn-id: file:///home/svn/incoming/trunk@3452 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-27 05:29:06 +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
bmc a1db0b6196 space to tab (happy skape?)
git-svn-id: file:///home/svn/incoming/trunk@3445 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-25 21:57:30 +00:00
bmc 98b9a977f4 * these need to go away
git-svn-id: file:///home/svn/incoming/trunk@3440 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-24 16:01:49 +00:00
bmc 55ba865f30 * few cleanups plus addition of self referring directories (eg: /././././)
git-svn-id: file:///home/svn/incoming/trunk@3437 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-23 23:57:50 +00:00
bmc 52fa0da439 * add support for inserting junk directories, slashes, and params
git-svn-id: file:///home/svn/incoming/trunk@3436 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-23 21:58:53 +00:00
vlad902 2346b83ef4 Slightly re-structured and bug fixed
git-svn-id: file:///home/svn/incoming/trunk@3420 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-21 02:44:01 +00:00
vlad902 d051386d63 Basic SunRPC wrapper
git-svn-id: file:///home/svn/incoming/trunk@3419 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-21 02:43:44 +00:00
bmc 9913f6d953 * add SSL support to the client (pass another arg to enable)
git-svn-id: file:///home/svn/incoming/trunk@3411 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-20 18:59:24 +00:00
HD Moore 737a1cb711 Pass socket context to child sockets from server, pass context from http mixin to socket
git-svn-id: file:///home/svn/incoming/trunk@3402 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-17 04:35:44 +00:00
vlad902 dc83e49db2 Initial revision
git-svn-id: file:///home/svn/incoming/trunk@3400 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-17 01:12:38 +00:00
vlad902 da81906949 rpc -> sunrpc
git-svn-id: file:///home/svn/incoming/trunk@3397 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-17 01:09:15 +00:00
Matt Miller 0b27b07a5d possible fix for header parsing issue
git-svn-id: file:///home/svn/incoming/trunk@3390 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-16 16:29:22 +00:00
Matt Miller 679d192173 patch to allow non-default server name
git-svn-id: file:///home/svn/incoming/trunk@3369 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-11 22:16:20 +00:00
Matt Miller ae5c816e85 various enhancements to support passivex, seems to be functional, somewhat
git-svn-id: file:///home/svn/incoming/trunk@3322 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-07 10:04:30 +00:00
HD Moore 8049b32cbc Patches from <anon>
git-svn-id: file:///home/svn/incoming/trunk@3310 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-05 22:20:28 +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 082a62afd7 NetDDE + smb code frmo pusscat
git-svn-id: file:///home/svn/incoming/trunk@3243 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-18 02:07:33 +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
Matt Miller 410770bae6 fixes for some socket association stuff
git-svn-id: file:///home/svn/incoming/trunk@3233 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-15 04:46:52 +00:00
HD Moore e79c9f8658 Something is still breaking, use w3who, show payloads, exploit, breaks
git-svn-id: file:///home/svn/incoming/trunk@3218 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-14 00:21: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