Commit Graph

637 Commits (d079cf8ca5132d8c66de1cc77c263c3c2b59f470)

Author SHA1 Message Date
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 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
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 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 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
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
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
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
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
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
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
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
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
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
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
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
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
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 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 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 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 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
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
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
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 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
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 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 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
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
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
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 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 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
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
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
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
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
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
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 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 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
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
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 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
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
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
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 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 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 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 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 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
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 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
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
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
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
HD Moore 43edce7db8 Correct implementation (any instance of cygdrive in the path indicates a file outside the environment)
git-svn-id: file:///home/svn/framework3/trunk@7376 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:03:40 +00:00
HD Moore 4fde76e8f6 Expand to a windows path if the exe is outside of the cygwin installation
git-svn-id: file:///home/svn/framework3/trunk@7375 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:01:24 +00:00
James Lee e3e2d01fd2 parse nmap xml with a stream parser instead of a tree parser. fixes #251, i hope
git-svn-id: file:///home/svn/framework3/trunk@7368 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 20:26:28 +00:00
HD Moore 176996fe61 Fixes #452. Solves a number of crashes caused by Regexp.new() on 1.9 without an explicit language specified
git-svn-id: file:///home/svn/framework3/trunk@7320 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 17:09:13 +00:00
et 20be000d47 Wmap able to load exploits and check for vulnerabilities. Next step exploit if vulnerable
git-svn-id: file:///home/svn/framework3/trunk@7302 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-29 03:16:27 +00:00
HD Moore 3cf4329335 Updates the autopwn matching algorithm to use multiple ports and service names
git-svn-id: file:///home/svn/framework3/trunk@7298 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-28 18:04:50 +00:00
et 7a24a5495e Fix #414 globaly defined datastore values are now rewriten before RHOSTS, RPORT, SSL are set. Support of hostnames instead of ips. Minor version changes
git-svn-id: file:///home/svn/framework3/trunk@7262 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 22:20:59 +00:00
et dc415c76ca Fixes #364. Added error message detection and signatures
git-svn-id: file:///home/svn/framework3/trunk@7187 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-18 19:46:30 +00:00
HD Moore 4d4c0905ef Slightly improved error handling for auxiliary and exploit modules. Improved brute forcing mode for mssql_login. Serious errors (broken code, etc) are bubbled up in auxiliary scanners now. Fixes #384 by reading wordlists one line at a time and not buffering
git-svn-id: file:///home/svn/framework3/trunk@7185 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-18 18:03:02 +00:00
HD Moore d0b07c0c3f Fixes #353. If the problem persists, make sure 'cygpath' is installed, it sounds like the root cause is 3.3-dev being run inside of an existing cygwin environment.
git-svn-id: file:///home/svn/framework3/trunk@7176 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-17 06:41:37 +00:00
kris e0f885d50c Let db_autopwn -I/-X work with a single addr
git-svn-id: file:///home/svn/framework3/trunk@7126 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-04 20:20:43 +00:00
kris 47d8e02389 Specify that db_autopwn -b is default
git-svn-id: file:///home/svn/framework3/trunk@7125 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-04 19:48:48 +00:00
kris 50f2f90646 db_autopwn -I/-X fix for Ruby 1.9 (calling each() on a string). Now commas
are allowed in the host specs in general.


git-svn-id: file:///home/svn/framework3/trunk@7124 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-04 19:43:06 +00:00
HD Moore 06818ae2bf Handle cases where a scanned host has no ports open
git-svn-id: file:///home/svn/framework3/trunk@7122 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-03 20:05:36 +00:00
HD Moore 35fcf8c2b2 Swap around rbreadline - load it by default, but also allow the old readline with the -L (--real-readline) parameter to msfconsole. This also fixes absolute path handling for msfconsole command passthrough
git-svn-id: file:///home/svn/framework3/trunk@7115 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-02 14:17:03 +00:00
kris 8efeb58285 add simple sessions -K to kill all. useful at least when i'm testing.
git-svn-id: file:///home/svn/framework3/trunk@7100 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-30 23:00:15 +00:00
et debf126d32 Save wmap reports to a file
git-svn-id: file:///home/svn/framework3/trunk@7096 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-30 04:20:06 +00:00
kris 41157e97fe make run -a functional
git-svn-id: file:///home/svn/framework3/trunk@7068 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-26 22:34:48 +00:00
HD Moore f3708fb933 Fixes #278. Handle cases where a reload fails and indicate why
git-svn-id: file:///home/svn/framework3/trunk@7046 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-20 20:22:45 +00:00
HD Moore 1d21e41156 Fix references searching from the console. Fixes #304
git-svn-id: file:///home/svn/framework3/trunk@7043 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-20 19:40:00 +00:00
kris 29134be27a Fixes #336. Don't add 'NSS-<id>' to ref list when importing Nessus nbe/xml to
database (report/patch by erwinpdev).

