Commit Graph

2170 Commits (76b14e5db7b4ca016e65d8a5247eb18fe42d5711)

Author SHA1 Message Date
HD Moore 9ae8422c05 Fix info field
git-svn-id: file:///home/svn/framework3/trunk@8817 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-14 16:09:46 +00:00
HD Moore 5e26eb9498 Adds name and info to the loot table:
git-svn-id: file:///home/svn/framework3/trunk@8816 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-14 15:38:52 +00:00
HD Moore 8464a36bf5 Bump pool to 256; may still be driver limited. See #976.
git-svn-id: file:///home/svn/framework3/trunk@8814 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-14 03:54:54 +00:00
Joshua Drake ec325f9ab1 adjust help text, see #394
git-svn-id: file:///home/svn/framework3/trunk@8809 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 23:06:33 +00:00
Joshua Drake a811ad0c32 clean up, add comments, and fix bug in command dispatcher, fixes #394
git-svn-id: file:///home/svn/framework3/trunk@8808 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 22:59:19 +00:00
Joshua Drake 7b41d08387 remove dupe "-s" option from help, add "-u" option to upgrade command shell session to meterpreter
git-svn-id: file:///home/svn/framework3/trunk@8807 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 21:51:55 +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
Joshua Drake b6851b8ee4 modify cmd stager to take a raw payload string instead of a payload instance
git-svn-id: file:///home/svn/framework3/trunk@8805 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 21:47:01 +00:00
HD Moore 9288f34fbf Add a results column
git-svn-id: file:///home/svn/framework3/trunk@8804 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-12 15:58:02 +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
HD Moore c5cbacd194 Handle long responses better
git-svn-id: file:///home/svn/framework3/trunk@8799 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 22:21:41 +00:00
HD Moore c3d17ab48b Add hooks for input/output/error
git-svn-id: file:///home/svn/framework3/trunk@8798 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 21:57:04 +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 7f1e5fd475 Base64 encode the console output as well
git-svn-id: file:///home/svn/framework3/trunk@8796 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 19:49:39 +00:00
James Lee dbe4d05875 typo fix. how did this ever work?
git-svn-id: file:///home/svn/framework3/trunk@8795 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 19:41:59 +00:00
James Lee a20b74536c add an events accessor
git-svn-id: file:///home/svn/framework3/trunk@8794 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 19:38:19 +00:00
James Lee 89e378dd4c break output into 1024-byte chunks so it fits in the database
git-svn-id: file:///home/svn/framework3/trunk@8793 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 19:18:39 +00:00
HD Moore 5957dd5393 Add tasks
git-svn-id: file:///home/svn/framework3/trunk@8791 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 18:42:21 +00:00
James Lee 0e537a17bb fix some pastographical errors
git-svn-id: file:///home/svn/framework3/trunk@8790 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 17:48:59 +00:00
James Lee 09c1fdd13d store full name (which includes module type) instead of just the refname
git-svn-id: file:///home/svn/framework3/trunk@8785 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 14:33:48 +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 4c22afed31 Fix other occurrences of on_session_close not taking a second parameter. See #1075
git-svn-id: file:///home/svn/framework3/trunk@8782 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 13:54:10 +00:00
HD Moore 3d601c0be9 Add a new table
git-svn-id: file:///home/svn/framework3/trunk@8778 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 03:02:13 +00:00
James Lee dea0ec37f0 add events accessor to workspace
git-svn-id: file:///home/svn/framework3/trunk@8777 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 00:57:23 +00:00
HD Moore dcfdb95e5f *Backwards Compatibility Broken* - The session XMLRPC object now requires data for read/write to be encoded using Base64, this solves a number of issues with the builtin XMLRPC library with regards to binary data encoding. The response from read() now contains an 'encoding' element with the value 'base64', in order to differentiate from older versions.
git-svn-id: file:///home/svn/framework3/trunk@8776 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 00:55:21 +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 91404f9c8f Report critical/seen properly
git-svn-id: file:///home/svn/framework3/trunk@8768 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-10 18:00:19 +00:00
HD Moore aaea62bb92 Report the correct local/peer names for the session information. Fix a return value check
git-svn-id: file:///home/svn/framework3/trunk@8765 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-10 07:13:18 +00:00
HD Moore 6bd2a954cf Lots of small changes, the big one is moving from sysread -> readpartial in the stream base class
git-svn-id: file:///home/svn/framework3/trunk@8764 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-10 06:43:46 +00:00
HD Moore e05921b297 Report the workspace object not the name
git-svn-id: file:///home/svn/framework3/trunk@8763 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-10 06:16:57 +00:00
HD Moore 33c60067c0 Sanity check reported host addresses
git-svn-id: file:///home/svn/framework3/trunk@8760 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-10 05:45:40 +00:00
HD Moore b87f0ac796 Fix the reaper
git-svn-id: file:///home/svn/framework3/trunk@8753 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-08 23:32:57 +00:00
HD Moore 54755d856c Handle cases where the peer has no : (distcc exploit)
git-svn-id: file:///home/svn/framework3/trunk@8751 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-08 23:03:49 +00:00
HD Moore 69f50eea7c Kill off any session with eof on the socket
git-svn-id: file:///home/svn/framework3/trunk@8750 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-08 22:58:43 +00:00
HD Moore 1c1fe9c20f Add a method for syncing the database (waiting on all pending writes)
git-svn-id: file:///home/svn/framework3/trunk@8743 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-08 14:17:34 +00:00
HD Moore d8c900aabb Report the workspace based on the session
git-svn-id: file:///home/svn/framework3/trunk@8741 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-08 05:31:21 +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 607752f141 dont try to run cmds on meterpreter sessions with a "sys" member, see #803
git-svn-id: file:///home/svn/framework3/trunk@8732 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-06 04:58:38 +00:00
Joshua Drake 28f4eb2fd9 handle failed logins - fixes #1014
git-svn-id: file:///home/svn/framework3/trunk@8728 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-05 17:05:12 +00:00
Joshua Drake 2f3b54efe3 use happy color printer functions for cmd_check
git-svn-id: file:///home/svn/framework3/trunk@8727 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-05 17:03:59 +00:00
James Lee 9fbf2c0c6e add platform aliases for newer versions of windows.
git-svn-id: file:///home/svn/framework3/trunk@8724 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-05 08:26:51 +00:00
Tod Beardsley 3d1f773f18 Reimplementing DB2's auth checker to use the same methods as the other auth_brute modules.
git-svn-id: file:///home/svn/framework3/trunk@8722 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-05 00:44:39 +00:00
Joshua Drake 73da75a931 big update to cmd stager
1. returns array of commands instead of big blob of lines
2. combine lines together when possible (to reduce # of commands to execute)
3. add cmd stager usage in mssql_payload
4. remove extraneous stuff here and there

git-svn-id: file:///home/svn/framework3/trunk@8721 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-05 00:29:44 +00:00
Joshua Drake d8818fc268 execute xp_cmdshell from master explicitly
git-svn-id: file:///home/svn/framework3/trunk@8720 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 23:55:04 +00:00
Tod Beardsley a5e187bd69 Add the ability to slow down brute force sessions.
git-svn-id: file:///home/svn/framework3/trunk@8719 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 23:29:26 +00:00
Joshua Drake 8a2382ed1a don't wait for shell.run to finish
git-svn-id: file:///home/svn/framework3/trunk@8717 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 22:32:46 +00:00
Joshua Drake 1629bf7bf0 move http_send_cmd into cmdweb test exploit
git-svn-id: file:///home/svn/framework3/trunk@8716 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 21:00:58 +00:00
James Lee c2612548c5 fix get_host, was breaking browser_autopwn, see #976
git-svn-id: file:///home/svn/framework3/trunk@8710 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 07:58:47 +00:00
James Lee 602395ead0 don't set the language if we don't have one
git-svn-id: file:///home/svn/framework3/trunk@8709 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 07:38:52 +00:00
James Lee 37159d6b41 move this up so all database drivers have a bigger pool, see #976
git-svn-id: file:///home/svn/framework3/trunk@8706 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 07:10:20 +00:00
James Lee 7392de4d3d don't use undefined variables.
git-svn-id: file:///home/svn/framework3/trunk@8700 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 19:50:22 +00:00
James Lee 7d348c3593 honor the SSL option in HttpServer, fixes #1001
git-svn-id: file:///home/svn/framework3/trunk@8699 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 18:47:04 +00:00
Joshua Drake 9148068acc pass unlink_now flag to close for Tempfile instances
git-svn-id: file:///home/svn/framework3/trunk@8697 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 04:58:12 +00:00
James Lee 467a7a5f3e merge mubix's patch to allow importing a simple list of ip addresses from a file, closes #999
git-svn-id: file:///home/svn/framework3/trunk@8695 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 00:34:16 +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
James Lee 76745eed81 bump the connection pool up to 30 for sqlite; see #976. Not closing the bug, since I don't know how this will work in the long term
git-svn-id: file:///home/svn/framework3/trunk@8689 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-02 14:27:36 +00:00
Joshua Drake e7a9391a76 minor tweaks, no functional changes
git-svn-id: file:///home/svn/framework3/trunk@8684 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-02 02:26:08 +00:00
HD Moore e4ec13eec2 Store the path in the path
git-svn-id: file:///home/svn/framework3/trunk@8673 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 22:13:20 +00:00
James Lee cded6cc59d log all output from sessions when reading from rpc
git-svn-id: file:///home/svn/framework3/trunk@8672 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 21:55:30 +00:00
HD Moore df415fd636 Fix workspace.loots
git-svn-id: file:///home/svn/framework3/trunk@8671 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 21:48:16 +00:00
HD Moore 1fff5f447f Add loot content-type
git-svn-id: file:///home/svn/framework3/trunk@8667 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 19:33:49 +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
HD Moore 304a238d3e Add pop3/imap4 scanners
git-svn-id: file:///home/svn/framework3/trunk@8664 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 19:06:26 +00:00
James Lee 5a89952606 bah, typo
git-svn-id: file:///home/svn/framework3/trunk@8663 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 18:52:22 +00:00
HD Moore 2cbf64b85a Fix up the stored banner for SMTP
git-svn-id: file:///home/svn/framework3/trunk@8661 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 18:47:48 +00:00
James Lee be0fc489b1 clean up
git-svn-id: file:///home/svn/framework3/trunk@8660 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 18:45:24 +00:00
James Lee 99f4507405 store workspace in the correct place for module_run events
git-svn-id: file:///home/svn/framework3/trunk@8659 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 18:38:05 +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
HD Moore 34489f9a61 Pass the workspace into the importer properly
git-svn-id: file:///home/svn/framework3/trunk@8654 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 13:40:32 +00:00
Stephen Fewer 300cede801 Fix for #291, Meterpreter over PassiveX now working again :)
git-svn-id: file:///home/svn/framework3/trunk@8653 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 05:13:58 +00:00
James Lee 832d0bcbfa add exploit datastore to sessions so we can tell exactly how the session was created
git-svn-id: file:///home/svn/framework3/trunk@8651 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 01:09:23 +00:00
HD Moore 8ebc16bb4a Add the info field to the session object
git-svn-id: file:///home/svn/framework3/trunk@8649 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-25 23:20:33 +00:00
James Lee 585842e34e blah, missed a line
git-svn-id: file:///home/svn/framework3/trunk@8644 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-25 22:27:18 +00:00
James Lee 76dd732db4 minimize the ghettoness
git-svn-id: file:///home/svn/framework3/trunk@8640 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-25 17:53:27 +00:00
HD Moore 51e5dcfed2 Skip resource file processing when loaded via this interface
git-svn-id: file:///home/svn/framework3/trunk@8638 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-25 16:29:48 +00:00
HD Moore b2e40216b9 Fix up the RPC calls for the console
git-svn-id: file:///home/svn/framework3/trunk@8637 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-25 14:14:48 +00:00
HD Moore dfe2dcd9eb Add console interaction to the RPC interface
git-svn-id: file:///home/svn/framework3/trunk@8635 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-25 06:26:53 +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
James Lee ebfaf77374 mark hosts as alive when adding vulns
git-svn-id: file:///home/svn/framework3/trunk@8628 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 22:57:38 +00:00
James Lee 27cda778a8 mark hosts as alive when adding notes or services
git-svn-id: file:///home/svn/framework3/trunk@8627 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 22:54:16 +00:00
James Lee f5446b5d4f add workspace to module run events
git-svn-id: file:///home/svn/framework3/trunk@8626 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 21:46:18 +00:00
HD Moore 6e2e7ed55e Pass the cached input/output into the real payload
git-svn-id: file:///home/svn/framework3/trunk@8625 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 21:32:56 +00:00
James Lee 6ab68f5752 save the session's workspace in events
git-svn-id: file:///home/svn/framework3/trunk@8624 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 21:31:35 +00:00
HD Moore 7eed9f3fed Handle user in/out passthrough better
git-svn-id: file:///home/svn/framework3/trunk@8623 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 21:25:35 +00:00
HD Moore 1133f8f05c Pass through user_input/user_output
git-svn-id: file:///home/svn/framework3/trunk@8622 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 21:10:32 +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
James Lee 9f9d97d735 make sure the sys extension is available before using it. this appears to fix #803
git-svn-id: file:///home/svn/framework3/trunk@8617 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 06:45:12 +00:00
Joshua Drake cc4b13a0a0 check for empty args to sessions -c
git-svn-id: file:///home/svn/framework3/trunk@8616 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 04:46:59 +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
James Lee f0d27f7f9d buffer io on meterpreter commands so we can get the output
git-svn-id: file:///home/svn/framework3/trunk@8614 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 22:39:34 +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 e33c1456f1 Add report_loot to the reporting mixin
git-svn-id: file:///home/svn/framework3/trunk@8610 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 20:09:46 +00:00
James Lee dd915415c3 add initial support for interacting with meterpreter through xmlrpc
git-svn-id: file:///home/svn/framework3/trunk@8606 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 18:07:07 +00:00
Tod Beardsley 25de6844b8 Adding OpenSoliaris Postgres fingerprints.
git-svn-id: file:///home/svn/framework3/trunk@8599 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 14:09:21 +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
James Lee 4ad6c24a95 look for dead sesions with a reaper thread instead of on other session events, add Session#alive accessor for all session types; still need to figure out when a shell session is dead and set it accordingly. Add a reason argument to on_session_close to distinguish between killed sessions and dead sessions
git-svn-id: file:///home/svn/framework3/trunk@8596 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 05:59:30 +00:00
HD Moore 749849751d Better error message for xmlrpc
git-svn-id: file:///home/svn/framework3/trunk@8595 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 03:34:09 +00:00
HD Moore 80f1f48b2d Merge in loot and user, fix up telnet to handle eof better
git-svn-id: file:///home/svn/framework3/trunk@8594 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 23:45:43 +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
HD Moore 29cd1f1b4c Fix up report_event
git-svn-id: file:///home/svn/framework3/trunk@8585 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 19:31:21 +00:00
HD Moore 6b50ae0830 Prevent the lack of db from crashing
git-svn-id: file:///home/svn/framework3/trunk@8584 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 19:04:15 +00:00
HD Moore 479f2939fc Track the target host/workspace through the entire tree, expose to RPC, and use this telnet_login
git-svn-id: file:///home/svn/framework3/trunk@8583 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 17:54:44 +00:00
HD Moore 2fc9b1d576 Make sure nil is not reported in the session fields (breaks XMLRPC).
git-svn-id: file:///home/svn/framework3/trunk@8579 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 17:15:36 +00:00
Joshua Drake efd1146d10 adjust to_jsp_war to work with jboss (tested OK on tomcat too)
git-svn-id: file:///home/svn/framework3/trunk@8573 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-21 01:40:52 +00:00
HD Moore 8296dc85b3 Cache the local interface/netmask
git-svn-id: file:///home/svn/framework3/trunk@8571 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-20 18:52:13 +00:00
HD Moore 551e7d57ba Speed up packet injection
git-svn-id: file:///home/svn/framework3/trunk@8570 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-20 18:31:46 +00:00
HD Moore 445676b932 Merge in the current workspace name
git-svn-id: file:///home/svn/framework3/trunk@8567 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-20 05:50:38 +00:00
HD Moore 0a8696436e Fix up the telnet login code to handle varied responses better
git-svn-id: file:///home/svn/framework3/trunk@8565 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-20 05:49:40 +00:00
natron 474228a132 Woops, forgot to push the updated mixin.
git-svn-id: file:///home/svn/framework3/trunk@8560 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-19 06:06:30 +00:00
Mike Smith e59082f6b5 Added "created_at" and "updated_at" timestamps all primary tables (fixes #838)
git-svn-id: file:///home/svn/framework3/trunk@8555 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-18 21:57:01 +00:00
Joshua Drake 0071a5532b allow caller to specify jsp name via :jsp_name opt
git-svn-id: file:///home/svn/framework3/trunk@8549 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-18 18:03:22 +00:00
HD Moore 4c4c747caf Update all db methods to have a workspace parameter, default to the db.workspace where possible, updated the command dispatchers.
git-svn-id: file:///home/svn/framework3/trunk@8546 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-18 06:40:38 +00:00
Tod Beardsley 4197f00701 Moves @credentials_tried and @credentials_good into auth_brute proper, though modules still
need to handle them themselves... which telnet and ssh both do now.



git-svn-id: file:///home/svn/framework3/trunk@8542 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-17 21:55:02 +00:00
Joshua Drake 089a522df0 various fixes
1. allow passing payload to generate_cmdstager (needed for html server sploits)
2. cleanup whitespace here and there
3. removed rendundant pattern match
4. removed use of sleep in favor of select idiom


git-svn-id: file:///home/svn/framework3/trunk@8539 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-17 20:04:54 +00:00
HD Moore 9f1009b401 Import the service and OS fingerprints from NeXpose
git-svn-id: file:///home/svn/framework3/trunk@8531 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-17 06:01:53 +00:00
Joshua Drake 0d526a26af add cmdstager to mixins, oops
git-svn-id: file:///home/svn/framework3/trunk@8526 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 20:26:31 +00:00
Joshua Drake 4800d6841c commit cmd stager stuff from bannedit
git-svn-id: file:///home/svn/framework3/trunk@8518 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 16:38:19 +00:00
HD Moore 2149e0a974 Returning from the parser doesn't work so well, just skip reporting instead
git-svn-id: file:///home/svn/framework3/trunk@8509 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-15 22:59:55 +00:00
Joshua Drake 85cd572df1 minor cleanups
git-svn-id: file:///home/svn/framework3/trunk@8506 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-15 22:38:25 +00:00
HD Moore 8c3ee77f3b Skip processing of dead hosts. Sometimes the host is already found using another method and nmap will mark the live host as dead again
git-svn-id: file:///home/svn/framework3/trunk@8501 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-15 01:34:04 +00:00
HD Moore a2f9f1bb7a Default the OS to the 100% match string
git-svn-id: file:///home/svn/framework3/trunk@8500 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-15 01:20:42 +00:00
HD Moore cdaebc2931 Big change to how report_note() works, it now accepts an :update parameter that defines whether the data is unique for the host/ntype (:unique), unique for the host/ntype/data (:unique_data), or should be inserted no matter what (:insert)
git-svn-id: file:///home/svn/framework3/trunk@8495 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 19:34:22 +00:00
HD Moore 2539a6fc09 Updated nmap parsing, store notes for last boot and os matches
git-svn-id: file:///home/svn/framework3/trunk@8494 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 19:07:15 +00:00
HD Moore 2460037fdd More nmap import foo
git-svn-id: file:///home/svn/framework3/trunk@8493 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 18:55:49 +00:00
HD Moore c47e4db74d Parse the OS properly
git-svn-id: file:///home/svn/framework3/trunk@8492 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 18:40:27 +00:00
HD Moore bfa3ae28cb Import OS and hostname information
git-svn-id: file:///home/svn/framework3/trunk@8491 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 18:32:37 +00:00
HD Moore 25f9339c7c Additional operating systems, changing the case of Mac OS X
git-svn-id: file:///home/svn/framework3/trunk@8487 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 15:04:39 +00:00
HD Moore f3edce86a1 Store module_run events as a hash
git-svn-id: file:///home/svn/framework3/trunk@8465 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-12 17:37:20 +00:00
Joshua Drake 070d6e20cd fix bug from natron
"show info" was displaying the default target as index 0 when it was really 4

git-svn-id: file:///home/svn/framework3/trunk@8461 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-12 02:11:52 +00:00
HD Moore 993ba44fcf SMB updates, better reporting of SSL status for HTTP
git-svn-id: file:///home/svn/framework3/trunk@8459 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 22:37:00 +00:00
HD Moore 9b4df1cf42 Add the datastore.clear method
git-svn-id: file:///home/svn/framework3/trunk@8450 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 05:14:36 +00:00
Joshua Drake cbba235ba5 change Msf::Util::EXE.to_jsp_war to use Rex::Zip
git-svn-id: file:///home/svn/framework3/trunk@8449 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 04:27:56 +00:00
James Lee 2f4ab39712 new, much smaller, elf template
git-svn-id: file:///home/svn/framework3/trunk@8448 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 02:31:36 +00:00
Tod Beardsley 65c5eae59e Calling it postgres instead of postgresql for overall consistency.
git-svn-id: file:///home/svn/framework3/trunk@8435 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-09 20:44:23 +00:00
James Lee e2d70519d7 add the ability to check for a prompt before sending user/pass; now works with cisco, aix, solaris, linux, and windows telnetds
git-svn-id: file:///home/svn/framework3/trunk@8434 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-09 19:07:02 +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
HD Moore 55aaf69b4b Avoid a warning
git-svn-id: file:///home/svn/framework3/trunk@8425 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-09 04:12:34 +00:00
Joshua Drake 4a39cc13f6 oops, wrong syscall number for listen
git-svn-id: file:///home/svn/framework3/trunk@8420 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-09 00:05:15 +00:00
Joshua Drake 17bd4b8b7d fixed aix payloads to REALLY do variable substitution
git-svn-id: file:///home/svn/framework3/trunk@8418 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 22:41:36 +00:00
Tod Beardsley c763052c57 See #816. This came up while learning how to perform various postgre tasks via Metasploit.
This module in particular reads a text file on the remote machine, copies it to a temporary table, and then selects the table.

Looks like this:

http://pastie.org/private/uoxgaw7ibjpvuepolr1fuw



git-svn-id: file:///home/svn/framework3/trunk@8417 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 22:34:09 +00:00
HD Moore 885e396c4d Fix close/shutdown issue
git-svn-id: file:///home/svn/framework3/trunk@8415 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 20:44:59 +00:00
Tod Beardsley 0b6c44b2cb Adding reporting to postgres_login. Logging version info more verbosely for authenticated login, since it's way useful.
git-svn-id: file:///home/svn/framework3/trunk@8408 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 17:35:58 +00:00
Tod Beardsley 67bb7a1926 Cleaning up print_status messages for Postgres SQL module and Postgres library.
git-svn-id: file:///home/svn/framework3/trunk@8407 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 16:43:44 +00:00
HD Moore 5f76353e8e Woops, add the missing support files
git-svn-id: file:///home/svn/framework3/trunk@8400 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 00:59:29 +00:00
Joshua Drake d68efa61d2 initial commit of aix cmsd exploit (not fully working yet)
git-svn-id: file:///home/svn/framework3/trunk@8397 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 00:44:37 +00:00
Joshua Drake 7d9d169a1a exploit/sunrpc: return nil on error
git-svn-id: file:///home/svn/framework3/trunk@8394 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-07 03:51:14 +00:00
James Lee 3b0b2731fd fix telnet scanner
git-svn-id: file:///home/svn/framework3/trunk@8392 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-07 00:14:29 +00:00
Joshua Drake 80bdf77b39 cleanup sunrpc_call error handling
git-svn-id: file:///home/svn/framework3/trunk@8388 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-06 21:50:11 +00:00
Stephen Fewer fd2469db24 Commit the Ruby end for TCP server channels, the modified TCP client channels and the support for pivoting a reverse_tcp meterpreter.
git-svn-id: file:///home/svn/framework3/trunk@8384 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-06 17:59:25 +00:00
Tod Beardsley 43bbfefa8f Adding a Windows signature for Postgres.
git-svn-id: file:///home/svn/framework3/trunk@8374 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-05 18:02:13 +00:00
HD Moore 37cc7fa4ae Revert previous change to host status parser
git-svn-id: file:///home/svn/framework3/trunk@8373 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-05 15:51:46 +00:00
HD Moore 52dc906ba2 Port states can now be open/closed/filtered; removed the "up" syntax
git-svn-id: file:///home/svn/framework3/trunk@8372 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-05 15:43:24 +00:00
Tod Beardsley c8cdf9c938 Fixes #811 by implementing an enumerator for PostgreSQL.
git-svn-id: file:///home/svn/framework3/trunk@8371 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-05 15:20:59 +00:00
Tod Beardsley 6e8e6ef16a Fixes #769 by implementing a brute force module for Postgres. A couple notes: If you guess wrong at the database name, you still can try to login with a username and password -- you'll get a successful auth, but then get disconnected. So, that's pretty neat.
Also, since Postgres-PR uses the stock TCPSocket object, connection timeouts and other errors take forever. This is avoided in the brute forcer by pre-validating the connection with Rex::Socket, but this is a hack -- it would be better to convert Postgres-PR to a Rex::Socket flavor, so you also get nicer error messages and what all. I did fork it off the main distribute it already anyway, so may as well will open a feature bug on this, but it's pretty low priority.




git-svn-id: file:///home/svn/framework3/trunk@8366 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-03 21:45:13 +00:00
Joshua Drake a052340703 a few fixes to sunrpc code
this fixes a couple of errors handling error messages
also, some whitespace/indenting adjustments



git-svn-id: file:///home/svn/framework3/trunk@8365 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-03 20:30:09 +00:00
James Lee 4e582bd10b bah, debug print
git-svn-id: file:///home/svn/framework3/trunk@8359 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 23:15:12 +00:00
James Lee 84e366c28e reflect the new api in Aux::Report
git-svn-id: file:///home/svn/framework3/trunk@8358 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 23:14:33 +00:00
James Lee ea0f4d2e46 allow multiple resource files on the command line
git-svn-id: file:///home/svn/framework3/trunk@8357 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 23:13:42 +00:00
James Lee 65a303ee93 don't try to use an inactive database
git-svn-id: file:///home/svn/framework3/trunk@8356 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 23:11:59 +00:00
Tod Beardsley e0060a4f83 See #794. Fixing this better to ensure that we never end up with a nil for a source mac address on ARP packets.
git-svn-id: file:///home/svn/framework3/trunk@8354 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 22:05:24 +00:00
Tod Beardsley 3fe8d0375b Adds a print_debug message handler -- mostly useful during development to easily inspect objects.
git-svn-id: file:///home/svn/framework3/trunk@8353 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 21:03:07 +00:00
Tod Beardsley 2ffe4abb5d Fixes #730 by fixing up the Postgres query module and nicifying the output.
git-svn-id: file:///home/svn/framework3/trunk@8352 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 21:02:12 +00:00
Tod Beardsley 01adf60550 See #730. First pass at a Postgres Query module. Doesn't handle errors very well yet (still need to work all that out and create some test cases).
git-svn-id: file:///home/svn/framework3/trunk@8344 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 01:40:48 +00:00
James Lee 554f46be43 fix syntax error
git-svn-id: file:///home/svn/framework3/trunk@8341 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-01 16:48:04 +00:00
Tod Beardsley d166c166b5 Fixes #794. I also couldn't reproduce -- whiten0ise's error makes is sound like he's running an old or broken version of pcaprub that's missing Pcap#lookupnet (present in at least 0.7-dev, just checked http://rubyforge.org/projects/pcaprub/
However, this should at least solve the split error, and give better hints on other errors. Implements check_pcaprub_loaded to ensure that Pcap is in fact available on lookupnet, openpcap, and inject, and implemented a begin/rescue around lookupnet to catch errors involving a bad interface.



git-svn-id: file:///home/svn/framework3/trunk@8340 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-01 15:11:35 +00:00
James Lee 55a82c1642 add simple detection for Chrome
git-svn-id: file:///home/svn/framework3/trunk@8330 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-30 21:09:38 +00:00
James Lee c396129d41 add a liveness test to meterpreter, fixes 698
git-svn-id: file:///home/svn/framework3/trunk@8314 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:53:15 +00:00
Tod Beardsley a76480d42c See #726. Cleaning up my gross whitespace.
git-svn-id: file:///home/svn/framework3/trunk@8311 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:08:39 +00:00
natron 69ad365b46 Added STDERR to pure java payload, cleaned up user's view.
git-svn-id: file:///home/svn/framework3/trunk@8308 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 22:53:36 +00:00
Joshua Drake 9c0213e642 check for JAVA_HOME before using it
git-svn-id: file:///home/svn/framework3/trunk@8289 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 08:18:24 +00:00
Joshua Drake a28b727e3f oops! minor change fixes #785
git-svn-id: file:///home/svn/framework3/trunk@8288 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 07:48:12 +00:00
James Lee f8a09fdc06 fix infinite loop and typo
git-svn-id: file:///home/svn/framework3/trunk@8286 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 02:43:54 +00:00
James Lee c97798e11a unbreak cmd shell sessions
git-svn-id: file:///home/svn/framework3/trunk@8285 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 02:17:57 +00:00
James Lee b783052af3 get rid of the Object#id deprecation warning by making event reporting more robust
git-svn-id: file:///home/svn/framework3/trunk@8284 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 00:00:00 +00:00
HD Moore 214d624ddc Fix the report_host() code (broken by previous commit), add an advanced option to store db hosts from monlist
git-svn-id: file:///home/svn/framework3/trunk@8283 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 23:25:17 +00:00
Tod Beardsley 7c4d7c3d71 Fixes #782. Cleans up the various arp and inject methods so they're a little more sane to read, and streamlines the ARP process.
Still would like to a) experiment with keeping a persistent cache (with a cache timeout maybe, like a real arp cache), and b) see how caching negative replies will work out, but that's for another time.



