Commit Graph

190 Commits (acf45118a233e0ee40d3baec3cbcc237c24e2555)

Author SHA1 Message Date
James Lee 15cee53b41 move tab completion setup out of init_ui. fixes #1180
git-svn-id: file:///home/svn/framework3/trunk@9332 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 23:47:49 +00:00
HD Moore dfa7fb7d0b Move away from Kernel.select in exchange for IO.select, solves some issues with windows compatibility
git-svn-id: file:///home/svn/framework3/trunk@9330 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 20:42:17 +00:00
James Lee 928389e8b0 update comments to explain the reason for not running init_ui
git-svn-id: file:///home/svn/framework3/trunk@9114 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-20 07:01:46 +00:00
James Lee 4243ce5bf4 preliminary fix for the meterpreter-breaks-tab-completion bug pending some testing, see #1180
git-svn-id: file:///home/svn/framework3/trunk@9113 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-20 03:59:27 +00:00
HD Moore af10ee5e57 Handle timeout errors more gracefully
git-svn-id: file:///home/svn/framework3/trunk@9023 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-06 02:05:50 +00:00
HD Moore c6c956ab46 Small patch to enable a new stager
git-svn-id: file:///home/svn/framework3/trunk@8984 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 05:21:15 +00:00
HD Moore 7e86cd7b35 Try not to break the tree this time
git-svn-id: file:///home/svn/framework3/trunk@8928 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-26 01:21:01 +00:00
HD Moore ee2e796a19 Store the last generated error
git-svn-id: file:///home/svn/framework3/trunk@8927 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-26 01:18:10 +00:00
Joshua Drake f7f0f03a4a handle the user hitting ^D while interacting properly
git-svn-id: file:///home/svn/framework3/trunk@8911 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 01:38:47 +00:00
James Lee 1265cccde7 override the command shell session interaction to use shell_read and shell_write instead of operating on rstream directly
git-svn-id: file:///home/svn/framework3/trunk@8886 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-23 00:33:18 +00:00
HD Moore bb0db3cdf6 Closes command and meterpreter sessions in a much more consistent way
git-svn-id: file:///home/svn/framework3/trunk@8865 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-21 04:24:27 +00:00
HD Moore 37d1965b24 allow the configuration directory to be overloaded
git-svn-id: file:///home/svn/framework3/trunk@8843 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-17 18:25:53 +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 38fe469ce8 deal with via_exploit being fullname instead of refname by creating it through framework.modules instead of framework.exploits. fixes #1165
git-svn-id: file:///home/svn/framework3/trunk@8836 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 19:17:21 +00:00
Joshua Drake 32fb7653ca only set .info if its nil or empty
git-svn-id: file:///home/svn/framework3/trunk@8831 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 15:20:48 +00:00
Joshua Drake f9267498e3 save initial command shell session output into session.info
git-svn-id: file:///home/svn/framework3/trunk@8829 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-16 04:50:47 +00:00
Joshua Drake ac06e2d667 only copy user_input and user_output if they are non-nil
git-svn-id: file:///home/svn/framework3/trunk@8806 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 21:47:27 +00:00
HD Moore 1b1ec3b5dc Store the job_id for auxiliary modules running as a background job
git-svn-id: file:///home/svn/framework3/trunk@8803 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 02:39:02 +00:00
James Lee 646044f631 move session_output events to the session where they belong (instead of in rpc). add a timeout arg to shell_read
git-svn-id: file:///home/svn/framework3/trunk@8797 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 20:07:06 +00:00
HD Moore ac0e6515ab Remove the PID from session.info, it doesn't add much value:
git-svn-id: file:///home/svn/framework3/trunk@8784 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 14:21:46 +00:00
HD Moore 286bb09a56 Add a timeout wrapper, remove debug statement
git-svn-id: file:///home/svn/framework3/trunk@8773 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-10 22:06:52 +00:00
HD Moore bfab49b9e9 Change the sessions -l output to show info and type vs description, automatically grab the user/hostname on startup (disabled with set AutoSystemInfo false)
git-svn-id: file:///home/svn/framework3/trunk@8772 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-10 22:02:27 +00:00
HD Moore 4bfd1a1f1e Allow run_simple to inherit input/output from itself when opts are nil
git-svn-id: file:///home/svn/framework3/trunk@8739 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-08 04:47:40 +00:00
Joshua Drake 7a37934a01 process autorun scripts for telnet_login and ssh_login
1. create session.process_autoruns in Msf::Sessions::CommandShell
2. call process_autoruns from within the handler on_session code
4. set user_input and user_output in sessions base set_from_exploit method
5. remove on_session from Msf::Sessions::CommandShellOptions
6. include CommandShellOptions into telnet_login and ssh_login
7. call sess.process_autoruns from telnet_login and ssh_login
8. celebrate (while crossing fingers of course)!

