Commit Graph

35 Commits

Author SHA1 Message Date
Michael Boman 1102d56a27 Incorporating mboman's save credentials
I don't think the use of the constant is a show stopper since it is
identical to the existing Nessus plugin scheme as well. It doesn't make
it right but it's not a reason to block. Both should be fixed some time.

Made a handful of minor edits regarding file handle management, and also
noted that the act of saving nexpose credentials will always cause the
SSL nag screen to not display.

Thanks for the implementation, mboman!

[Closes #57] [Fixes #6156]

Squashed commit of the following:

commit 8d421ab8e3004bcb67e156b45f1355a608e0320c
Author: Tod Beardsley <todb@metasploit.com>
Date:   Fri Dec 23 15:55:35 2011 -0600

    Adds a comment note about bypassing the SSL verify warning

commit fd956b380f14bbb394f36b0a3c565906f9aed869
Author: Tod Beardsley <todb@metasploit.com>
Date:   Fri Dec 23 15:53:29 2011 -0600

    Changing file write mode from w+ to wb.

commit d884c87482b033b7200d5045ba5f9b2d910f4aa8
Author: Tod Beardsley <todb@metasploit.com>
Date:   Fri Dec 23 15:15:46 2011 -0600

    ::File instead of File throughout

commit 6d72f87e8f175f088ac7beeb80742d50ab01b38a
Author: Tod Beardsley <todb@metasploit.com>
Date:   Fri Dec 23 15:14:54 2011 -0600

    Space change

commit f6f3527595379ba11b3be4341a0c620b06340fbb
Merge: a978d19 2335614
Author: Tod Beardsley <todb@metasploit.com>
Date:   Fri Dec 23 15:13:12 2011 -0600

    Merge branch 'master' of github_r7:rapid7/metasploit-framework into mboman_nexpose

commit a978d1962f756f507fdabb988380a7ecf3ce76bb
Author: Tod Beardsley <todb@metasploit.com>
Date:   Fri Dec 23 15:12:51 2011 -0600

    Minor fixups mostly around ::File handling.

commit bddd0249b9
Merge: 2ddc161 bb2ea62
Author: Michael Boman <michael@michaelboman.org>
Date:   Fri Dec 16 08:39:10 2011 +0100

    Merge branch 'master' of git://github.com/rapid7/metasploit-framework into nexpose

commit 2ddc161671
Author: Michael Boman <michael@michaelboman.org>
Date:   Wed Dec 14 11:44:29 2011 +0100

    msftidy cleanup (whitespace after EOL)

commit b202c7ff3a
Author: Michael Boman <michael@michaelboman.org>
Date:   Wed Dec 14 11:28:13 2011 +0100

    Removed a ncusage call

commit 45da9728d1
Author: Michael Boman <michael@michaelboman.org>
Date:   Wed Dec 14 09:19:58 2011 +0100

    Fixed indenting, removed ncusage function until later...

commit e9f03aafba
Merge: 41d3fae 8dc85f1
Author: Michael Boman <michael@michaelboman.org>
Date:   Wed Dec 14 07:35:17 2011 +0100

    Merge branch 'master' of git://github.com/rapid7/metasploit-framework into nexpose

commit 41d3fae61b
Merge: 63b6f38 d87d8d5
Author: Michael Boman <michael@michaelboman.org>
Date:   Tue Dec 13 20:07:34 2011 +0100

    Merge branch 'master' of git://github.com/rapid7/metasploit-framework into nexpose

commit 63b6f3873d
Merge: b3b7be4 cfa128a
Author: Michael Boman <michael@michaelboman.org>
Date:   Tue Dec 13 17:01:06 2011 +0100

    Merge branch 'master' of git://github.com/rapid7/metasploit-framework into nexpose

commit b3b7be4594
Author: Michael Boman <michael@michaelboman.org>
Date:   Tue Dec 13 16:54:54 2011 +0100

    Nexpose plugin can now save/load credentials
2011-12-23 16:12:34 -06:00
Marc Bevand 2dc4319bba Fix Nexpose plugin bug to allow pass the hash to work 2011-12-20 17:51:47 -06:00
HD Moore c30f328560 Purge code deprecated in the 4.1.0 release 2011-11-10 20:16:14 -06: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
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
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 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
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
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 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 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
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 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 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
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 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
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
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 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
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
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
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