git-svn-id: file:///home/svn/framework3/trunk@8280 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 22:46:41 +00:00
HD Moore c1bc6a617a Default host state is now Up
git-svn-id: file:///home/svn/framework3/trunk@8279 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 22:13:48 +00:00
Tod Beardsley 0711363b49 See #782. Added in a mechanism to determine if I should ARP. This brings synflood back up to speed.
git-svn-id: file:///home/svn/framework3/trunk@8278 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 21:19:23 +00:00
Tod Beardsley bedbc2c341 See #782. Deregistering filter and pcapfile (not needed for these), moving GATEWAY to advanced options.
git-svn-id: file:///home/svn/framework3/trunk@8277 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 20:58:45 +00:00
natron 3b85e44a7a Remove old comments; no longer relevant.
git-svn-id: file:///home/svn/framework3/trunk@8270 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 19:59:25 +00:00
natron cd5e5880d2 Initial commit of Msf::Exploit::Java mixin and multi/browser/java_signed_applet exploit.
git-svn-id: file:///home/svn/framework3/trunk@8267 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 19:46:39 +00:00
Tod Beardsley 2f76affadb See #782. Updating ldap exploit to use capture_sendto. Also updating capture.rb to include RHOST.
git-svn-id: file:///home/svn/framework3/trunk@8266 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 19:37:22 +00:00
Tod Beardsley 709c634bfa Renaming sendto to capture_sendto to give the user a hint as to where it came from.
git-svn-id: file:///home/svn/framework3/trunk@8260 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 18:21:33 +00:00
Tod Beardsley 3053bd702a See #782. Updated xmas.rb (again), now uses the nicer frontend function sendto. Diff against r8026 to get an idea of what's changed for module writers.
git-svn-id: file:///home/svn/framework3/trunk@8259 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 18:12:02 +00:00
Tod Beardsley 77771ca5be See #782. Completes integration of the secondary self.arp_capture object. Renames readreply to inject_reply to avoid collisions with existing modules. Implements a configurable "ARP_SECRET" cookie for the self.arp_capture filter.
git-svn-id: file:///home/svn/framework3/trunk@8258 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 17:51:16 +00:00
Tod Beardsley 5adb1aef7e See #782. Fixing GWHOST/GATEWAY, implementing a new capture option for ARP requests.
git-svn-id: file:///home/svn/framework3/trunk@8257 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 15:11:18 +00:00
James Lee 8be92ab010 default state to 'up'
git-svn-id: file:///home/svn/framework3/trunk@8253 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 04:48:27 +00:00
Tod Beardsley 7eafaab2b2 See #782. Moving the arp cache to a class variable of the capture object. Seems better than just making up my own datastore entry.
git-svn-id: file:///home/svn/framework3/trunk@8250 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 02:57:20 +00:00
Tod Beardsley 4bb6e650da See #782. Implemented a more sensible arp cache so as not to spam with UDP probes and arps. Also refactored xmas to use the new methods.
git-svn-id: file:///home/svn/framework3/trunk@8245 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 21:37:40 +00:00
Tod Beardsley c003a663d1 See #782. Extended the injection ARP query methods to handle local addresses more satisfactorially, fixed a couple errors, and added a bunch of inline documentation to explain how it all works together.
git-svn-id: file:///home/svn/framework3/trunk@8238 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 16:00:16 +00:00
Tod Beardsley cac3d6d56b See #782. This introduces some inject methods to the Capture mixin, and edits the ip_spoof module to take advantage of them.
git-svn-id: file:///home/svn/framework3/trunk@8237 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 06:38:41 +00:00
et 96d6e7bd9b In progress. crawling
git-svn-id: file:///home/svn/framework3/trunk@8236 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 04:21:07 +00:00
Tod Beardsley 359e1ad53a See #726. Adds a DB2 scanner and brute forcer.
git-svn-id: file:///home/svn/framework3/trunk@8223 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 15:58:24 +00:00
James Lee 9b19755bf1 fix report_client
git-svn-id: file:///home/svn/framework3/trunk@8209 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-23 00:15:57 +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
Joshua Drake c147575255 fix error message
git-svn-id: file:///home/svn/framework3/trunk@8196 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 17:39:51 +00:00
James Lee 865a50594b add a telnet login scanner
git-svn-id: file:///home/svn/framework3/trunk@8179 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 03:25:34 +00:00
Joshua Drake 07a25af681 minor whitespace change
git-svn-id: file:///home/svn/framework3/trunk@8177 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 02:31:30 +00:00
James Lee e19f66ec1f use the new authbrute mixin
git-svn-id: file:///home/svn/framework3/trunk@8176 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 01:43:01 +00:00
James Lee fb025658f9 don't duplicate user/pass from datastore
git-svn-id: file:///home/svn/framework3/trunk@8174 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 01:35:16 +00:00
James Lee 29dd0d4fea don't bother saving the results of report_vuln
git-svn-id: file:///home/svn/framework3/trunk@8173 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 01:01:54 +00:00
James Lee 265d73b224 task.wait is expensive, so avoid find_or_create_* calls at the cost of a few extra queries; fixes 768
git-svn-id: file:///home/svn/framework3/trunk@8171 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 00:35:44 +00:00
James Lee 08eb80f4a9 use the authbrute mixin
git-svn-id: file:///home/svn/framework3/trunk@8150 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 22:22:22 +00:00
James Lee d90ffdc015 use a username and password from the datastore if provided
git-svn-id: file:///home/svn/framework3/trunk@8149 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 22:21:39 +00:00
James Lee 46b346239e don't always use the username as a password, let modules do that if they want it
git-svn-id: file:///home/svn/framework3/trunk@8147 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 22:03:02 +00:00
James Lee d8f7645094 : -> .
git-svn-id: file:///home/svn/framework3/trunk@8146 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 21:35:42 +00:00
HD Moore b6b25b7f03 allow the default workspace to be purged and recreated
git-svn-id: file:///home/svn/framework3/trunk@8134 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 15:58:13 +00:00
HD Moore 2ba892aa69 Report host mac, name, and whether its a VM
git-svn-id: file:///home/svn/framework3/trunk@8133 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 15:49:13 +00:00
James Lee 61984579d5 don't report to the db if there isn't one
git-svn-id: file:///home/svn/framework3/trunk@8132 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 04:34:12 +00:00
James Lee 1e3662e3ad events need to be part of core, not base
git-svn-id: file:///home/svn/framework3/trunk@8128 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 01:29:54 +00:00
James Lee 26aa834600 base should not depend on ui
git-svn-id: file:///home/svn/framework3/trunk@8127 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 01:24:45 +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 caa67aa3d5 Require the nmap XML parser
git-svn-id: file:///home/svn/framework3/trunk@8123 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 20:29:55 +00:00
James Lee 78808fe3c1 show the database driver in framework.inspect
git-svn-id: file:///home/svn/framework3/trunk@8122 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:57:54 +00:00
HD Moore a55dfa1bbc Adds scanner_progress for granular percentage
git-svn-id: file:///home/svn/framework3/trunk@8120 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:20:32 +00:00
James Lee 7be26761f5 merge bannedit's WAR payload patch
git-svn-id: file:///home/svn/framework3/trunk@8119 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:15:15 +00:00
HD Moore d84ca6d438 Replicants should receive the same module store as the original
git-svn-id: file:///home/svn/framework3/trunk@8118 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:14:44 +00:00
HD Moore 3823512ae9 This adds the ability to use the module as a hash
git-svn-id: file:///home/svn/framework3/trunk@8117 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:09:34 +00:00
James Lee 54095a585e update the auth bruteforcer, and use it in smb/login
git-svn-id: file:///home/svn/framework3/trunk@8116 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 16:58:43 +00:00
HD Moore bc9985d5da Minor fixes to the nessusv2 importer, allow the db_import command to work on it directly
git-svn-id: file:///home/svn/framework3/trunk@8115 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 15:26:20 +00:00
HD Moore 568770ae23 Fixes #690 by merging John Miller's patch to enable Nessus v2 support
git-svn-id: file:///home/svn/framework3/trunk@8114 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 12:57:26 +00:00
HD Moore b9e6c8eef7 Fixes #758 by setting the http content type
git-svn-id: file:///home/svn/framework3/trunk@8113 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 12:51:31 +00:00
HD Moore 9bb14e1c4e Add a telnet banner grabber
git-svn-id: file:///home/svn/framework3/trunk@8108 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-13 21:46:48 +00:00
James Lee 2890f3eeda missed this in the last commit
git-svn-id: file:///home/svn/framework3/trunk@8105 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-13 07:03:18 +00:00
James Lee fd89f4e6cd add an events table
git-svn-id: file:///home/svn/framework3/trunk@8104 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-13 06:40:34 +00:00
James Lee f6d0c4c353 add the beginnings of an authentication brute-force mixin
git-svn-id: file:///home/svn/framework3/trunk@8100 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-12 07:29:25 +00:00
HD Moore 01ddb5f41d Fix a loop when the client disconnects
git-svn-id: file:///home/svn/framework3/trunk@8097 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-11 19:47:33 +00:00
HD Moore de4add3a1f Whitespace cleanups
git-svn-id: file:///home/svn/framework3/trunk@8096 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-11 19:18:49 +00:00
James Lee 5fae88b0b8 take out stupid debug prints
git-svn-id: file:///home/svn/framework3/trunk@8094 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-11 01:30:53 +00:00
James Lee fd3373862b move lookups into the queue instead of just saves, fixes a race condition where multiple entities could be inserted with the same info
git-svn-id: file:///home/svn/framework3/trunk@8093 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-10 17:53:12 +00:00
James Lee e1ba7b9618 print a useful message instead of nothing when the given file doesn't exist
git-svn-id: file:///home/svn/framework3/trunk@8092 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-10 17:49:28 +00:00
James Lee f29402028e make the status a little more easily available
git-svn-id: file:///home/svn/framework3/trunk@8091 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-09 02:11:46 +00:00
James Lee 93a673fa1f allow multiple filename arguments to db_import and handle globs, see 750
git-svn-id: file:///home/svn/framework3/trunk@8089 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-07 21:51:18 +00:00
James Lee dd180a850b make errors less generic
git-svn-id: file:///home/svn/framework3/trunk@8088 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-07 21:30:14 +00:00
HD Moore 05a88c76ac Default port state to 'open'
git-svn-id: file:///home/svn/framework3/trunk@8087 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-07 20:28:58 +00:00
James Lee 30b897b6cd add a generic db_import command that auto-detects filetype, move import parsing into msf/core/db. fixes 750
git-svn-id: file:///home/svn/framework3/trunk@8085 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-07 19:06:29 +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
HD Moore 6a10d6b6ca Cleanup for tcp mixin, report smb version better, downcase service names
git-svn-id: file:///home/svn/framework3/trunk@8074 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-05 18:47:04 +00:00
James Lee b365a86aa1 save nmap version detections
git-svn-id: file:///home/svn/framework3/trunk@8073 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-05 18:23:28 +00:00
James Lee 58cfcd99f8 record a vuln when opening a session. the format may need some more thought
git-svn-id: file:///home/svn/framework3/trunk@8066 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-04 21:54:32 +00:00
James Lee cb4ab4b0f6 sort the output for the show command
git-svn-id: file:///home/svn/framework3/trunk@8065 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-04 21:10:26 +00:00
Mike Smith 471b1e6ff8 Delete services one-by-one instead of calling 'delete_all', which doesn't exist. (fixes #748)
git-svn-id: file:///home/svn/framework3/trunk@8064 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-04 16:14:23 +00:00
HD Moore b35df262ba Fix db_del_port
git-svn-id: file:///home/svn/framework3/trunk@8060 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 23:14:37 +00:00
HD Moore adc1c18f26 Fix the old warning url
git-svn-id: file:///home/svn/framework3/trunk@8052 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-01 15:17:02 +00:00
James Lee 5aaa7bb3de fix a latent bug where multiple hosts could be reported with the same info and make report_vuln() work
git-svn-id: file:///home/svn/framework3/trunk@8050 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-01 00:19:15 +00:00
Mike Smith de55508a03 fix 'db_workspace -a'
git-svn-id: file:///home/svn/framework3/trunk@8043 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 01:51:12 +00:00
James Lee 90b2b4c77c fix the db_add* and db_del* commands, make note output readable on 1.8
git-svn-id: file:///home/svn/framework3/trunk@8042 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 01:27:04 +00:00
James Lee 3bc1f935fa fix amap mlog import
git-svn-id: file:///home/svn/framework3/trunk@8041 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 01:11:53 +00:00
James Lee 7fc5ada4c6 fix nessus nbe parsing
git-svn-id: file:///home/svn/framework3/trunk@8040 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 23:49:29 +00:00
James Lee 56c2b54369 remove a debug print
git-svn-id: file:///home/svn/framework3/trunk@8039 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 23:31:18 +00:00
Joshua Drake ff515f5808 fixed exception when unable to connect, fixed formatting
git-svn-id: file:///home/svn/framework3/trunk@8037 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 22:15:12 +00:00
James Lee 653daac8e6 remove a debug print and default proto to 'tcp' if it wasn't given
git-svn-id: file:///home/svn/framework3/trunk@8034 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 17:43:47 +00:00
James Lee 02eb7ab80d massive changes to the database api. Auxiliary::Report is now just a bunch of stubs into the main DBManager, most aux modules should just work, but they haven't all been tested. introduces a get_auth_info method for pulling credentials out of the db. other db api methods should be more standardized now. cross your fingers
git-svn-id: file:///home/svn/framework3/trunk@8028 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 23:48:45 +00:00
Joshua Drake 036ac8fb90 show warning if -L was specified but readline failed to load
git-svn-id: file:///home/svn/framework3/trunk@8024 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 21:54:03 +00:00
Mike Smith 488b0cba5d Fix "dbfile" deprecation warning when using SQLite.
Replaced the deprecated "dbfile" option with "database" so that Rails
2.3.5 will not print a warning message.


