Commit Graph

53 Commits (2da07d4963eed562b74dd4d2e623db9a6d1a7b4e)

Author SHA1 Message Date
James Lee 5091a0fbfa un-revert another piece of r12600's overzealousness. see r12574
git-svn-id: file:///home/svn/framework3/trunk@12647 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 17:16:47 +00:00
HD Moore 9ce47c01bd Reverting the autoload changes until we can upgrade to a new ActiveSupport library or find a workaround
git-svn-id: file:///home/svn/framework3/trunk@12600 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 20:03:55 +00:00
Joshua Drake fd4e6db85d Fixes 4373, Migrates lib/msf to use autoload instead of require (first try)
git-svn-id: file:///home/svn/framework3/trunk@12596 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 19:07:35 +00:00
Joshua Drake cdeb44747f huh? missing something important heh
git-svn-id: file:///home/svn/framework3/trunk@12574 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-10 18:33:38 +00:00
HD Moore 3395ee226e Associate the replicant exploit instance with the replicant payload, otherwise the wrong exploit instance will be used by the payload handler. Fixes #4004.
git-svn-id: file:///home/svn/framework3/trunk@12065 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-22 03:19:56 +00:00
Joshua Drake f45e03cd14 remove wait when DisablePayloadHandler was set
git-svn-id: file:///home/svn/framework3/trunk@11324 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-13 23:34:43 +00:00
Joshua Drake 6e34bc5420 further clean up exception handling / session waiting for exploits
git-svn-id: file:///home/svn/framework3/trunk@9910 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 23:25:20 +00:00
Joshua Drake 8c5f10006f style compliance fixes
git-svn-id: file:///home/svn/framework3/trunk@9899 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 06:03:42 +00:00
James Lee bcb62247dd explicitly clear a module's job_id in case it was set in a previous run. Fixes #2267
git-svn-id: file:///home/svn/framework3/trunk@9847 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 21:47:00 +00:00
Joshua Drake 63595d1ce2 update exception handling to bail on RuntimeError or Interrupt, but wait otherwise.
git-svn-id: file:///home/svn/framework3/trunk@9845 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 19:58:41 +00:00
HD Moore d9402edde3 Handle cases where the exploit succeeds but then throws an exception, printing the "exploit failed" message. Closes #2260
git-svn-id: file:///home/svn/framework3/trunk@9840 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-15 21:28:21 +00:00
James Lee 2c5336dabb attach job_id to the exploit, not just the driver; regenerate the uuid when replicating a module; generate the payload after copying the exploit module for a new job; fixes #2203, see #2098 and #2096
git-svn-id: file:///home/svn/framework3/trunk@9714 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-07 16:37:23 +00:00
James Lee 8898e2de8f go back to copying the module for jobs. 'exploit -j' appears to work with the current changes. fixes #2096 and #2098 (for real this time)
git-svn-id: file:///home/svn/framework3/trunk@9692 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-06 21:09:53 +00:00
James Lee 07ef50e4e1 don't copy modules for jobs. fixes 'exploit -j' which was unable to create sessions, but reopens #2096 and #2098
git-svn-id: file:///home/svn/framework3/trunk@9662 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-02 02:46:07 +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 42da9e899a Improvements to the cleanup process, close sockets properly for exploits and auxiliary
git-svn-id: file:///home/svn/framework3/trunk@9187 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-01 16:26:24 +00:00
James Lee efceaa84cf add on_module_complete and on_module_error events
git-svn-id: file:///home/svn/framework3/trunk@8837 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 19:32:54 +00:00
James Lee 53662ed46e save events to the database. fixes 618
git-svn-id: file:///home/svn/framework3/trunk@8126 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 00:32:48 +00:00
HD Moore ba5da501bf Log the exploit name when the module raises an exception, helps track down bugs during automation
git-svn-id: file:///home/svn/framework3/trunk@7529 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 15:08:58 +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
HD Moore 2bc4ca41b3 Fix background exploit jobs
git-svn-id: file:///home/svn/framework3/trunk@5943 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-17 19:51:09 +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 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 a9ca5d1ace More GUI work. Changed the location where module exceptions are reported
git-svn-id: file:///home/svn/framework3/trunk@5335 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-24 05:29:35 +00:00
Matt Miller 71a7355e20 added the ability to track jobs, and made rexploit stop the existing job
git-svn-id: file:///home/svn/framework3/trunk@4644 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-04 02:49:08 +00:00
Matt Miller b30551b59d moved code around that sets the via exploit/payload to the handler code, fixes #32
git-svn-id: file:///home/svn/framework3/trunk@4473 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-26 03:09:55 +00:00
Matt Miller e6b9e4f24b a few tweaks to make things more reliable, added wfs_delay
git-svn-id: file:///home/svn/framework3/trunk@4045 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-17 00:16:04 +00:00
HD Moore ec987e0f28 Bug fix for passive-exploits
Bug fix for a crash in the DB import for XML