This NSS- stuff was in the original nbe code before things were copied and
reworked for the xml handling.  I'm not sure why it was there; the NSS id is
already available in the database (name).

Note that ref lists generated here can be empty now, which I think is fine.



git-svn-id: file:///home/svn/framework3/trunk@7040 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-18 17:33:46 +00:00
HD Moore b5da2c72f2 Fixes #333. Adds core and api version checks to all module loads. To specify a minimum version, add the following constant to the top of the module (outside of the class definition):
RequiredVersions = [3.3, 1.0] # MSF 3.3+ API 1.0+


git-svn-id: file:///home/svn/framework3/trunk@7037 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-15 13:50:32 +00:00
HD Moore 0c584bae10 Match against the fullname not just the refname for -m regex filters in db_autopwn
git-svn-id: file:///home/svn/framework3/trunk@7029 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-11 15:32:23 +00:00
kris da61141a79 Fixes #281, pt2. This time fixing unrelated whitespace changes from the
original patch.  I (lazily) kept it because 'svn diff -x -b' showed no
difference and it was formatted fine in vi.  This is obviously not a good
way of assessing bad whitespace formatting :)


git-svn-id: file:///home/svn/framework3/trunk@7007 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-05 23:57:42 +00:00
kris 53775ed59b Fixes #281. Add .nessus db support via db_import_nessus_xml
Based on work by mephux and erwinp.  I started with the latter's patch and
reworked it to avoid all of duplication from the .nbe stuff.


git-svn-id: file:///home/svn/framework3/trunk@7005 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-05 04:29:53 +00:00
HD Moore 64ff8b5181 Add missing -oX argument
git-svn-id: file:///home/svn/framework3/trunk@7004 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-04 15:14:19 +00:00
HD Moore e7b200bc23 Expand cygwin to win32 path for db_nmap on windows inside of cygwin
git-svn-id: file:///home/svn/framework3/trunk@7002 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-04 15:04:06 +00:00
James Lee bd2da7c12a revert overzealous commit
git-svn-id: file:///home/svn/framework3/trunk@6961 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-18 04:53:35 +00:00
James Lee 08d50e0a5b fix a bug in colorization where %c gets replaced before %cya; wouldn't have been a problem until colorization gets put back in
git-svn-id: file:///home/svn/framework3/trunk@6960 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-18 04:49:16 +00:00
HD Moore 4bcf42ae3c Apply a patch from Brett Blackham for loading plugins from the user's .msf3 directory as well as the system one
git-svn-id: file:///home/svn/framework3/trunk@6933 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-01 14:07:05 +00:00
HD Moore 55ae0e10d8 Make a stink about missing openssl support in the console driver
git-svn-id: file:///home/svn/framework3/trunk@6887 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-23 13:28:47 +00:00
HD Moore 238f8d798f Let vulns refer to hosts w/o a service, add a mac and address6 field to the hosts table.
git-svn-id: file:///home/svn/framework3/trunk@6866 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-22 13:25:33 +00:00
HD Moore d981332b89 Better search behavior for console and msfweb
git-svn-id: file:///home/svn/framework3/trunk@6706 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-24 01:31:16 +00:00
HD Moore 68888c469f Indicate why database support is not enabled
git-svn-id: file:///home/svn/framework3/trunk@6623 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 16:28:28 +00:00
et 7c16f5b5c9 Added wmap sql command to access db directly from wmap. XML reporting.
git-svn-id: file:///home/svn/framework3/trunk@6587 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-28 03:26:27 +00:00
HD Moore 304944d792 db_del_port from jabra
git-svn-id: file:///home/svn/framework3/trunk@6498 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-26 14:53:37 +00:00
James Lee a8863ce330 possible fix to make postgres work again
git-svn-id: file:///home/svn/framework3/trunk@6478 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-12 07:09:03 +00:00
kris 17ad98e8e3 Add 'Msf' to 'Context' in the connect command's socket for db_tracker
git-svn-id: file:///home/svn/framework3/trunk@6476 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-11 12:07:50 +00:00
kris 162a835212 Keep the back command from removing the database backend stuff since it's
been moved to metasploit core