git-svn-id: file:///home/svn/framework3/trunk@8018 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 01:27:11 +00:00
HD Moore 1d1f94593c Add -t asp to msfencode :)
git-svn-id: file:///home/svn/framework3/trunk@8013 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 22:41:43 +00:00
Joshua Drake a247de77ec add the SingleStaticBit for the CVE-2008-4193 exploit - comments welcome
git-svn-id: file:///home/svn/framework3/trunk@8011 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 20:39:43 +00:00
James Lee 8aff26edb4 add a method for waiting on a task to finish
git-svn-id: file:///home/svn/framework3/trunk@8009 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 20:15:33 +00:00
HD Moore 3f59ea2f95 Handle a return() from a proc a bit more gracefully, add a test case
git-svn-id: file:///home/svn/framework3/trunk@8008 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 19:44:14 +00:00
HD Moore a414d5fc8f Fixes an issue identified by egypt when the task's proc returns. This also stores the return value in task.retval
git-svn-id: file:///home/svn/framework3/trunk@8007 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 19:37:14 +00:00
HD Moore 5757216f9a This overhauls the database reporting code - all report_* functions now add their write operation to a queue that is processed sequentially in the background. This prevents concurrency issues around database writes, but prevents modules from immediately using the results of their report_* calls in the database. Still todo is a method for waiting on the write to have occurred
git-svn-id: file:///home/svn/framework3/trunk@7997 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 00:21:21 +00:00
HD Moore 308bdcccb2 Fixes #733 (using open vs ::Up, may need a revert and a change to the importers instead). Update the sweep_udp module to store host, mac, name info
git-svn-id: file:///home/svn/framework3/trunk@7990 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 22:08:49 +00:00
HD Moore 0bf2f7dd9e Clean up trailing whitespace
git-svn-id: file:///home/svn/framework3/trunk@7987 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 18:29:24 +00:00
HD Moore de7cabaed1 Handle dashes in the version strings and add generic catch-alls for windows
git-svn-id: file:///home/svn/framework3/trunk@7986 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 18:26:24 +00:00
HD Moore b80ebd45f1 Better parsing of Windows 2008 versions (should handle Hyper-V variants now)
git-svn-id: file:///home/svn/framework3/trunk@7985 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 18:17:35 +00:00
HD Moore 4331c111f1 Add a mysql mixin that wraps ruby-mysql (tmtm.org)
git-svn-id: file:///home/svn/framework3/trunk@7977 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 05:21:21 +00:00
Mike Smith 744c4cd02f Store the current workspace's name instead of the whole Workspace object.
This ensures that the most up-to-date data is reloaded from the database
when you ask for it, instead of returning cached results.

