Commit Graph

349 Commits (548873f6233808fd46c3bf19d4fb114d3f322580)

Author SHA1 Message Date
Tod Beardsley db90989db4 Merge pull request #76 from kernelsmith/lab_tab_complete
lab_load now tab completes from data/lab (lab plugin), for real tho
2011-12-22 13:21:11 -08:00
Jonathan Cran e48031cf22 squashed lab upload commit 2011-12-22 14:56:45 -06:00
Joshua Smith ee94e3e697 lab_load now tab completes from data/lab (lab plugin), for real tho 2011-12-22 01:25:43 -05:00
Marc Bevand 2dc4319bba Fix Nexpose plugin bug to allow pass the hash to work 2011-12-20 17:51:47 -06:00
Tod Beardsley cfa3e9818e Merge pull request #68 from averagesecurityguy/master
Cosmetic changes to openvas plugin output. Replaced puts with print_line.
2011-12-20 15:37:09 -08:00
Stephen Haywood 18635387d5 Changed puts to print_line. 2011-12-18 20:03:49 -05:00
Stephen Haywood a35564c723 cosmetic changes to openvas plugin output 2011-12-17 18:46:30 -05:00
HD Moore e91a64f91f Remove xmlrpc support in this branch (only msgpack is supported) 2011-12-05 13:07:25 -06:00
HD Moore c30f328560 Purge code deprecated in the 4.1.0 release 2011-11-10 20:16:14 -06:00
Carlos Perez a41b2f9654 Patch and changes sent in by Zate
git-svn-id: file:///home/svn/framework3/trunk@14134 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-01 01:42:40 +00:00
Tod Beardsley b070bcd763 See #3597. Whoops adding an Id keyword.
git-svn-id: file:///home/svn/framework3/trunk@14095 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-27 22:46:12 +00:00
Tod Beardsley 247ba1f931 Fixes #3597 by adding the plugin. Thanks Jeff!
git-svn-id: file:///home/svn/framework3/trunk@14094 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-27 22:44:42 +00:00
Joshua Drake 62c8c6ea9f big msftidy pass, ping me if there are issues
git-svn-id: file:///home/svn/framework3/trunk@14034 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-23 11:56:13 +00:00
Carlos Perez 258094046a Removed space in print_line call
git-svn-id: file:///home/svn/framework3/trunk@13900 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-12 23:28:02 +00:00
Tod Beardsley a4cd830442 Fixes #5436. Thanks averagesecurityguy!
git-svn-id: file:///home/svn/framework3/trunk@13851 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-10 16:10:20 +00:00
HD Moore 5c4be24088 Consistent spelling
git-svn-id: file:///home/svn/framework3/trunk@13811 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-03 19:22:30 +00:00
Wei Chen 4376207e8d Apply fix #5512
git-svn-id: file:///home/svn/framework3/trunk@13777 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-23 02:04:22 +00:00
amaloteaux c332ed5e58 typo
git-svn-id: file:///home/svn/framework3/trunk@13514 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-10 20:33:42 +00:00
Jonathan Cran 1b854622c9 redundant comment is redundant.
git-svn-id: file:///home/svn/framework3/trunk@13421 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-30 09:04:32 +00:00
Jonathan Cran 2d589e72dc allow us to parse ranges and addresses from a file
git-svn-id: file:///home/svn/framework3/trunk@13420 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-30 08:59:16 +00:00
HD Moore 7f758e42e8 Fix up SSL behavior (correctly, this time). Update the msfrpc tools to support the new MessagePack code, fix various defaults in the plugin. Fixes #5116
git-svn-id: file:///home/svn/framework3/trunk@13416 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 23:58:05 +00:00
Jonathan Cran 24d2b48f64 Initial commit of an esx/esxi driver for the lab plugin (thanks to kernelsmith). Also updated documentation in lib/lab/README.
git-svn-id: file:///home/svn/framework3/trunk@13151 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-11 05:52:51 +00:00
HD Moore f67675a0ff Update string matches
git-svn-id: file:///home/svn/framework3/trunk@13076 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 07:40:28 +00:00
James Lee b53d23ebac remove deprecated db plugins.
git-svn-id: file:///home/svn/framework3/trunk@13049 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-28 18:05:21 +00:00
Jonathan Cran 6ebf4781bc handle a couple of error cases, improve the way commands run on multiple vms
git-svn-id: file:///home/svn/framework3/trunk@12856 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-05 06:57:24 +00:00
Jonathan Cran 74e40f8e15 copypasta error, fixes #4633.
git-svn-id: file:///home/svn/framework3/trunk@12824 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 21:39:12 +00:00
Jonathan Cran df56bff027 do the right thing w/ a suspend or reset command on all vms. fixes #4630
git-svn-id: file:///home/svn/framework3/trunk@12814 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 06:18:38 +00:00
HD Moore aacfd0dcda Support for the new NeXpose release
git-svn-id: file:///home/svn/framework3/trunk@12788 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 20:28:28 +00:00
Jonathan Cran 65886d7fa3 add the comma, thanks kernelsmith
git-svn-id: file:///home/svn/framework3/trunk@12768 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 05:04:11 +00:00
Jonathan Cran 840b20a371 add the run_command and open_uri commands back in
git-svn-id: file:///home/svn/framework3/trunk@12767 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 04:46:29 +00:00
Jonathan Cran 1ba8db7321 add help, thanks for the suggestion kernelsmith
git-svn-id: file:///home/svn/framework3/trunk@12766 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-30 04:11:47 +00:00
HD Moore f126805ea1 Cleanup SSL key passing to match egypt's changes (cert + key in the same PEM). Add token management functions
git-svn-id: file:///home/svn/framework3/trunk@12756 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 04:01:15 +00:00
HD Moore a8c474d7d6 Add the versioned (1.0) RPC backend
git-svn-id: file:///home/svn/framework3/trunk@12679 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-22 03:50:14 +00:00
James Lee 14b20159c4 fix case sensitivity and a variable scoping typo
git-svn-id: file:///home/svn/framework3/trunk@12669 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-20 06:14:22 +00:00
HD Moore 5cda8acbaf Switch to raw-xml, not the invalid ns-raw
git-svn-id: file:///home/svn/framework3/trunk@12665 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-19 18:21:25 +00:00
HD Moore 80f71b441e This adds a basic RPC server that operates over HTTP and uses MessagePack. The client/server wrappers are still being finalized. MessagePack libraries are avavailable for all major languages ( http://msgpack.org/ ) and this implementation is ridiculous fast and binary safe, relative to XMLRPC.
git-svn-id: file:///home/svn/framework3/trunk@12616 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-14 18:38:44 +00:00
HD Moore bfef110932 Add a compatibility check, prevents errors caused by interaction with out of date engines
git-svn-id: file:///home/svn/framework3/trunk@12318 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-14 21:45:42 +00:00
HD Moore c6b3bfacfe Merge in an openvas-bridge update from kost
git-svn-id: file:///home/svn/framework3/trunk@12056 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-21 05:02:14 +00:00
et dd05954b34 Fix wmap to test parameters, error inj. module as example
git-svn-id: file:///home/svn/framework3/trunk@11790 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-22 04:27:40 +00:00
Jonathan Cran 7101a9330e don't print the arguments
git-svn-id: file:///home/svn/framework3/trunk@11777 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 17:09:21 +00:00
Jonathan Cran 0c37c97444 Hauke's patch for the lab plugin
git-svn-id: file:///home/svn/framework3/trunk@11776 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 17:04:01 +00:00
HD Moore ad691ec05b Additional commands for the nexpose engine
git-svn-id: file:///home/svn/framework3/trunk@11774 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 09:16:06 +00:00
Jonathan Cran c18e44b385 Merging in VirtualBox functionality from Hauke / Fidius Project - this updates the lab plugin to be able to use the backend virtualbox functionality. To use it, create a config file, and add the following lines:
- vmid: [name of vm]
  driver: virtualbox 

see data/lab/test_targets.yml for more info



git-svn-id: file:///home/svn/framework3/trunk@11754 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-16 02:17:23 +00:00
et d26e955e69 Test unique forms wmap
git-svn-id: file:///home/svn/framework3/trunk@11747 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-13 04:36:00 +00:00
et 07ac964630 wmap add regex to run specific modules
git-svn-id: file:///home/svn/framework3/trunk@11717 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-06 20:35:27 +00:00
Jonathan Cran d3d3fba4ef updated plugin
git-svn-id: file:///home/svn/framework3/trunk@11716 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 21:34:26 +00:00
et baab86fc52 WMAP 1.0 and first pass on some modules
git-svn-id: file:///home/svn/framework3/trunk@11709 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 05:57:26 +00:00
James Lee bf2e5cc576 reload the module after editing
git-svn-id: file:///home/svn/framework3/trunk@11660 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-28 19:47:35 +00:00
James Lee 1af730148f add a description to auto_add_route
git-svn-id: file:///home/svn/framework3/trunk@11656 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-27 17:33:39 +00:00
Matt Weeks 2ee44b5da7 Expose tokens/users so other plugins can add additional RPC methods.
git-svn-id: file:///home/svn/framework3/trunk@11528 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-10 02:21:22 +00:00
Joshua Drake 755615ee68 add k-rad plugin to auto-reload-and-exec fileformat exploits on change
git-svn-id: file:///home/svn/framework3/trunk@11458 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-31 20:16:11 +00:00
Joshua Drake d572a08192 report when running the editor fails, remove puts
git-svn-id: file:///home/svn/framework3/trunk@11457 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-31 19:54:26 +00:00
Jonathan Cran b5d0f1837f front-end changes for the lab plugin
git-svn-id: file:///home/svn/framework3/trunk@11434 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 19:47:56 +00:00
HD Moore cd2088ee96 Import the OpenVAS bridge from Kost. Go see his talk: http://www.berlinsides.org/node/14
git-svn-id: file:///home/svn/framework3/trunk@11428 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-28 17:45:05 +00:00
Joshua Drake 0d6b2c8229 refactor nexpose db check again, thx jcran
git-svn-id: file:///home/svn/framework3/trunk@11323 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-13 20:13:27 +00:00
Jonathan Cran 4b517d979f backing out my change in favor of jduck's commit (shouldn't have stole his commit in the first place :p)
git-svn-id: file:///home/svn/framework3/trunk@11322 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-13 19:51:38 +00:00
Jonathan Cran 2bad3b9ce1 jduck's fix for nexpose plugin. only allow us to connect if there's a db configured / active
git-svn-id: file:///home/svn/framework3/trunk@11321 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-13 19:46:33 +00:00
Joshua Drake a398170c0d check for a database in nexpose_connect
git-svn-id: file:///home/svn/framework3/trunk@11320 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-13 19:21:27 +00:00
HD Moore cae748efa5 Merge plugin changes from Zate
git-svn-id: file:///home/svn/framework3/trunk@11017 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 03:35:08 +00:00
James Lee e03272a97f plugin names can't have spaces (patch from Zate)
git-svn-id: file:///home/svn/framework3/trunk@10960 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-09 17:21:30 +00:00
HD Moore 8f4cb4fbf6 Merge Zate Berg's latest patch
git-svn-id: file:///home/svn/framework3/trunk@10938 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-07 01:57:17 +00:00
James Lee 238242ecb9 add latest nessus plugin patches from Zate, fixes #2704
git-svn-id: file:///home/svn/framework3/trunk@10685 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-14 18:54:35 +00:00
James Lee e0404acd09 apply patch from Zate, fixes #2716, #2712, #2702, #2703, and #2704
git-svn-id: file:///home/svn/framework3/trunk@10507 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-28 23:19:59 +00:00
Carlos Perez f7602751d0 Updated Nessus Plugin
git-svn-id: file:///home/svn/framework3/trunk@10491 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-27 00:39:15 +00:00
James Lee ae48757fd5 new nessus plugin patches from Zate Berg
git-svn-id: file:///home/svn/framework3/trunk@10450 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 23:17:13 +00:00
HD Moore 2cd8b7d5e2 Update from Zate
git-svn-id: file:///home/svn/framework3/trunk@10396 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 14:27:34 +00:00
HD Moore 541c192f12 Updates from Zate, renamed commands to match the existing plugins
git-svn-id: file:///home/svn/framework3/trunk@10383 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 02:18:25 +00:00
HD Moore 7c540583b5 Latest code from Zate
git-svn-id: file:///home/svn/framework3/trunk@10376 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 22:18:56 +00:00
Tod Beardsley 71394d0763 Implemented a little more sophisticated inline help for the mighty lab plugin, mainly because "help" gives a lot of non-lab help and I can't be bothered to scroll.
Also fixes some whitespace.