git-svn-id: file:///home/svn/framework3/trunk@6474 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-10 23:56:28 +00:00
kris 1253e7a044 Catch ENOENT for db_destroy for sqlite3 so no backtrace is printed. I decided
to give a little error message for trying to destroy a nonexistent db still.


git-svn-id: file:///home/svn/framework3/trunk@6468 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 03:30:18 +00:00
kris b5a8c86241 use print_error
git-svn-id: file:///home/svn/framework3/trunk@6467 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 03:11:12 +00:00
kris 6b28b786ac watch out for RuntimeError in loadpath
git-svn-id: file:///home/svn/framework3/trunk@6466 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 03:04:29 +00:00
James Lee 8fd36fecf5 make plugin load failure a bit more graceful
git-svn-id: file:///home/svn/framework3/trunk@6460 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-07 05:59:38 +00:00
HD Moore 1073b04eb7 Remove sqlite2 support, force load sqlite3 gem
git-svn-id: file:///home/svn/framework3/trunk@6425 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 03:40:25 +00:00
kris 62a1d3037d just a whitespace fix
git-svn-id: file:///home/svn/framework3/trunk@6419 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 23:04:28 +00:00
HD Moore 191289450e Meterpreter is now the default payload for windows autopwn targets
git-svn-id: file:///home/svn/framework3/trunk@6418 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 21:51:35 +00:00
HD Moore 709362ff53 This patch moves all database interaction into the metasploit core. Usage is about the same, except instead of loading a plugin, you call db_driver <driver_name>
git-svn-id: file:///home/svn/framework3/trunk@6417 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 21:42:30 +00:00
kris ea1336d2f3 use more apt print methods for search messages
git-svn-id: file:///home/svn/framework3/trunk@6344 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-15 16:05:06 +00:00
kris b1edecb728 Fix "route remove" by guarding against constant NameError/backtrace
git-svn-id: file:///home/svn/framework3/trunk@6330 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-10 16:47:53 +00:00
kris b12a3d993e update version command description and comment
git-svn-id: file:///home/svn/framework3/trunk@6329 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-10 16:25:00 +00:00
James Lee 96c8f6127c Replace += with << for Strings in a bunch of places.
git-svn-id: file:///home/svn/framework3/trunk@6318 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 07:55:47 +00:00
HD Moore 90c3586ac3 Fix error handling for the save command
git-svn-id: file:///home/svn/framework3/trunk@6317 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 07:41:28 +00:00
kris e316610f5d remove unused vars
git-svn-id: file:///home/svn/framework3/trunk@6285 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-03 23:50:53 +00:00
kris 05b5cd695b add -z to connect command to just try the connection, then return (useful for
seeing if a host is reachable or not with certain settings)


git-svn-id: file:///home/svn/framework3/trunk@6236 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-19 14:24:07 +00:00
James Lee 08fbd064d1 make the help command a little more helpful
git-svn-id: file:///home/svn/framework3/trunk@6230 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-17 04:53:06 +00:00
James Lee 8039bf729c tab completion for loadpath
git-svn-id: file:///home/svn/framework3/trunk@6229 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-15 21:52:10 +00:00
James Lee fd962ca307 type fix (route -> sessions)
git-svn-id: file:///home/svn/framework3/trunk@6226 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-15 05:12:28 +00:00
kris cd9ad0f08d Don't join/split args on spaces in load command as that breaks things like
using quotes to have multi-word tokens; shellwords takes care of this stuff