git-svn-id: file:///home/svn/framework3/trunk@8692 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-02 18:07:50 +00:00
Joshua Drake 5ab32ab792 shell_read_until_token should work for any requested idx now
git-svn-id: file:///home/svn/framework3/trunk@8665 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 19:07:35 +00:00
Joshua Drake eb8e8d22b5 add wanted_idx parameter to shell_read_until_token, fixes #980
git-svn-id: file:///home/svn/framework3/trunk@8658 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 18:37:07 +00:00
Joshua Drake 1011d31613 buf only has one f
git-svn-id: file:///home/svn/framework3/trunk@8629 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 23:00:05 +00:00
Joshua Drake 3660cae90e add tokenized shell_command functions for CommandShell sesssions
git-svn-id: file:///home/svn/framework3/trunk@8620 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 20:56:31 +00:00
James Lee 999feb879f setup the input/output handles correctly for meterpreter sessions so we can get the output from scripts
git-svn-id: file:///home/svn/framework3/trunk@8618 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 16:46:47 +00:00
Joshua Drake b391abd32d adds scripting for command shell sessions
1. InitialAutoRunScript and AutoRunScript vars work
2. scripts/shells was created to hold them
3. *_shell methods were renamed shell_*
4. added "shell_command" method to command shell sessions
5. converted all uses of *_shell to shell_*
6. all payloads that produce command shell sessions include Msf::Sessions::CommandShellOptions



git-svn-id: file:///home/svn/framework3/trunk@8615 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 01:19:59 +00:00
HD Moore dd9c441546 Set the user input/output drivers on start
git-svn-id: file:///home/svn/framework3/trunk@8613 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 20:56:44 +00:00
Joshua Drake b98868e32f check for script before trying to run it for all sessions
git-svn-id: file:///home/svn/framework3/trunk@8612 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 20:54:18 +00:00
HD Moore a71e8d2af0 Fix up meterpreter script changes
git-svn-id: file:///home/svn/framework3/trunk@8611 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 20:16:45 +00:00
HD Moore d148c95c84 The ssh login code can now create sessions
git-svn-id: file:///home/svn/framework3/trunk@8598 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 07:12:54 +00:00
Joshua Drake f8ca490b98 move meterpreter on_session functionality into a mixin
git-svn-id: file:///home/svn/framework3/trunk@8586 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 21:05:08 +00:00
Stephen Fewer 6335fde3e1 Commit the Ruby side for the UDP socket pivoting. Change the TCP client channel so the respective StreamAbstraction is responsible for monitoring its own rsock.
git-svn-id: file:///home/svn/framework3/trunk@8431 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-09 16:45:46 +00:00
Stephen Fewer 7b34b46b68 Commit the ruby side for the meterpreter migration overhaul.
git-svn-id: file:///home/svn/framework3/trunk@8199 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 19:47:36 +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
James Lee a9b1462e9d add a callback for session commands. fixes 618
git-svn-id: file:///home/svn/framework3/trunk@8075 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-06 05:06:12 +00:00
James Lee 86f1616d24 less verbose inspect method for modules
git-svn-id: file:///home/svn/framework3/trunk@7951 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 01:46:20 +00:00
James Lee 4f92d9f431 Revamp the event system and add some ui hooks. Sessions are still ghetto -- we get interact events (in a lame way) but no input or output events yet. see 619
git-svn-id: file:///home/svn/framework3/trunk@7947 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-22 18:52:48 +00:00
HD Moore 8df719e7a8 See #624. Adds the module ranking to all text-base displays, this may be enough to close the ticket
git-svn-id: file:///home/svn/framework3/trunk@7725 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-06 14:35:16 +00:00
James Lee 626d085dd4 expand ryan linn's idea of more verbose job info to include start time, see #586
git-svn-id: file:///home/svn/framework3/trunk@7668 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-02 03:32:48 +00:00
James Lee 1b4aa0380b read in a history file. beginnings of persistent history. see #523
git-svn-id: file:///home/svn/framework3/trunk@7620 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 01:01:27 +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
James Lee e296ec92ea more uninitalized var warnings
git-svn-id: file:///home/svn/framework3/trunk@7513 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-14 06:21:22 +00:00
James Lee b762ca5ece fix '@initialized not initialized' warning
git-svn-id: file:///home/svn/framework3/trunk@7489 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 17:31:57 +00:00
HD Moore 8c65a0f48c Handle interrupts without showing a backtrace
git-svn-id: file:///home/svn/framework3/trunk@7473 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 05:56:52 +00:00
James Lee b64d12c846 sort jobs numerically
git-svn-id: file:///home/svn/framework3/trunk@7451 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 17:16:49 +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