git-svn-id: file:///home/svn/framework3/trunk@10350 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-17 19:29:59 +00:00
HD Moore b8863ce760 Merge in Zate Berg's Nessus bridge plugin
git-svn-id: file:///home/svn/framework3/trunk@10325 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-15 08:41:49 +00:00
Matt Weeks 9253085d13 Add plugin support to rpc. Fixes #2292
git-svn-id: file:///home/svn/framework3/trunk@10177 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-28 18:21:17 +00:00
James Lee ad2b69dced add database access to rpc. thanks Ryan Linn for the patch\!
git-svn-id: file:///home/svn/framework3/trunk@10043 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 21:26:26 +00:00
Tod Beardsley 0955e804df See #2412. Fixes the meterpreter script credcollect.rb and the plugin db_credcollect to use the new Creds table.
git-svn-id: file:///home/svn/framework3/trunk@10041 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 19:18:27 +00:00
Tod Beardsley 6d6a547b34 Fixes #2412. Adds a creds table, modifies the db_report_auth API, adds the db_creds and db_add_cred commands.
git-svn-id: file:///home/svn/framework3/trunk@10034 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 00:58:20 +00:00
HD Moore d14ea12996 Add the console api to xmlrpc
git-svn-id: file:///home/svn/framework3/trunk@10028 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-17 22:53:05 +00:00
Jonathan Cran c8aa885e5a wtf copy/paste fail :/
git-svn-id: file:///home/svn/framework3/trunk@10009 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 20:02:34 +00:00
Jonathan Cran b6d493201a oops, should be able to load from a file - lab_load_file [labdef] works properly now
git-svn-id: file:///home/svn/framework3/trunk@10008 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 20:00:16 +00:00
Jonathan Cran d28e1c0d4f tagged id / rev - slight mods to editor
git-svn-id: file:///home/svn/framework3/trunk@10005 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 16:55:42 +00:00
Joshua Drake 4a796f794a uniq-ify class names
git-svn-id: file:///home/svn/framework3/trunk@9958 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-05 02:23:34 +00:00
Jonathan Cran 045a0c4a13 initial lab plugin commit
git-svn-id: file:///home/svn/framework3/trunk@9942 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-29 03:50:59 +00:00
James Lee 671d243aaa put the stop command in core instead of base and default the extra argument to nil. this should allow a cleaner exit without breaking existing code (i hope). see #2247 (again) and also fixes #1010
git-svn-id: file:///home/svn/framework3/trunk@9907 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-21 22:37:26 +00:00
James Lee 45c869d015 revert the rpc.stop patch as it breaks other rpc stuff. i'll have a better fix for this later today.
git-svn-id: file:///home/svn/framework3/trunk@9890 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 20:36:09 +00:00
James Lee 88c6bf13dd apply patch from scriptjunkie to stop the xmlrpc daemon. fixes #2247
git-svn-id: file:///home/svn/framework3/trunk@9887 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-20 19:12:09 +00:00
Tod Beardsley 3c199b0364 Fixes #824. PcapLog now works, and doesn't use racket nor packetfu -- just straight pcaprub, since I'm not doing anything exciting with them aside from saving to a file.
Also, it's a proper plugin now, not just a singleton, with a command dispather and everything.