git-svn-id: file:///home/svn/framework3/trunk@6222 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-15 02:48:25 +00:00
kris 13cc54cbe5 Add -P source port option to connect
git-svn-id: file:///home/svn/framework3/trunk@6184 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-26 03:06:58 +00:00
kris 32868c4b0f adding db_import_amap_mlog for reading in from a thc-amap machine-readable log
git-svn-id: file:///home/svn/framework3/trunk@6169 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-21 02:12:10 +00:00
kris 4a15116fe6 move a stray alias to underneath the original method
git-svn-id: file:///home/svn/framework3/trunk@6168 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-20 02:15:19 +00:00
kris a595def093 watch out for an already closed socket in connect (meterpreter session, etc)
git-svn-id: file:///home/svn/framework3/trunk@6161 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-18 01:21:42 +00:00
kris 17f4396d1d add args checking for connect
git-svn-id: file:///home/svn/framework3/trunk@6160 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-18 00:00:26 +00:00
kris d53ac9648c typo: correct name in "sessions" help/usage
git-svn-id: file:///home/svn/framework3/trunk@6153 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 21:31:24 +00:00
kris 1c6715ff3b Run multiple resource files from single command (was getting ArgumentError)
git-svn-id: file:///home/svn/framework3/trunk@6102 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 20:29:50 +00:00
kris f6fd33a3eb add usage/help to resource command
git-svn-id: file:///home/svn/framework3/trunk@6101 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 20:16:08 +00:00
kris 4b34d5a8b1 use print() for search usage
git-svn-id: file:///home/svn/framework3/trunk@6100 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 19:58:22 +00:00
Patrick Webster 65bbf8c052 Alphabetically sort the tab completion module name output.
git-svn-id: file:///home/svn/framework3/trunk@6098 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 07:36:58 +00:00
kris 41fbd5500e shorten regexes
git-svn-id: file:///home/svn/framework3/trunk@6081 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-07 02:50:10 +00:00
kris f86ba09020 use print_status and print_error instead of print_line where applicable in
connect's output for [*] and [-]


git-svn-id: file:///home/svn/framework3/trunk@6077 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-06 06:12:58 +00:00
James Lee 23177cbb0d fix unload tabs
git-svn-id: file:///home/svn/framework3/trunk@6063 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-04 05:52:13 +00:00
kris bba174bc61 Add -C to 'connect' command to try to use CRLF for the EOL sequence, which is
useful for talking to some stringent servers.  This currently just replaces
the final '[^\r]\n' from gets() with '\r\n', which works well while interacting


git-svn-id: file:///home/svn/framework3/trunk@6052 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-28 21:35:11 +00:00
kris ee9986a582 don't split connect's short usage info across lines
git-svn-id: file:///home/svn/framework3/trunk@6051 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-28 20:41:44 +00:00
kris 8bc6051787 Add -w to 'connect' command for specifying connect timeout
git-svn-id: file:///home/svn/framework3/trunk@6050 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-28 20:38:02 +00:00
kris 6b9ea78869 Add -S to 'connect' command for specifying source addr
git-svn-id: file:///home/svn/framework3/trunk@6049 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-28 20:02:17 +00:00
kris 658727ff27 whoops, reverse extra part of last commit
git-svn-id: file:///home/svn/framework3/trunk@6048 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-26 07:13:08 +00:00
kris b012696f1f just use boolean @@support_ipv6 instead of "yes"/"no"
git-svn-id: file:///home/svn/framework3/trunk@6047 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-26 07:11:49 +00:00
kris 410d52626c Add -i option to 'connect' command to send contents of a file
git-svn-id: file:///home/svn/framework3/trunk@6044 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-25 01:13:29 +00:00
kris 5944cfc13c improve some usage info for connect command
git-svn-id: file:///home/svn/framework3/trunk@6040 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-23 17:47:05 +00:00
kris bbc9ad1f75 Adding netcat-like "connect" console command. It currently supports proxying,
comm selection and SSL options.


git-svn-id: file:///home/svn/framework3/trunk@6039 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-23 07:43:22 +00:00
kris ff92efa219 Add db_del_host command
git-svn-id: file:///home/svn/framework3/trunk@6038 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-22 03:19:39 +00:00
kris 0e8ce1cc46 Move my portspec parsing code from scanner/portscan/tcp to Rex as
Socket.portspec_crack and use it to also replace the incomplete
parsing code used for db_autopwn


