Commit Graph

129 Commits (ad691ec05b5a4262e4904583428c32fda1f56551)

Author SHA1 Message Date
James Lee 08d50e0a5b fix a bug in colorization where %c gets replaced before %cya; wouldn't have been a problem until colorization gets put back in
git-svn-id: file:///home/svn/framework3/trunk@6960 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-18 04:49:16 +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
James Lee 491fb6b683 fix double header line bug introduced by my last commit
git-svn-id: file:///home/svn/framework3/trunk@6321 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 19:55:47 +00:00
James Lee 96c8f6127c Replace += with << for Strings in a bunch of places.
git-svn-id: file:///home/svn/framework3/trunk@6318 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 07:55:47 +00:00
kris 08745cc6fd several typos
git-svn-id: file:///home/svn/framework3/trunk@6240 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-21 19:22:06 +00:00
HD Moore 77bc8d90a3 Apply patch to not exit the console on ^C
git-svn-id: file:///home/svn/framework3/trunk@5947 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-18 19:41:13 +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 8628a9d2c1 Fixes #193. Add a unicode-capable workaround for windows, patch code to go through the compat lib
git-svn-id: file:///home/svn/framework3/trunk@5873 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 21:44:58 +00:00
HD Moore ecc853d453 Fixes #246. Revert to older readline behavior, the priority change should prevent the readline idle loop from consuming process time.
git-svn-id: file:///home/svn/framework3/trunk@5859 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-09 08:44:36 +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 0f03e872f1 Fixes ^C and ^Z session handling
git-svn-id: file:///home/svn/framework3/trunk@5706 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-01 17:32:55 +00:00
HD Moore 380aba15b0 Implements the readline workaround, tested with regular and meterpreter sessions
git-svn-id: file:///home/svn/framework3/trunk@5544 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-27 20:51:36 +00:00
HD Moore f056b9437f Revert this again, breaks meterpreter console
git-svn-id: file:///home/svn/framework3/trunk@5543 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-27 20:07:53 +00:00
HD Moore 596a13ae30 Correctly handle the readline threading issue, tested with sessions.
git-svn-id: file:///home/svn/framework3/trunk@5541 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-27 19:57:28 +00:00
HD Moore eb0134d8b6 Fix an annoying error
git-svn-id: file:///home/svn/framework3/trunk@5539 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-24 20:55:42 +00:00
HD Moore 67b418475d Temporarily revert to the old readline behavior
git-svn-id: file:///home/svn/framework3/trunk@5521 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-05 00:15:40 +00:00
HD Moore e55a9d29a4 Temporarily disable the new readline mode
git-svn-id: file:///home/svn/framework3/trunk@5520 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-05 00:13:33 +00:00
HD Moore b844a31fcc Re-enable readline history
git-svn-id: file:///home/svn/framework3/trunk@5519 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-05 00:01:38 +00:00
HD Moore 14d8bc67fc This patch solves a slowness problem introduced by the ruby thread scheduler and the readline extension. For every time slice that the readline thread receives, it does a 100ms select(stdin), which severely impacts the performance of all other running threads. This patch pushes readline into a forked subprocess. Not the most elegant, but it will do until we have a real client-server model.
git-svn-id: file:///home/svn/framework3/trunk@5518 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-04 22:56:25 +00:00
Matt Miller 2be17ce819 patch from Kris Katterjohn
git-svn-id: file:///home/svn/framework3/trunk@5512 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-26 08:42:17 +00:00
HD Moore 8c844f96b0 Fixes #60. Adds a new block_command() method to the console, which allows a UI to disable certain commands at runtime.
git-svn-id: file:///home/svn/framework3/trunk@5109 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-22 20:20:10 +00:00
HD Moore f832df480a Fixes #8. Resets the tab completion routine after session interaction.
git-svn-id: file:///home/svn/framework3/trunk@5108 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-22 19:53:39 +00:00
Matt Miller 67e39c15a1 display output on a different line from the prompt
git-svn-id: file:///home/svn/framework3/trunk@4643 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-04 02:38:15 +00:00
HD Moore 80c4bcd5ab Session detach support, closer to clean hand-off between session -d / session -i. Make autovnc look for both vncviewer and vncviewer.exe
git-svn-id: file:///home/svn/framework3/trunk@4424 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 04:25:46 +00:00
HD Moore 0b42f16d1f Add a comment about why color support was disabled for now
git-svn-id: file:///home/svn/framework3/trunk@4397 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-16 05:22:36 +00:00
Matt Miller 93da259db2 additions to the user guide, fix data store to not import globally defined values, added ability to flush datastores
git-svn-id: file:///home/svn/framework3/trunk@4387 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-15 08:02:47 +00:00
HD Moore 4d205cdcd8 Consistency fixes for the print_* routines
git-svn-id: file:///home/svn/framework3/trunk@4358 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 19:40:33 +00:00
HD Moore c46c1c2d04 Working meterpreter from inside msfweb
git-svn-id: file:///home/svn/framework3/trunk@4357 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 19:33:01 +00:00
Matt Miller 4cd2679f2f get rid for prompt and use output for displaying the prompt
git-svn-id: file:///home/svn/framework3/trunk@4352 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-11 06:59:22 +00:00
HD Moore 4bd5580784 Updates for the web interface
git-svn-id: file:///home/svn/framework3/trunk@4287 4d416f70-5f16-0410-b530-b9f4589650da
2007-01-19 08:46:06 +00:00
HD Moore fa91b4b5dd Bug fixes to rescue statements (was catching relative exception class, not the main exception class)
git-svn-id: file:///home/svn/framework3/trunk@4086 4d416f70-5f16-0410-b530-b9f4589650da
2006-10-29 17:41:19 +00:00
Matt Miller 3e69f46a3a added support for manual ranking
git-svn-id: file:///home/svn/framework3/trunk@3866 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-12 05:34:58 +00:00
Matt Miller a3f620b224 buffered input
git-svn-id: file:///home/svn/framework3/trunk@3861 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-10 02:21:12 +00:00
Matt Miller 1583f4e276 fix to not attempt to output text if there is no output handle
git-svn-id: file:///home/svn/framework3/trunk@3848 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-29 00:48:33 +00:00
HD Moore 25c08bb206 Bug fixes, list of known bugs, final prep for beta-1
git-svn-id: file:///home/svn/framework3/trunk@3803 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-02 06:30:36 +00:00
HD Moore cac9561b61 Bug fix for previous workaround
git-svn-id: file:///home/svn/framework3/trunk@3799 4d416f70-5f16-0410-b530-b9f4589650da
2006-08-01 01:50:26 +00:00
HD Moore 4ef104e869 Readline fix
git-svn-id: file:///home/svn/framework3/trunk@3798 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-31 20:00:20 +00:00
bmc f8897ac164 stdio doesn't support readline
git-svn-id: file:///home/svn/framework3/trunk@3797 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-31 19:59:29 +00:00
HD Moore a2592959c3 Readline mode disabledby defualt for interactive sessios
Fixed an issue with exploit.rb directly running a session command after the session command had been renamed