git-svn-id: file:///home/svn/framework3/trunk@7963 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 20:37:30 +00:00
HD Moore a9ec7c8b21 Ignore proxy errors during scanning
git-svn-id: file:///home/svn/framework3/trunk@7962 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 15:29:22 +00:00
HD Moore b13e185943 Giant update from tebo, fixing up SunRPC and the nsfmount module
git-svn-id: file:///home/svn/framework3/trunk@7961 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 13:44:53 +00:00
HD Moore 556b28e6ca Switching focus to 3.3.4-dev
git-svn-id: file:///home/svn/framework3/trunk@7960 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 13:44:19 +00:00
HD Moore eb58e8801a Tagging this as 3.3.3-release
git-svn-id: file:///home/svn/framework3/trunk@7957 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 06:03:57 +00:00
HD Moore dde54bf99c Allow minrank to be specified via -R
git-svn-id: file:///home/svn/framework3/trunk@7952 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 03:53:16 +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 0708798598 more concise inspect output for Session objects
git-svn-id: file:///home/svn/framework3/trunk@7949 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 01:03:51 +00:00
James Lee 89695b40fe add ability to specify columns for db_{hosts,services} output
git-svn-id: file:///home/svn/framework3/trunk@7948 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-22 22:20:58 +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
Mike Smith d3e8132532 Fix (ruby 1.8.7) issue where data appeared under the wrong column.
git-svn-id: file:///home/svn/framework3/trunk@7944 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-22 02:48:54 +00:00
HD Moore 655e864ee3 See #708. Sets a default timeout for http requests
git-svn-id: file:///home/svn/framework3/trunk@7937 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 22:42:21 +00:00
HD Moore 111d49135e Fixes #609. Revert back to ExitProcess(0) as default, this resolves a number of small bugs
git-svn-id: file:///home/svn/framework3/trunk@7935 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 20:44:44 +00:00
HD Moore 6147db8722 Fixes #696. Default direct to FALSE if port is 139
git-svn-id: file:///home/svn/framework3/trunk@7933 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 19:04:28 +00:00
Mike Smith 1f7b184fe5 Use SQL to filter/sort the hosts & services records, instead of ruby.
git-svn-id: file:///home/svn/framework3/trunk@7930 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 16:46:11 +00:00
James Lee fc1e0b88fb change db_hosts and db_services output to be more thorough, see 619
git-svn-id: file:///home/svn/framework3/trunk@7912 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-18 01:14:05 +00:00
HD Moore 39d37065de See #485. This patch allows the very basics of metasploit to work under jRuby 1.4.0. Many, many things are still broken
git-svn-id: file:///home/svn/framework3/trunk@7906 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-17 08:02:11 +00:00
James Lee c4c0fd2b55 deal with broken Date.parse in 1.8.6 and older by just not printing the last updated date. fixes 693
git-svn-id: file:///home/svn/framework3/trunk@7897 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-17 03:17:37 +00:00
HD Moore f76a9a43e6 Switch compat payloads to normal vs ranked
git-svn-id: file:///home/svn/framework3/trunk@7877 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-15 13:14:01 +00:00
James Lee f1a5103b32 allow the browser_autopwn mixin access to exploit modules' Rank constants. see 628
git-svn-id: file:///home/svn/framework3/trunk@7876 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-15 07:21:17 +00:00
James Lee b6c497467e add a message about requiring libmysqlclient-dev, fixes 535
git-svn-id: file:///home/svn/framework3/trunk@7866 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 23:40:21 +00:00
Mike Smith f9ffc8b8bc Add db_workspace command & other db refactoring.
* Added "workspaces" table and associated ActiveRecord class.
 * Moved ActiveRecord models from db_objects.rb into separate files.
 * Do the DB migration check every time you connect (was previously done
   during db_create).
 * Use :dependent => :destroy associations so that we don't have to
   manually delete the dependent objects.

