Commit Graph

57 Commits (c52b37ea172ea17cb6853de4c14d1716e5c5fe58)

Author SHA1 Message Date
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 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
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 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 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 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 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
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 0ad43aad70 Fix an exception that is encountered when not enough of the DCERPC packet has been read
git-svn-id: file:///home/svn/framework3/trunk@5468 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-04 22:12:59 +00:00
HD Moore 06e47726ba Handle DCERPC reads over SMB pipes in a more efficient fashion. Rename the sadmind exploit, since Solaris is redundant
git-svn-id: file:///home/svn/framework3/trunk@5467 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-04 21:15:55 +00:00
HD Moore 125d114526 Properly handle SMB::pipe_(read|write)_(min|max)
git-svn-id: file:///home/svn/framework3/trunk@5466 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-04 20:54:39 +00:00
HD Moore 6677beb174 Merged revisions 5366-5377 via svnmerge from
svn+ssh://metasploit.com/home/svn/framework3/branches/framework-3.1

........
  r5366 | hdm | 2008-01-26 20:30:53 -0600 (Sat, 26 Jan 2008) | 2 lines
  
  Update version information
........
  r5367 | hdm | 2008-01-26 21:10:57 -0600 (Sat, 26 Jan 2008) | 3 lines
  
  Updated for version 3.1
........
  r5369 | hdm | 2008-01-26 21:13:31 -0600 (Sat, 26 Jan 2008) | 3 lines
  
  Wipe the private directories from the branch. 
........
  r5371 | hdm | 2008-01-27 17:24:24 -0600 (Sun, 27 Jan 2008) | 5 lines
  
  Timeout options added for dcerpc connect and read times. Addition of novell netware as a supported target platform. Inclusion of the serverprotect exploit (still works on the latest version). Addition of the first remote netware kernel exploit that leads to a shell, addition of netware stager and shell, and first draft of the release notes for 3.1
........
  r5372 | hdm | 2008-01-27 17:30:08 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  Formatting, indentation, fixed the static IP embedded in the request
........
  r5373 | hdm | 2008-01-27 20:02:48 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  Correctly trap exploit errors in a way that works with all of the UIs
........
  r5374 | hdm | 2008-01-27 20:23:25 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  More last-minute bug fixes
........
  r5375 | hdm | 2008-01-27 20:37:43 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  Force multi-bind off in netware, correct label display in gtk gui labels
........
  r5376 | hdm | 2008-01-27 20:50:03 -0600 (Sun, 27 Jan 2008) | 3 lines
  
  More exception handling fun
........


git-svn-id: file:///home/svn/framework3/trunk@5378 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-28 03:06:31 +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
Matt Miller e8d036cac8 fixed typo in simplified modules
git-svn-id: file:///home/svn/framework3/trunk@4465 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-24 21:42:13 +00:00
HD Moore fe540a3001 Cleanly handle EOFError's from DCERPC services. This fixes #27
git-svn-id: file:///home/svn/framework3/trunk@4453 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-21 03:58:44 +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 1a7ba78dc8 Removed a dumb debugging line that was accidentally comitted
git-svn-id: file:///home/svn/framework3/trunk@3752 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-20 04:43:52 +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 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
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 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 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 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
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 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
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 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 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 11da735d7a More test suites
git-svn-id: file:///home/svn/incoming/trunk@3166 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-02 02:35:49 +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 daa523ef70 More code from bmc, forgot to commit
git-svn-id: file:///home/svn/incoming/trunk@3164 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-02 01:20:31 +00:00
HD Moore b931b02c14 Changes from Brian Caswell
git-svn-id: file:///home/svn/incoming/trunk@3161 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-30 19:42:19 +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
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 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 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 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 18f8b2ca9b Added exception checks
git-svn-id: file:///home/svn/incoming/trunk@2855 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-16 07:53:57 +00:00
HD Moore 5e5f7eed24 DCERPC foo
git-svn-id: file:///home/svn/incoming/trunk@2852 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-16 03:29:27 +00:00