Pretty much totoally rewritten. Since it hasn't worked for at least 5 months, I doubt anyone will be shocked by the API change.



git-svn-id: file:///home/svn/framework3/trunk@9834 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-14 20:38:19 +00:00
Joshua Drake 219c298109 fix silly error handling arguments
git-svn-id: file:///home/svn/framework3/trunk@9637 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-30 19:28:31 +00:00
HD Moore 48732165f3 Fix the parameters for the nexpose plugin to match the new DB api
git-svn-id: file:///home/svn/framework3/trunk@9603 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-24 03:35:43 +00:00
Joshua Drake edfd16ca0c stop printing utf-8 high-ascii-art to non-utf8 terminals
git-svn-id: file:///home/svn/framework3/trunk@9514 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-14 20:20:45 +00:00
Joshua Drake d8609b85e3 style compliance fixes
git-svn-id: file:///home/svn/framework3/trunk@9460 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-09 18:41:58 +00:00
et 8a911f6762 Wmap cleanup started
git-svn-id: file:///home/svn/framework3/trunk@9442 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-06 03:53:07 +00:00
Jonathan Cran cdb962e5f1 00:48 <jabra> class Plugin::Editor < Msf::Plugin
git-svn-id: file:///home/svn/framework3/trunk@9391 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-02 01:48:59 +00:00
Jonathan Cran 2bd20752d6 editor plugin - see: http://blog.metasploit.com/2010/05/its-ruby-not-turtles-all-way-down.html
git-svn-id: file:///home/svn/framework3/trunk@9389 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-01 19:28:03 +00:00
Joshua Drake 0e72894e58 more cleanups
git-svn-id: file:///home/svn/framework3/trunk@9212 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 17:13:09 +00:00
James Lee ec35fb0312 don't wait on the database when reporting hashes
git-svn-id: file:///home/svn/framework3/trunk@9112 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-20 03:10:48 +00:00
James Lee 79ac118f47 targ_host -> target_host
git-svn-id: file:///home/svn/framework3/trunk@8910 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 01:11:10 +00:00
HD Moore 2efa31cfec Closes #1244 with a caveat. If the template injected calls ExitProcess(), the payload will be killed. This means that -k is not compatible with our default executable
git-svn-id: file:///home/svn/framework3/trunk@8896 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 15:55:24 +00:00
HD Moore 9ccce2a166 Move the nexpose api code into a separate file
git-svn-id: file:///home/svn/framework3/trunk@8821 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-15 03:19:25 +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 f53a56f147 Fixes #1075. Handle the 'reason' parameter to on_session_close
git-svn-id: file:///home/svn/framework3/trunk@8781 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-11 13:52:56 +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 4617eba258 fix\ a\ bug\ in\ 1.8\ where\ instance methods of singletons aren't mirrored as class\ methods by calling the instance method
git-svn-id: file:///home/svn/framework3/trunk@8503 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-15 15:10:09 +00:00
James Lee 894664ef72 add a plugin to create new routes through previously-unknown subnets
git-svn-id: file:///home/svn/framework3/trunk@8409 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 18:21:13 +00:00
HD Moore 3c36bcdc90 Fixes #776 and #777. Patch from jhart
git-svn-id: file:///home/svn/framework3/trunk@8329 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-30 20:36:44 +00:00
HD Moore acceb274da Integrate a sound plugin, based on Robin Wood's patch
git-svn-id: file:///home/svn/framework3/trunk@8215 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-24 18:33:32 +00:00
James Lee a60733c5dd make a comment actually reflect the new code
git-svn-id: file:///home/svn/framework3/trunk@8165 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-19 19:08:54 +00:00
James Lee 061706940b make db_tokens command work again
git-svn-id: file:///home/svn/framework3/trunk@8090 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-09 01:47:39 +00:00
James Lee 9cdef831bb use the new database api. fixes 753
git-svn-id: file:///home/svn/framework3/trunk@8086 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-07 19:14:44 +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 829b239b22 Fixes #740. Correct a typo introduced to the nexpose plugin.
git-svn-id: file:///home/svn/framework3/trunk@8030 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 05:32:13 +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
HD Moore 50a227fb14 Fixes #731. Patch from Oliver Kleinecke corrects minrank usage in the nexpose plugin. Thanks!
git-svn-id: file:///home/svn/framework3/trunk@7988 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 18:40:14 +00:00
HD Moore 7cb0aced4d Fix a trailing comma, breaks ruby 1.8
git-svn-id: file:///home/svn/framework3/trunk@7958 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 12:45:08 +00:00
HD Moore 0a0ddc35d0 Pass minrank from nexpose plugin to autopwn
git-svn-id: file:///home/svn/framework3/trunk@7953 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 03:55:56 +00:00
James Lee 4f92d9f431 Revamp the event system and add some ui hooks. Sessions are still ghetto -- we get interact events (in a lame way) but no input or output events yet. see 619
git-svn-id: file:///home/svn/framework3/trunk@7947 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-22 18:52:48 +00:00
HD Moore f157d66625 See #678, handle the new range behavior
git-svn-id: file:///home/svn/framework3/trunk@7822 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 15:37:26 +00:00
James Lee 6665669b47 use range_walker to allow nmap notation in -I and -E arguments
git-svn-id: file:///home/svn/framework3/trunk@7783 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 21:52:03 +00:00
James Lee 48c8b35b5a single ip addresses in the new rangewalker are separated by spaces, not commas. fixes 666
git-svn-id: file:///home/svn/framework3/trunk@7778 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 19:17:42 +00:00
HD Moore 72fa415fd1 Fixes #629 by handling error conditions with a APIError exception
git-svn-id: file:///home/svn/framework3/trunk@7721 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-06 04:16:24 +00:00
HD Moore 12e8c97a97 Fixes #612. This adds an alternative syntax for nexpose_connect for when the password contains a ':' or an '@'
git-svn-id: file:///home/svn/framework3/trunk@7712 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-05 13:54:42 +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 63b087ad1c Adds a token hunter plugin for locating a specific user's credentials across many sesssions
git-svn-id: file:///home/svn/framework3/trunk@7682 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 15:27:07 +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
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
HD Moore 8341facfd0 Add better help output and avoid an exception when no address range is specified
git-svn-id: file:///home/svn/framework3/trunk@7661 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 20:51:18 +00:00
HD Moore 09f1138fa4 Commit the plugin for the release
git-svn-id: file:///home/svn/framework3/trunk@7655 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 03:10:16 +00:00
HD Moore a92fbb1ff4 Fixes #526. Correct socket name and call to super in the socket output io
git-svn-id: file:///home/svn/framework3/trunk@7548 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 23:35:34 +00:00
James Lee c6b9f85937 notify about connections, too
git-svn-id: file:///home/svn/framework3/trunk@7435 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 20:50:11 +00:00
James Lee 85cc629f20 make sure client sockets get closed and log a bit more info
git-svn-id: file:///home/svn/framework3/trunk@7434 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 20:23:24 +00:00
James Lee 0098f89901 make the name consistent so you can unload the same name you loaded.
git-svn-id: file:///home/svn/framework3/trunk@7367 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 18:20:44 +00:00
James Lee c9f5ce05e1 handle the database not being connected
git-svn-id: file:///home/svn/framework3/trunk@7366 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-05 18:17:38 +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
James Lee 267cdee685 report failure instead of success when loading the db_* stubs
git-svn-id: file:///home/svn/framework3/trunk@6481 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-14 03:58:12 +00:00
James Lee 95419cce6f add stubs for deprecated db_* plugins
git-svn-id: file:///home/svn/framework3/trunk@6480 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-14 03:54:18 +00:00
kris 37c2e301ed replacing defunct framework URL in header comments in most modules and pcap_log
git-svn-id: file:///home/svn/framework3/trunk@6479 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-13 14:33:26 +00:00
kris a785add956 Fix db_tracker to ignore sockets without 'Msf' in their context to prevent
it from generating errors