git-svn-id: file:///home/svn/framework3/trunk@3920 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-21 14:51:58 +00:00
HD Moore a309a6755b Fix background job support
git-svn-id: file:///home/svn/framework3/trunk@3899 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-16 20:07:07 +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
Matt Miller e9318c64d7 catch all exceptions
git-svn-id: file:///home/svn/incoming/trunk@3288 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-31 18:23:30 +00:00
Matt Miller f37776f830 fix for mod platform
git-svn-id: file:///home/svn/incoming/trunk@3222 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-14 00:43:18 +00:00
Matt Miller 96d75dcbb4 support for aborting sockets once a remote, non-find exploit succeeds
git-svn-id: file:///home/svn/incoming/trunk@3082 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-24 18:50:33 +00:00
Matt Miller 0e9c5bab5b logging fix, meterpreter multi-load fixed, advanced option display, meterpreter optino to autoload stdapi
git-svn-id: file:///home/svn/incoming/trunk@3052 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-19 15:09:41 +00:00
Matt Miller cbbce06ee0 fix for multiple exploit
git-svn-id: file:///home/svn/incoming/trunk@3046 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-18 00:26:19 +00:00
Matt Miller fc42fef941 exploits now pass context when creating sockets
git-svn-id: file:///home/svn/incoming/trunk@3034 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-15 21:25:23 +00:00
Matt Miller 5676117bff last of normalized docs from last night
git-svn-id: file:///home/svn/incoming/trunk@3030 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-15 15:11:43 +00:00
Matt Miller eeda1d06d7 woop
git-svn-id: file:///home/svn/incoming/trunk@3023 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-11 01:49:02 +00:00
Matt Miller ac9b0edf94 bug fix
git-svn-id: file:///home/svn/incoming/trunk@3012 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-03 00:18:12 +00:00
Matt Miller 39c9af8069 updated comments to be more uniformed in class definition
git-svn-id: file:///home/svn/incoming/trunk@3005 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-02 16:56:39 +00:00
Matt Miller a6d6cedd1d automatic module subscription to events
git-svn-id: file:///home/svn/incoming/trunk@2980 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-30 22:20:29 +00:00
Matt Miller 81c8cf3104 documentation fixes, code cleanup
git-svn-id: file:///home/svn/incoming/trunk@2973 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-19 03:20:20 +00:00
Matt Miller ad6273ce35 cleanup payload and exploit after failure
git-svn-id: file:///home/svn/incoming/trunk@2950 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-02 18:39:51 +00:00
Matt Miller 17071db65c msfcli action
git-svn-id: file:///home/svn/incoming/trunk@2944 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-02 05:48:05 +00:00
Matt Miller fdf9553991 fix for argument error
git-svn-id: file:///home/svn/incoming/trunk@2914 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-27 00:35:51 +00:00
Matt Miller bde47f6ce2 exploit error catching
git-svn-id: file:///home/svn/incoming/trunk@2877 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-24 00:19:27 +00:00
Matt Miller b522132350 moved some stuff around, working on adding the concept of jobs
git-svn-id: file:///home/svn/incoming/trunk@2864 4d416f70-5f16-0410-b530-b9f4589650da
2005-09-22 04:53:46 +00:00
Matt Miller 577a5c3095 dll injection working, had to fix nop stack alignment crap
git-svn-id: file:///home/svn/incoming/trunk@2788 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 02:01:36 +00:00
Matt Miller 11724ac797 fixed stager merging, made things a bit more pimply
git-svn-id: file:///home/svn/incoming/trunk@2774 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-17 06:01:11 +00:00
Matt Miller 2f2363d141 it lives, major changes, fixed bugs, exploiting works with the test exploit
git-svn-id: file:///home/svn/incoming/trunk@2763 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-16 07:32:11 +00:00