git-svn-id: file:///home/svn/framework3/trunk@6033 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-20 20:34:05 +00:00
kris 248f1e9fc3 Remove "#{xxx.to_s}" redundancies ('s/\(#{[^}]*\)\.to_s}/\1}/g')
git-svn-id: file:///home/svn/framework3/trunk@6022 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 07:11:08 +00:00
James Lee 7f59e5ff15 make sessions behave like jobs when no options are given
git-svn-id: file:///home/svn/framework3/trunk@6013 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-15 06:05:11 +00:00
et 6f83ec2cf8 Added global variable WMAP_EXCLUDE_FILE with regular expresion to define what not to scan. By default images are not tested. Thanks Martin Muench for comments.
git-svn-id: file:///home/svn/framework3/trunk@6000 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-07 05:50:49 +00:00
kris 8eda1cccbf typo
git-svn-id: file:///home/svn/framework3/trunk@5990 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-02 02:03:22 +00:00
et 6f8a1ab13a Fixed minor help presentation issue
git-svn-id: file:///home/svn/framework3/trunk@5989 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-01 03:59:27 +00:00
et 8547688d7d Added wmap profiles capabilities to use as a method to run specific modules
git-svn-id: file:///home/svn/framework3/trunk@5988 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-01 03:48:23 +00:00
et 3e19245054 Fixed handling of root website directory. Minor presentation fixes in test modules
git-svn-id: file:///home/svn/framework3/trunk@5987 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-30 22:41:09 +00:00
et fb62ec351c Added wmap_targets -a add parameter as a quick way to create a new target
git-svn-id: file:///home/svn/framework3/trunk@5985 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-30 06:35:43 +00:00
kris 80cc5e3bb6 Don't save "unknown" service names from Nmap or Nessus
git-svn-id: file:///home/svn/framework3/trunk@5983 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-28 12:57:10 +00:00
kris 29919b1d84 Strip whitespace from saved service names from NBEs
git-svn-id: file:///home/svn/framework3/trunk@5982 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-28 12:51:35 +00:00
kris cba228e8bf close NBE after import
git-svn-id: file:///home/svn/framework3/trunk@5980 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-24 22:28:22 +00:00
HD Moore 6219b1873e Commit modified version of a patch from Marcell 'SkyOut' Dietl (Helith). This adds port inclusion, exclusion, and regex matching, as well as -q for 'quiet' mode (only status output, no module output)
git-svn-id: file:///home/svn/framework3/trunk@5952 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-18 22:01:15 +00:00
HD Moore 05088e59f9 Close before deleting
git-svn-id: file:///home/svn/framework3/trunk@5944 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-18 14:57:41 +00:00
HD Moore a7595fce6c Fixes #250. Solves an old bug with background jobs not working right, fixes the 'background modules dont work' bug as well.
git-svn-id: file:///home/svn/framework3/trunk@5926 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-16 20:54:41 +00:00
et 0518511160 Fixed bug regarding website root directory
git-svn-id: file:///home/svn/framework3/trunk@5904 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 02:22:35 +00:00
kris 7b002d4288 remove unused exception variables
git-svn-id: file:///home/svn/framework3/trunk@5882 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 06:00:54 +00:00
et b4cbe4ff8d Multiple bug fixes. Fixed query modules now resolved to correct function. Corrected in proxy and wmap code handling of RHOSTS as hostnames are not in use. Fixed reporting as target port was not handled properly and modules modified to reflect new wmap_target methods.
git-svn-id: file:///home/svn/framework3/trunk@5869 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 04:38:05 +00:00
HD Moore d1052fdaf1 Fixes #215. Reinitialize the input/output after a reload
git-svn-id: file:///home/svn/framework3/trunk@5851 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-08 17:48:21 +00:00
HD Moore 5af9abd81d Fixes #194. Add nicer call stacks to auxiliary modules
git-svn-id: file:///home/svn/framework3/trunk@5850 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-07 22:54:49 +00:00
kris c52f889082 Report hosts as alive through db_tracker and the db Nmap and Nessus commands
git-svn-id: file:///home/svn/framework3/trunk@5819 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-31 18:39:53 +00:00
kris 025b7410a0 Remove spurious ] from db_services output for consistency with other db output
git-svn-id: file:///home/svn/framework3/trunk@5799 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-29 13:10:22 +00:00
kris 3e8c5ecebc Fix db_add_host (undefined variable)
git-svn-id: file:///home/svn/framework3/trunk@5795 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-27 22:47:09 +00:00
et 75be2e33ad Added module reporting and wmap_reports command
git-svn-id: file:///home/svn/framework3/trunk@5789 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-27 02:22:30 +00:00
Ramon de C Valle f124597a56 Code cleanups
git-svn-id: file:///home/svn/framework3/trunk@5773 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 21:03:39 +00:00
et 7e73ed8c15 first attempt of reporting implementation.
git-svn-id: file:///home/svn/framework3/trunk@5771 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 20:32:14 +00:00
et c153d1fea0 Wmap database merged, new wmap_generic module, fix website tree display and docs.
git-svn-id: file:///home/svn/framework3/trunk@5740 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-12 03:46:49 +00:00
HD Moore 0320809c18 Fix session interaction again
git-svn-id: file:///home/svn/framework3/trunk@5734 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-10 05:01:49 +00:00
et fa3ce57fed Implemented Auxiliary::WMAPScanUniqueQuery.
git-svn-id: file:///home/svn/framework3/trunk@5704 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-01 03:57:57 +00:00
HD Moore c9bb1bbcd0 Move th fd.unlink for the db_nmap command
git-svn-id: file:///home/svn/framework3/trunk@5686 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 05:01:18 +00:00
HD Moore b001e4684d Import first version of WMAP from ET LoWNOISE
git-svn-id: file:///home/svn/framework3/trunk@5675 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-22 22:32:20 +00:00
HD Moore 9b34f931d2 Fixes #240. Resets tab completion after irb
git-svn-id: file:///home/svn/framework3/trunk@5653 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-05 22:10:18 +00:00
HD Moore f52f4d7b62 Add |)ruid's infos to author, fix an issue with auxiliary options checking.
git-svn-id: file:///home/svn/framework3/trunk@5577 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 20:14:47 +00:00
James Lee 2d344e64df browser_autopwn now works with mozilla_compareto, mozilla_navigatorjava, and firefox_queryinterface; increased reliability of OS and browser detection
git-svn-id: file:///home/svn/framework3/trunk@5563 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-22 07:28:05 +00:00
HD Moore 380aba15b0 Implements the readline workaround, tested with regular and meterpreter sessions
git-svn-id: file:///home/svn/framework3/trunk@5544 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-27 20:51:36 +00:00
James Lee 487d7d0bec spaces -> tabs. =(
git-svn-id: file:///home/svn/framework3/trunk@5536 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-22 20:01:41 +00:00
James Lee 4733e56c5a add 'resource' command, no tab completion yet because i'm lazy
git-svn-id: file:///home/svn/framework3/trunk@5535 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-22 19:59:12 +00:00
James Lee 73dd9aa89f show the name of the module in the output of 'show options' and friends
git-svn-id: file:///home/svn/framework3/trunk@5532 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-18 08:30:26 +00:00
James Lee e1a25c1383 payload generate now honors ENCODER instead of requiring -e
git-svn-id: file:///home/svn/framework3/trunk@5508 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-19 23:56:17 +00:00
James Lee c0b39cc234 "set foo" prints the value of foo if it exists; really, that's it this time
git-svn-id: file:///home/svn/framework3/trunk@5507 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-17 06:27:03 +00:00
James Lee 2db9dd6ab2 Reversing over greedy commit. =(
git-svn-id: file:///home/svn/framework3/trunk@5506 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-17 06:17:41 +00:00
James Lee 93199c5610 "set foo" prints the value of foo if it exists
git-svn-id: file:///home/svn/framework3/trunk@5505 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-17 05:29:32 +00:00
James Lee 8116b32e14 allow comments in resource files.
git-svn-id: file:///home/svn/framework3/trunk@5498 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-26 18:28:41 +00:00
HD Moore 509fc09382 Lots of updates related to <secret project X>.
git-svn-id: file:///home/svn/framework3/trunk@5424 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-02 04:46:13 +00:00
HD Moore 3685b7a133 Fixes #190. Check for missing path and handle all exceptions.
git-svn-id: file:///home/svn/framework3/trunk@5403 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-09 07:50:20 +00:00
HD Moore 6677beb174 Merged revisions 5366-5377 via svnmerge from
svn+ssh://metasploit.com/home/svn/framework3/branches/framework-3.1

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


git-svn-id: file:///home/svn/framework3/trunk@5378 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-28 03:06:31 +00:00
HD Moore e17f43b9d5 Prevent duplicate error messages from appearing
git-svn-id: file:///home/svn/framework3/trunk@5359 4d416f70-5f16-0410-b530-b9f4589650da
2008-01-26 22:46:49 +00:00