git-svn-id: file:///home/svn/framework3/trunk@6475 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-11 12:00:12 +00:00
kris 900fdb7198 use File.join instead of hard /
git-svn-id: file:///home/svn/framework3/trunk@6461 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-07 08:33:47 +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
kris 6dac26b0ff fix for msfd/SSL
git-svn-id: file:///home/svn/framework3/trunk@6457 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-03 04:41:07 +00:00
HD Moore fe07a46342 Fix up includes for WMAP
git-svn-id: file:///home/svn/framework3/trunk@6444 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-30 02:56:11 +00:00
HD Moore 5f484b5ede Dont report to the db if the db isnt active
git-svn-id: file:///home/svn/framework3/trunk@6442 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-30 02:55:13 +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
HD Moore f8cef46c90 Adds the credcollect plugin and script from tebo
git-svn-id: file:///home/svn/framework3/trunk@6410 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 07:44:44 +00:00
James Lee 81d4afa706 filters have to be quoted because spaces screw up the option parser
git-svn-id: file:///home/svn/framework3/trunk@6225 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-15 04:54:26 +00:00
kris 3587f730d1 add pcap filter option to pcap_log plugin
git-svn-id: file:///home/svn/framework3/trunk@6223 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-15 02:49:09 +00:00
James Lee 9a6025aacc Add a plugin to capture packets
git-svn-id: file:///home/svn/framework3/trunk@6213 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-12 16:21:50 +00:00
kris 4c9730b1d8 Adding host-based access control to msfd
git-svn-id: file:///home/svn/framework3/trunk@6089 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-08 05:04:26 +00:00
kris 20d216b6b9 set @mythread=nil in stop_thread so the correct message will be printed if
an attempt is made to stop a thread that isn't running