git-svn-id: file:///home/svn/framework3/trunk@7861 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 22:52:34 +00:00
HD Moore 4311c20ee1 Warn the user when nessusv2 is specified (only v1 supported). See #690
git-svn-id: file:///home/svn/framework3/trunk@7857 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 22:00:54 +00:00
James Lee a03e3bf823 adds support for regular shell sessions when running commands with 'sessions -c'. Commands are run sequentially, so will take forever on large numbers of sessions.
git-svn-id: file:///home/svn/framework3/trunk@7855 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 21:17:49 +00:00
HD Moore bce6355df1 Make sure we use a real module class instance when ranking
git-svn-id: file:///home/svn/framework3/trunk@7844 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 23:41:25 +00:00
HD Moore e2cc45e4d4 Use the not-so-explicit platform
git-svn-id: file:///home/svn/framework3/trunk@7843 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:46:44 +00:00
HD Moore 89da53d570 Updates to encode_shellcode_stub
git-svn-id: file:///home/svn/framework3/trunk@7842 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:43:17 +00:00
HD Moore 40fb409343 Adds encode_shellcode_stub() to the exploit class, this allows arbitrary shellecode bits to be easily encoded
git-svn-id: file:///home/svn/framework3/trunk@7841 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:31:17 +00:00
HD Moore 7e4d03be86 This adds support for the old exe format to msfencode using -t exe-small and allows encoder modules to change preferences based on the platform, which fully solves #430.
git-svn-id: file:///home/svn/framework3/trunk@7840 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:03:35 +00:00
HD Moore c287573213 A few more wmap cleanups
git-svn-id: file:///home/svn/framework3/trunk@7839 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 06:56:01 +00:00
HD Moore a1f71fa994 Fixes #683. This triggers when running on ruby 1.9 and is probably one of many like this and one of the reasons this interface is not maintained. However, since you wen to the effort of reporting it, the least we can do is fix it ;)
git-svn-id: file:///home/svn/framework3/trunk@7838 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 05:30:34 +00:00
HD Moore 1029ecd7f8 Cleanup wmap, add the missing database tables back, rename to have a wmap_prefix
git-svn-id: file:///home/svn/framework3/trunk@7837 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 05:24:48 +00:00
James Lee 23a63991b2 add -c option to sessions command to allow running a shell command on running meterpreter sesions; see #663
git-svn-id: file:///home/svn/framework3/trunk@7831 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-12 00:49:48 +00:00
Joshua Drake 004c2864f4 This adds an option to the sessions command (-s). Using it allows running a script for each open meterpreter session, see #663
git-svn-id: file:///home/svn/framework3/trunk@7830 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 23:19:19 +00:00
HD Moore eac301484c Forgot to update the timeout() wrapper class for refernces
git-svn-id: file:///home/svn/framework3/trunk@7829 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 21:46:44 +00:00
HD Moore 0bc4ba6211 Major overhaul to how db_autopwn works, should be substantially faster and less error prone
git-svn-id: file:///home/svn/framework3/trunk@7824 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 20:21:18 +00:00
HD Moore e2a5cb0ebe Pass the password argument in db_create
git-svn-id: file:///home/svn/framework3/trunk@7823 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 18:54:19 +00:00
HD Moore c94c2ee892 Resolved Mac OS X compatibility with the tar, switching back to 3.3.3-dev
git-svn-id: file:///home/svn/framework3/trunk@7817 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 22:32:36 +00:00
HD Moore f1bf7ec7cf Bumping back to 3.3.2 for a second to build a tarball for OS X (._main bug)
git-svn-id: file:///home/svn/framework3/trunk@7816 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 22:26:59 +00:00
HD Moore 8179472a35 Hurray 3.3.2 is out - back to work on 3.3.3
git-svn-id: file:///home/svn/framework3/trunk@7809 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 20:26:40 +00:00
HD Moore d976df897a 3.3.2 done
git-svn-id: file:///home/svn/framework3/trunk@7808 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 19:14:45 +00:00
HD Moore 1c98368351 Loop until a non-100 is found or the resp parser fails
git-svn-id: file:///home/svn/framework3/trunk@7800 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 16:57:21 +00:00
HD Moore 006d5d51fc Fixes #674 by adding 100-continue support
git-svn-id: file:///home/svn/framework3/trunk@7799 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 16:54:27 +00:00
HD Moore afa5b46674 Default the minrank for autopwn, otherwise this prevents usage from being shown when no args are present. Also breaks -t -p when no rank is specified
git-svn-id: file:///home/svn/framework3/trunk@7798 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 15:12:59 +00:00
HD Moore 75c90b8ef9 Handle Errno::EINTR gracefully
git-svn-id: file:///home/svn/framework3/trunk@7796 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 06:13:14 +00:00
HD Moore 2a5a5207f5 Switch trunk to 3.3.2-testing until we cut this
git-svn-id: file:///home/svn/framework3/trunk@7794 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 05:48:12 +00:00
Joshua Drake 4cb050010b add exploitability detection (by trying %n)
git-svn-id: file:///home/svn/framework3/trunk@7791 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 23:53:26 +00:00
James Lee 8d25dc00bc bail if MinimumRank is invalid
git-svn-id: file:///home/svn/framework3/trunk@7787 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 23:07:58 +00:00
James Lee 084a10ded5 remove a debug print and deal with minrank being absent
git-svn-id: file:///home/svn/framework3/trunk@7786 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 22:42:06 +00:00
Joshua Drake 318750c68c oops, forgot to update fmtstr_count_printed
git-svn-id: file:///home/svn/framework3/trunk@7785 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 22:37:34 +00:00
Joshua Drake 4a363329cb fixed generating fmts from buffers with small value delta (eg \x02\x01\x03\x01)
git-svn-id: file:///home/svn/framework3/trunk@7781 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 21:50:17 +00:00
HD Moore 898c8655ff Default rank to manual for the search command
git-svn-id: file:///home/svn/framework3/trunk@7773 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 13:57:46 +00:00
James Lee 961e70fc34 add -f flag to exploit command to force running despite a conflicting MinimumRank value. fixes 628
git-svn-id: file:///home/svn/framework3/trunk@7770 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 02:49:27 +00:00
Joshua Drake 061b4a36cf add stack reading and detection for dpa/fpu fmt specifiers
git-svn-id: file:///home/svn/framework3/trunk@7768 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 02:18:12 +00:00
James Lee 6989949720 adds a global option, MinimumRank, which db_autopwn now checks to prevent running exploits below a certain rank. fixes #625, see #628
git-svn-id: file:///home/svn/framework3/trunk@7767 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 01:54:20 +00:00
Joshua Drake f383949540 fix 1.9.1 compatability
git-svn-id: file:///home/svn/framework3/trunk@7764 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 23:50:29 +00:00
Joshua Drake 9abe0c0b03 added support for direct parameter access
git-svn-id: file:///home/svn/framework3/trunk@7763 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 23:50:02 +00:00
James Lee 47fdec6ab3 add ability to search by minimum rank, fixes 627
git-svn-id: file:///home/svn/framework3/trunk@7747 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 23:15:13 +00:00
Mike Smith 61b556a0d1 Initialize the database schema using ActiveRecord migrations
git-svn-id: file:///home/svn/framework3/trunk@7739 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 17:03:27 +00:00
Mike Smith 05a4212e1d Minor db improvements
Use find_each for better scalability with large databases.
No need to call save immediately after create.