git-svn-id: file:///home/svn/framework3/trunk@3774 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-29 23:01:38 +00:00
HD Moore c081d7b2b1 Fixed continuaion across trap error, minor tweaks under readline
git-svn-id: file:///home/svn/framework3/trunk@3772 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-29 20:03:05 +00:00
HD Moore 6677b4ba71 Minor bug fixes to remove extra 'p' calls
Rewrite of stdio/readline to support Windows




git-svn-id: file:///home/svn/framework3/trunk@3766 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-27 22:28:19 +00:00
HD Moore 9b9bd2b7a7 Fixed bugs in io/stream:
1) no longer modify the buffer argument in send
 2) no longer duplicate the buffer argument in write

Added some basic telnet control character detection to socket:
 1) ^D closes a connection
 2) ^C closes a connection
 3) ^Z just prints it out

Problems with control character handling in msfd:
 1) The current handlers are signal based, could be more than one msfd client
 2) Calling ui._suspend isn't possible from the Input driver class (no context now)


git-svn-id: file:///home/svn/incoming/trunk@3462 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-28 07:12:35 +00:00
bmc 98dcf5b539 * s/\t/ / doesn't always work...
git-svn-id: file:///home/svn/incoming/trunk@3461 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-28 01:23:46 +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 bdfd2c5152 Recon modules and the recon event subsystem have been temporarily removed.
The 'auxiliary' system is designed to replace it and recon features will
slowly be moved back into the framework