git-svn-id: file:///home/svn/framework3/trunk@6069 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-04 07:45:33 +00:00
kris 2b6cde1974 fix command description
git-svn-id: file:///home/svn/framework3/trunk@6068 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-04 07:38:18 +00:00
kris 9790286a23 pass opts to real write
git-svn-id: file:///home/svn/framework3/trunk@6067 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-04 07:34:52 +00:00
kris 8546da23e4 pass opts to real write
git-svn-id: file:///home/svn/framework3/trunk@6066 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-04 07:31:31 +00:00
kris ac160be94e fix port numbers in comments
git-svn-id: file:///home/svn/framework3/trunk@6065 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-04 07:25:43 +00:00
kris 11ffd478d4 Add SSL option -s to msfd
git-svn-id: file:///home/svn/framework3/trunk@6027 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 23:18:39 +00:00
HD Moore 71c5175a85 This patch introduces a really basic RPC service. It is still a long way from its final version
git-svn-id: file:///home/svn/framework3/trunk@5991 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-02 22:09:34 +00:00
et 4bd81c7f2f Version adjustment and minor documentation update
git-svn-id: file:///home/svn/framework3/trunk@5892 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-12 05:21:45 +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
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 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 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 e2027604e8 Commit a new postgres plugin (with edits) from Ulisses Castro
git-svn-id: file:///home/svn/framework3/trunk@5662 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-16 04:26:49 +00:00
HD Moore ab8f38bac8 Comment typo fix from Kris Katterjohn
git-svn-id: file:///home/svn/framework3/trunk@5438 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-10 21:18:07 +00:00
HD Moore 3df1e64b39 connect to an existing database with db_create
git-svn-id: file:///home/svn/framework3/trunk@5253 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 09:18:41 +00:00
HD Moore b143ea1951 Fix up the sqlite2 plugin too
git-svn-id: file:///home/svn/framework3/trunk@5252 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 09:12:27 +00:00
HD Moore 5a321074b2 Dont use sqlite3 executable to create the db
git-svn-id: file:///home/svn/framework3/trunk@5251 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 08:59:05 +00:00
HD Moore 85a2f82afd Bugrit somemore
git-svn-id: file:///home/svn/framework3/trunk@5250 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 08:32:05 +00:00
HD Moore 5570094a8f Bugrit
git-svn-id: file:///home/svn/framework3/trunk@5249 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 08:31:01 +00:00
HD Moore 4a7683a88a Try try again
git-svn-id: file:///home/svn/framework3/trunk@5248 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 08:28:59 +00:00
HD Moore 5e2f1ea7cc More tempfile nonsense
git-svn-id: file:///home/svn/framework3/trunk@5247 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 08:27:24 +00:00
HD Moore d6e5b0a25d Fix use of Tempfile
git-svn-id: file:///home/svn/framework3/trunk@5246 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 08:20:48 +00:00
HD Moore a396f655d5 Fixes to the sqlite3 database driver, the db_nmap command, and msfgui
git-svn-id: file:///home/svn/framework3/trunk@5242 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 04:05:51 +00:00
HD Moore 6f79e14c91 Fixes #157. Patches from egypt@nmt.edu
git-svn-id: file:///home/svn/framework3/trunk@5137 4d416f70-5f16-0410-b530-b9f4589650da
2007-10-05 19:23:45 +00:00
HD Moore 6bcac9f2a2 Nifty socket logger
git-svn-id: file:///home/svn/framework3/trunk@5106 4d416f70-5f16-0410-b530-b9f4589650da
2007-09-19 21:34:23 +00:00
HD Moore 2571a4603a Change the sqlite plugins to use the sqlite system commands to instantiate a new database. This resolves an issue where non-x86-linux systems try to use the existing database files as templates.
git-svn-id: file:///home/svn/framework3/trunk@4946 4d416f70-5f16-0410-b530-b9f4589650da
2007-05-20 06:11:33 +00:00
HD Moore 7c7df73a8f Removed the extraneous @framework = framework code
git-svn-id: file:///home/svn/framework3/trunk@4440 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 22:59:01 +00:00
HD Moore 497ca2d3f5 This example shows how to automatically interact with sesssions
git-svn-id: file:///home/svn/framework3/trunk@4439 4d416f70-5f16-0410-b530-b9f4589650da
2007-02-18 22:51:59 +00:00
HD Moore d39d662c95 Fix "localhost" bug for connect calls as well
git-svn-id: file:///home/svn/framework3/trunk@4182 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-10 08:27:51 +00:00
HD Moore d20e4bac39 Added support for MySQL backends, minor fixes/improvements to the Postgres driver
git-svn-id: file:///home/svn/framework3/trunk@4177 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-10 07:28:31 +00:00
HD Moore 95d94e9e32 Proper handling of the password argument to the postgres system commands
git-svn-id: file:///home/svn/framework3/trunk@4176 4d416f70-5f16-0410-b530-b9f4589650da
2006-12-10 06:29:31 +00:00
HD Moore 6c3c67fec0 More bug fixes...
git-svn-id: file:///home/svn/framework3/trunk@3911 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-18 00:29:14 +00:00
HD Moore e96ed4c254 All database plugins now have a standard interface
git-svn-id: file:///home/svn/framework3/trunk@3910 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-18 00:16:25 +00:00
HD Moore d559ad6a4e Postgres driver layer is complete, but not yet tested
git-svn-id: file:///home/svn/framework3/trunk@3909 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-18 00:05:09 +00:00
HD Moore f5298f5a94 The postgres plugin is updated and now works with autopwn/load/etc
git-svn-id: file:///home/svn/framework3/trunk@3904 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-17 07:17:27 +00:00
HD Moore 6a9f9ebee7 Cleanups for database management, use a persistent sqlite3 database with the db_sqlite3 plugin
git-svn-id: file:///home/svn/framework3/trunk@3897 4d416f70-5f16-0410-b530-b9f4589650da
2006-09-16 06:45:06 +00:00
HD Moore f8ff8c6d7b Debugging plugin
git-svn-id: file:///home/svn/framework3/trunk@3776 4d416f70-5f16-0410-b530-b9f4589650da
2006-07-30 18:44:04 +00:00
HD Moore 7d0690ed2e Cleanups in preparation for alpha-r4
git-svn-id: file:///home/svn/incoming/trunk@3645 4d416f70-5f16-0410-b530-b9f4589650da
2006-05-30 15:44:48 +00:00
HD Moore 037b90a931 Cut down version
git-svn-id: file:///home/svn/incoming/trunk@3591 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-05 00:12:30 +00:00
HD Moore 7b4fb0d6aa Tons of fixes for aux/recon/db
git-svn-id: file:///home/svn/incoming/trunk@3589 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-03 04:33:30 +00:00
HD Moore b4189e521d More recon hackery
git-svn-id: file:///home/svn/incoming/trunk@3585 4d416f70-5f16-0410-b530-b9f4589650da
2006-04-02 22:33:34 +00:00
HD Moore 908de4521d Tempalte for filtering outgoing socket data
git-svn-id: file:///home/svn/incoming/trunk@3580 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-29 21:46:06 +00:00
HD Moore 096a7e6c71 Fixed event dispatching for db objects
git-svn-id: file:///home/svn/incoming/trunk@3574 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-21 05:29:26 +00:00
HD Moore bab8745ba8 Backend code
git-svn-id: file:///home/svn/incoming/trunk@3573 4d416f70-5f16-0410-b530-b9f4589650da
2006-03-21 04:37:48 +00:00
HD Moore 88658064df /usr/bin/ruby vs /usr/bin/env ruby
git-svn-id: file:///home/svn/incoming/trunk@3242 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-17 06:46:23 +00:00
Matt Miller 2685aef9ef command passthru support for msfconsole
git-svn-id: file:///home/svn/incoming/trunk@3184 4d416f70-5f16-0410-b530-b9f4589650da
2005-12-07 03:06:31 +00:00
Matt Miller a2df616bd4 devguide samples
git-svn-id: file:///home/svn/incoming/trunk@3154 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-28 23:49:48 +00:00
Matt Miller 3558cd7777 switch to DefaultHost/DefaultPort
git-svn-id: file:///home/svn/incoming/trunk@3152 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-28 21:56:09 +00:00
Matt Miller 514e760b96 implemented msfd as a plugin
git-svn-id: file:///home/svn/incoming/trunk@3151 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-28 21:38:48 +00:00
Matt Miller 2f05b6959f updated sample to support console command dispatcher registration
git-svn-id: file:///home/svn/incoming/trunk@3059 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-23 14:34:11 +00:00
Matt Miller 36f6c79986 fixed up plugins to be loadable with local input/output handles
git-svn-id: file:///home/svn/incoming/trunk@3058 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-23 14:02:30 +00:00
Matt Miller 22542607cf very basic start to msfweb
git-svn-id: file:///home/svn/incoming/trunk@3056 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-22 03:20:09 +00:00
Matt Miller 09a41d4d5c framework plugins
git-svn-id: file:///home/svn/incoming/trunk@3053 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-19 16:25:26 +00:00