git-svn-id: file:///home/svn/framework3/trunk@7737 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 17:03:21 +00:00
James Lee 765a1d72eb replace old clear color code with the new one ('%clr'). fixes 610
git-svn-id: file:///home/svn/framework3/trunk@7736 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 17:00:05 +00:00
Stephen Fewer 0b8917a39e Add HD's optimization for faster DLL reading (ala the x86 counterpart).
git-svn-id: file:///home/svn/framework3/trunk@7731 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 12:58:28 +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
HD Moore 42e6486fb4 Module loading broken again by revision r7709.
git-svn-id: file:///home/svn/framework3/trunk@7711 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-05 11:10:46 +00:00
Mario Ceballos 43f65b2851 fix for the NLS_LANG issue. (rory)
git-svn-id: file:///home/svn/framework3/trunk@7709 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 23:01:54 +00:00
James Lee 5952e29040 modify address range specification (for e.g. RHOSTS) to use nmap notation, fixes #182
git-svn-id: file:///home/svn/framework3/trunk@7705 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:37:14 +00:00
Joshua Drake 0458622cb7 attempt to persist left over data across calls
git-svn-id: file:///home/svn/framework3/trunk@7704 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:20:14 +00:00
James Lee ee0c1d460a remove the lock that was causing segfaults on 1.9; fixes #513, see #514
git-svn-id: file:///home/svn/framework3/trunk@7703 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:16:28 +00:00
HD Moore fda1083d13 Stop throwing an exception on module initialization, delay this until connect() to avoid breaking module enumeration tools. Clean up the tabs and indents. Delete the broken rescue clause with no begin
git-svn-id: file:///home/svn/framework3/trunk@7696 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 17:22:32 +00:00
Joshua Drake 821f515ff5 add PrependChrootBreak
git-svn-id: file:///home/svn/framework3/trunk@7692 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 07:49:05 +00:00
Joshua Drake 4ab9a59a39 now supporting sequential identical values!
git-svn-id: file:///home/svn/framework3/trunk@7691 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 07:45:08 +00:00
HD Moore facebbc791 allow module search to continue even if one module fails to load
git-svn-id: file:///home/svn/framework3/trunk@7689 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 01:00:48 +00:00
Mario Ceballos 93d02320cf updated oracle mixin and adjusted affected modules. now compatible with ruby 1.8 and 1.9
git-svn-id: file:///home/svn/framework3/trunk@7688 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 23:57:02 +00:00
Joshua Drake d4f1314025 fixed problem reading long lines
git-svn-id: file:///home/svn/framework3/trunk@7687 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 21:52:59 +00:00
Joshua Drake 1d143a6ccf fix silly bug, sorry
git-svn-id: file:///home/svn/framework3/trunk@7686 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 21:11:56 +00:00
Joshua Drake d31d7f869f split buffer to array conversion out
git-svn-id: file:///home/svn/framework3/trunk@7685 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 20:58:07 +00:00
Joshua Drake 7aeb7a08b3 first attempt at support for ftp continuations
git-svn-id: file:///home/svn/framework3/trunk@7684 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 20:56:08 +00:00
HD Moore b1b7ef0350 Improves the NeXpose plugin, adds the ability to do discovery outside of NeXpose and then scan the results using the database as input (-d).
git-svn-id: file:///home/svn/framework3/trunk@7681 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 15:26:30 +00:00
Patrick Webster a4fc468700 Handles exception where exec is a directory, or permission is denied.
git-svn-id: file:///home/svn/framework3/trunk@7678 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 08:17:14 +00:00
HD Moore fc983ef7e3 Many bug fixes to db_autopwn, cross-referencing of OS-level vulnerabilities, small bug fixes to HTTP client API
git-svn-id: file:///home/svn/framework3/trunk@7676 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 01:36:17 +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 dfabd1e3fc fixes #587; add http xmlrpc support from Ryan Linn, invoke it with 'load xmlrpc ServerType=Web' or ./msfrpcd -t Web
git-svn-id: file:///home/svn/framework3/trunk@7667 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-02 00:00:11 +00:00
James Lee e427bd5f81 spaces to tabs
git-svn-id: file:///home/svn/framework3/trunk@7666 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 23:15:07 +00:00
James Lee 0da80965d6 more info about a job, thanks Ryan Linn for the patch; fixes #586
git-svn-id: file:///home/svn/framework3/trunk@7665 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 23:11:12 +00:00
James Lee c2fac74ae2 make irb more useful by eliding unnecessary stuff from framework.inspect
git-svn-id: file:///home/svn/framework3/trunk@7662 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 21:42:14 +00:00
James Lee e73842251e add a kill command and clean up tabbing for jobs
git-svn-id: file:///home/svn/framework3/trunk@7659 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 18:24:11 +00:00
HD Moore b7addee664 Release cut, back to 3.4-dev
git-svn-id: file:///home/svn/framework3/trunk@7656 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 03:57:09 +00:00
HD Moore cae9880c28 Tag this as 3.3.1-release
git-svn-id: file:///home/svn/framework3/trunk@7654 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 03:08:48 +00:00
HD Moore c72ec65474 Tag this as 3.3.1-dev until we cut 3.3.1-release, then back to 3.4-dev
git-svn-id: file:///home/svn/framework3/trunk@7650 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 20:17:55 +00:00
HD Moore 38c8714db1 Fixes #585. Klunky right now but well tested
git-svn-id: file:///home/svn/framework3/trunk@7647 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 19:24:47 +00:00
et 53e9907a7d remove reports record
git-svn-id: file:///home/svn/framework3/trunk@7644 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 03:23:38 +00:00
HD Moore 05733b9d8d Correct tab indention
git-svn-id: file:///home/svn/framework3/trunk@7642 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-29 23:36:40 +00:00
HD Moore bfe2cc0c53 Force stale connections to be freed, fixes #513.
git-svn-id: file:///home/svn/framework3/trunk@7641 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-29 17:17:24 +00:00
HD Moore b0c68d3fd2 Faster DLL reading (ruby will yield to background threads on 4k blocks otherwise)
git-svn-id: file:///home/svn/framework3/trunk@7639 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-29 04:23:33 +00:00
James Lee d6a732d619 move histfile reading into rex
git-svn-id: file:///home/svn/framework3/trunk@7625 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 06:03:05 +00:00
James Lee fd61df4e9e add full support for persistent history, works in msfweb as well. fixes #523
git-svn-id: file:///home/svn/framework3/trunk@7621 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 02:18:02 +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 f3006f78c9 Fix up handling of service-less vulnerabilities
git-svn-id: file:///home/svn/framework3/trunk@7612 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 18:03:25 +00:00
James Lee 6bd2e7f5b4 dup http resource so modules don't inadvertantly modify it
git-svn-id: file:///home/svn/framework3/trunk@7608 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 06:45:14 +00:00
et 70d5e219e4 Additional reporting methods removed
git-svn-id: file:///home/svn/framework3/trunk@7607 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 06:20:21 +00:00
et 252cdcfb92 Removing unnecesary reporting methods
git-svn-id: file:///home/svn/framework3/trunk@7606 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 06:11:52 +00:00
et 5b81d85447 Replaced reporting to use notes
git-svn-id: file:///home/svn/framework3/trunk@7605 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 06:08:28 +00:00
HD Moore b460843929 Fixes #574. Uses compatible_payloads as the initial list for finding a match
git-svn-id: file:///home/svn/framework3/trunk@7604 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 02:24:41 +00:00
HD Moore 49b6111dbc Correctly print vulnerability references when there is no associated service
git-svn-id: file:///home/svn/framework3/trunk@7600 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 01:44:55 +00:00
James Lee d5e09a90e2 add minver and maxver options and prepare for universal module ranking
git-svn-id: file:///home/svn/framework3/trunk@7598 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 21:40:02 +00:00
HD Moore 3796cf3865 Fixes #567, hands the case where the svn directories were moved
git-svn-id: file:///home/svn/framework3/trunk@7593 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 12:47:05 +00:00
et e354c8dbcc Multiple headers handling bug fixes
git-svn-id: file:///home/svn/framework3/trunk@7588 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 05:27:11 +00:00
et a3d4e1c44a Added command to launch msfproxy from console
git-svn-id: file:///home/svn/framework3/trunk@7584 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-23 03:38:05 +00:00
James Lee 14a0040b8a move nmap xml parsing into Rex::Parser; add a test to make sure it works
git-svn-id: file:///home/svn/framework3/trunk@7566 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 06:15:45 +00:00
HD Moore f327418804 Fixes #553. Adds a timeout for all FTP commands and removes the unbounded fd.get
git-svn-id: file:///home/svn/framework3/trunk@7564 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 03:04:25 +00:00
Joshua Drake 56f0ef00e6 fix pad handling
git-svn-id: file:///home/svn/framework3/trunk@7562 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 00:50:44 +00:00
Joshua Drake 0ebff0e5ea allow target override
git-svn-id: file:///home/svn/framework3/trunk@7559 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 23:30:17 +00:00
Joshua Drake dd62aa6a98 add format string exploit mixin
git-svn-id: file:///home/svn/framework3/trunk@7558 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 22:29:43 +00:00
Joshua Drake 98c60be1f1 rough cut at some format string support
git-svn-id: file:///home/svn/framework3/trunk@7556 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 22:14:44 +00:00
HD Moore 4b9a54a2f6 Fixes #529 by correcting the variable name
git-svn-id: file:///home/svn/framework3/trunk@7555 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 12:45:34 +00:00
HD Moore e88ef79af8 And here we go again...
git-svn-id: file:///home/svn/framework3/trunk@7554 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 04:01:10 +00:00
HD Moore c7712d45d6 Mark this as 3.3-release, hopefully this is the last commit before 3.4-dev starts
git-svn-id: file:///home/svn/framework3/trunk@7551 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 00:06:44 +00:00
HD Moore 9b1935eb2a Fixes #522. Allow RHOSTS to contain hostnames with dashes
git-svn-id: file:///home/svn/framework3/trunk@7547 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 23:20:59 +00:00
HD Moore dc0dc98771 Fixes #517. Disables meterpreter stages for passivex stagers
git-svn-id: file:///home/svn/framework3/trunk@7546 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 22:45:33 +00:00
Joshua Drake d8b9e030e3 really fixed, test case: "db_create/db_nmap -P"
git-svn-id: file:///home/svn/framework3/trunk@7543 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 19:13:33 +00:00
Joshua Drake 6d18c6dd53 bugfix for NMAP failure, test case: "db_nmap -P"
git-svn-id: file:///home/svn/framework3/trunk@7542 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 19:06:42 +00:00
James Lee 36921e6d4b fix a bug where a failed encoder would try to convert nil to Integer. see #519
git-svn-id: file:///home/svn/framework3/trunk@7540 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 18:57:04 +00:00
HD Moore 3f811a801e Fixes #509. Fix the last shadowed var issue, the rest dont seem significant
git-svn-id: file:///home/svn/framework3/trunk@7537 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 18:34:08 +00:00
HD Moore 58711ec7ad See #509
git-svn-id: file:///home/svn/framework3/trunk@7535 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 18:28:45 +00:00
HD Moore 8cadfe66cf Mostly cosmetic
git-svn-id: file:///home/svn/framework3/trunk@7530 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 15:16:08 +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 5c39fd102a Tag this a rc1, one more big bug shakeout
git-svn-id: file:///home/svn/framework3/trunk@7526 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 03:30:16 +00:00
HD Moore d67cb3cdde Really fixes #464
git-svn-id: file:///home/svn/framework3/trunk@7525 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 02:52:23 +00:00
HD Moore ba9f7b41b3 Fix save() again
git-svn-id: file:///home/svn/framework3/trunk@7524 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 02:48:00 +00:00
HD Moore 1ad262a53e Fixes #464 by using the correct logic to only save user defined variables and to reset default options after a register_*_options call by a mixin
git-svn-id: file:///home/svn/framework3/trunk@7523 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 02:39:08 +00:00
HD Moore 18ba91cebc Adds the find/save wrapper back, it seems to help a little, but doesn't solve all cases. See #514
git-svn-id: file:///home/svn/framework3/trunk@7517 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-14 22:11:53 +00:00
HD Moore 291aad8cc1 Fixes #516 and fixes #515. This patch makes database support a little more user-friendly. The db commands now accept -h and --help, the db_drivers command will indicate how to install support for a given database, the db_create/db_destroy commands will indicate what tools are required to use them, and the postgres driver will now roperly handle sameuser authentication over a unix domain socket with postgres-pr
git-svn-id: file:///home/svn/framework3/trunk@7516 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-14 21:41:38 +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 d3d406f405 more unitialized goodness
git-svn-id: file:///home/svn/framework3/trunk@7501 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 23:53:17 +00:00
HD Moore f011c7d580 rc1 -> testing
git-svn-id: file:///home/svn/framework3/trunk@7498 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:52:29 +00:00
HD Moore eabfff5aca Adds the last updated date to the output
git-svn-id: file:///home/svn/framework3/trunk@7497 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:50:12 +00:00
James Lee a3c020fef2 more uninitialized var warnings
git-svn-id: file:///home/svn/framework3/trunk@7495 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:11:52 +00:00
James Lee 80ee6157ed fix a few warnings
git-svn-id: file:///home/svn/framework3/trunk@7492 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 20:28:36 +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 62470e47a7 Skip closed/filtered ports when db_autopwning
git-svn-id: file:///home/svn/framework3/trunk@7462 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:58:08 +00:00
James Lee c7967e00d7 handle both 'open' and 'up' for port state in db_services
git-svn-id: file:///home/svn/framework3/trunk@7460 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:29:44 +00:00
James Lee 029d0bae47 save the port state regardless of whether we know the name
git-svn-id: file:///home/svn/framework3/trunk@7459 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:22:03 +00:00
James Lee 73a0ef8b64 actually save port state
git-svn-id: file:///home/svn/framework3/trunk@7458 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:16:52 +00:00
James Lee 7e177962bf tell the user what port we're listening on
git-svn-id: file:///home/svn/framework3/trunk@7452 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 17:39:51 +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
James Lee 3dfaf32bc8 trying out bold colors
git-svn-id: file:///home/svn/framework3/trunk@7450 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 16:49:26 +00:00
James Lee 2cbb32550c fix meterp sessions getting initialized improperly, fix msf> prompt in exploit context after color cmd
git-svn-id: file:///home/svn/framework3/trunk@7449 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 16:10:39 +00:00
James Lee 3628a3d3c6 fix sessions breaking right away when interacting. command dispatcher still appears to be hosed
git-svn-id: file:///home/svn/framework3/trunk@7446 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:55:42 +00:00
HD Moore 3db9bbfaae See #493. Initialize the prompt
git-svn-id: file:///home/svn/framework3/trunk@7445 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:33:14 +00:00
HD Moore 69dbb7b4b0 Address some of #493
git-svn-id: file:///home/svn/framework3/trunk@7444 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:26:40 +00:00
James Lee daf58b6deb get rid of the single-character escapes so we're less likely to see accidental color substitutions
git-svn-id: file:///home/svn/framework3/trunk@7443 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 07:12:56 +00:00
James Lee fd4e4154cd add a new 'color' command that lets the user force color on or off.
git-svn-id: file:///home/svn/framework3/trunk@7442 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 06:58:01 +00:00
James Lee a8d9da0d3d initial color support. will add ability to change colors from console soon. see #344
git-svn-id: file:///home/svn/framework3/trunk@7440 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 03:27:48 +00:00
HD Moore 2bec0701a7 Fixes a crash on startup when no svn directories are present
git-svn-id: file:///home/svn/framework3/trunk@7438 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 03:05:12 +00:00
HD Moore acea0f87fb Correct the formatting of the old age warning. Obviously nobody would have seen this for another 5 days :)
git-svn-id: file:///home/svn/framework3/trunk@7436 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 23:45:21 +00:00
HD Moore 9f2845dcaf Add channel support back in, patch from dragorn
git-svn-id: file:///home/svn/framework3/trunk@7430 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 19:52:18 +00:00
James Lee 7007a80c13 make the vbs generation a little faster and the generated file a little smaller
git-svn-id: file:///home/svn/framework3/trunk@7427 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 18:32:03 +00:00
James Lee 95d9f5e676 raise instead of exit
git-svn-id: file:///home/svn/framework3/trunk@7426 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 18:27:30 +00:00
Joshua Drake c372c68f48 fix whitespace
git-svn-id: file:///home/svn/framework3/trunk@7423 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 06:19:59 +00:00
HD Moore 3853073731 Fixes #489. Change this a bit to be proper syntax
git-svn-id: file:///home/svn/framework3/trunk@7422 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 06:16:29 +00:00
Joshua Drake 07cfae0f14 added myself to author.rb
git-svn-id: file:///home/svn/framework3/trunk@7420 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 04:45:22 +00:00
HD Moore d29f6e17dc Fixes #486. Add the Revision constant abck
git-svn-id: file:///home/svn/framework3/trunk@7416 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 03:22:24 +00:00
HD Moore 5581f5a73b Parse SVN information and warns folks with out of date installations
git-svn-id: file:///home/svn/framework3/trunk@7415 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 01:50:44 +00:00
HD Moore 176e999f08 Merge patches from Ryan Linn. Fixes #438
git-svn-id: file:///home/svn/framework3/trunk@7413 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:33:40 +00:00
HD Moore e92a193f8c Correct a typo
git-svn-id: file:///home/svn/framework3/trunk@7408 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:11:47 +00:00
HD Moore 06372f3c40 See #430. This adds the AllowWin32SEH option to the upper/mixed alphanumeric encoders, providing 100% alphanumeric payloads for Windows platforms
git-svn-id: file:///home/svn/framework3/trunk@7405 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-08 00:45:51 +00:00
HD Moore d09d151f31 Disable stager + single chaining, it causes confusion and often breaks.
git-svn-id: file:///home/svn/framework3/trunk@7400 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-07 22:13:04 +00:00
et 7b832b9d3e Wmap checking for vulnerabilities and launching exploits
git-svn-id: file:///home/svn/framework3/trunk@7399 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-07 21:55:33 +00:00
HD Moore 0fe06c614f Fixes #473. Import Sussaro's patch (wee!)
git-svn-id: file:///home/svn/framework3/trunk@7395 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 21:08:34 +00:00
HD Moore 948e1ba5e9 Dont repeat the stdout
git-svn-id: file:///home/svn/framework3/trunk@7386 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:15:12 +00:00
HD Moore 0cc3db65be This works but stdout needs to be hidden
git-svn-id: file:///home/svn/framework3/trunk@7385 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:43:13 +00:00
HD Moore dc2c355703 Use nmap without the absolute path... Cygwin is annoying.
git-svn-id: file:///home/svn/framework3/trunk@7384 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:32:13 +00:00
HD Moore f985349a26 Place all arguments in quotes
git-svn-id: file:///home/svn/framework3/trunk@7383 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:30:25 +00:00
HD Moore bf0e856c1f Trying a different approach - buffing output to a file and using system to overcome bugs in IO.popen on Cygwin
git-svn-id: file:///home/svn/framework3/trunk@7382 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:27:28 +00:00
HD Moore 55b5b828f2 Use the relative path to nmap
git-svn-id: file:///home/svn/framework3/trunk@7381 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:15:26 +00:00
HD Moore 1c51182b39 One more shot
git-svn-id: file:///home/svn/framework3/trunk@7380 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:12:19 +00:00
HD Moore 5de9a090a9 Another attempt at correct path translation
git-svn-id: file:///home/svn/framework3/trunk@7379 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 17:09:31 +00:00
James Lee adf5b531eb make sure the address type is IP (not mac). fixes #476
git-svn-id: file:///home/svn/framework3/trunk@7378 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:44:02 +00:00
HD Moore 0604fbfd71 Workaround broken cygpath behavior with the cygwin path contains 8.3 names
git-svn-id: file:///home/svn/framework3/trunk@7377 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:43:14 +00:00