git-svn-id: file:///home/svn/incoming/trunk@3438 4d416f70-5f16-0410-b530-b9f4589650da
2006-01-24 03:59:44 +00:00
HD Moore 93c3178732 No so worky
git-svn-id: file:///home/svn/incoming/trunk@3257 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-27 03:07:46 +00:00
HD Moore 412629e5c3 Stuff.. more changes to come
git-svn-id: file:///home/svn/incoming/trunk@3253 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-25 22:47:38 +00:00
Matt Miller b6a8514afe fix prompt display for stdio mode
git-svn-id: file:///home/svn/incoming/trunk@3251 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-21 04:32:06 +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 ffc30f497c nasm shell
git-svn-id: file:///home/svn/incoming/trunk@3193 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-08 15:37:10 +00:00
Matt Miller d50ddd5edb fix for suspending meterp
git-svn-id: file:///home/svn/incoming/trunk@3185 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-07 03:40:09 +00:00
Matt Miller 1abeda6abd meterp/msfconsole irb mode
git-svn-id: file:///home/svn/incoming/trunk@3180 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-06 04:39:14 +00:00
Matt Miller 1c75f4e8ff support var=val passing
git-svn-id: file:///home/svn/incoming/trunk@3153 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-28 22:06:28 +00:00
Matt Miller 5bb104c993 msfd
git-svn-id: file:///home/svn/incoming/trunk@3146 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-28 16:36:06 +00:00
HD Moore cd8b9849ce Many fixes/updates/new ftp modules
Fixed the tab completion hackery - moved from driver to dispatcher_shell


git-svn-id: file:///home/svn/incoming/trunk@3094 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-25 04:11:22 +00:00
HD Moore cad67cec49 Tab completion changes, start of completion routines
git-svn-id: file:///home/svn/incoming/trunk@3061 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-23 22:12:49 +00:00
Matt Miller 2f05b6959f updated sample to support console command dispatcher registration
git-svn-id: file:///home/svn/incoming/trunk@3059 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-23 14:34:11 +00:00
Matt Miller 95f8210853 major doc update
git-svn-id: file:///home/svn/incoming/trunk@3029 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-15 05:22:13 +00:00
Matt Miller dc33921b98 bugs bugs, messing with win32
git-svn-id: file:///home/svn/incoming/trunk@3016 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-04 00:55:46 +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
Matt Miller 6a5870ddcd updated comments to be more uniformed in class definition
git-svn-id: file:///home/svn/incoming/trunk@3004 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-02 16:49:45 +00:00
Matt Miller 15ce3c424b added is_usable check
git-svn-id: file:///home/svn/incoming/trunk@3003 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-02 14:18:50 +00:00
Matt Miller fc899bea57 boo
git-svn-id: file:///home/svn/incoming/trunk@2969 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-17 00:25:07 +00:00
Matt Miller db40a55547 session logging support
git-svn-id: file:///home/svn/incoming/trunk@2938 4d416f70-5f16-0410-b530-b9f4589650da
2005-10-02 03:21:26 +00:00
Matt Miller 632a97823f moved some code around for interactive channels, still not functional yet, boohoo
git-svn-id: file:///home/svn/incoming/trunk@2797 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-19 04:21:15 +00:00
Matt Miller 9a420ac750 meterp fs wrapper action rockin the house
git-svn-id: file:///home/svn/incoming/trunk@2793 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 07:46:54 +00:00
Matt Miller 4679586c49 more meterp action
git-svn-id: file:///home/svn/incoming/trunk@2791 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 05:13:21 +00:00
Matt Miller 7f8db62b9c workin on integrating meterp client
git-svn-id: file:///home/svn/incoming/trunk@2790 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 04:07:56 +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
Matt Miller 645725a3b5 config file parsing, datastore persistence, shared data stores, save in the ui
git-svn-id: file:///home/svn/incoming/trunk@2761 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-15 22:30:04 +00:00
Matt Miller df32affc18 fixed stuff up
git-svn-id: file:///home/svn/incoming/trunk@2758 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-14 22:58:09 +00:00
Matt Miller 2ac47328e0 restructured things to encourage better code re-use
git-svn-id: file:///home/svn/incoming/trunk@2757 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-14 22:45:10 +00:00
Matt Miller d62566a68f lots of changes, making the simple wrapper better, lots of improvements
git-svn-id: file:///home/svn/incoming/trunk@2750 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-14 06:34:58 +00:00
Matt Miller 2c6014fbb3 pretty output
git-svn-id: file:///home/svn/incoming/trunk@2705 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 08:33:29 +00:00
Spoon M 7bbae355d6 mass require moving of /lib
git-svn-id: file:///home/svn/incoming/trunk@2690 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-09 21:18:49 +00:00
Matt Miller 832a97d3e3 making things better
git-svn-id: file:///home/svn/incoming/trunk@2669 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-07 23:11:03 +00:00
Matt Miller d8ba7df38a table unit test
git-svn-id: file:///home/svn/incoming/trunk@2665 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-07 14:20:54 +00:00
Matt Miller 02361dde24 cool stuff for cool kids
git-svn-id: file:///home/svn/incoming/trunk@2664 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-07 06:14:58 +00:00
Matt Miller 657b434ea5 lame ColPrint type thing in ruby
git-svn-id: file:///home/svn/incoming/trunk@2663 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-07 06:01:47 +00:00