Commit Graph

124 Commits (9d93891395a8a52d16b5637fe1fe575b4c396d80)

Author SHA1 Message Date
Tod Beardsley 7b4c7d44db Adds a Burp Session XML parser and importer. Also includes fix to Rex's HTTP header parser to ensure that it uses only unencoded regexes.
git-svn-id: file:///home/svn/framework3/trunk@12846 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 21:17:57 +00:00
Tod Beardsley 110f4df649 Adding a webapp vulnscanner parser for Appscan
git-svn-id: file:///home/svn/framework3/trunk@12826 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 22:16:08 +00:00
Tod Beardsley f03ffaf13d Fixing a stack trace when the imported site cannot be resolved.
git-svn-id: file:///home/svn/framework3/trunk@12825 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 22:12:50 +00:00
Tod Beardsley 0a7f6b8528 Adds support for importing Acunetix webvuln XML reports.
git-svn-id: file:///home/svn/framework3/trunk@12813 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 06:17:38 +00:00
Tod Beardsley d3f19d8777 Moving the character and cdata readers to the nokogiri mixin. They've all been the same so far.
git-svn-id: file:///home/svn/framework3/trunk@12800 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 17:37:54 +00:00
Tod Beardsley 8600bc5bef Foundstone registers a fingerprint instead of directly setting os_name. Also updates the Windows version regex for mbsa. Also adds a fall-through fingerprint parser (which foundstone uses).
git-svn-id: file:///home/svn/framework3/trunk@12798 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 16:31:27 +00:00
Tod Beardsley 43b78a6b8f Adds an import note for MBSA and Foundstone.
git-svn-id: file:///home/svn/framework3/trunk@12792 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 02:21:10 +00:00
Mario Ceballos 2e0d399262 fixes some warnings.
git-svn-id: file:///home/svn/framework3/trunk@12791 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 01:14:47 +00:00
Tod Beardsley 23e3d4274d Adds a parser for MBSA XML files.
git-svn-id: file:///home/svn/framework3/trunk@12790 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 00:01:46 +00:00
Tod Beardsley c94577448e Cleans up service name normalization.
git-svn-id: file:///home/svn/framework3/trunk@12787 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 19:27:22 +00:00
Tod Beardsley 90bbacd75e Fixes #4620, attribute hashes are passed through a sanitizer now.
git-svn-id: file:///home/svn/framework3/trunk@12786 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 19:01:54 +00:00
Tod Beardsley f420b9c9e9 Adding an importer for Foundstone/Mcafee Network Inventory reports.
git-svn-id: file:///home/svn/framework3/trunk@12780 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 15:24:42 +00:00
Tod Beardsley e85a350257 Fixes #4605 -- only try to yield if we have a block to yield to.
git-svn-id: file:///home/svn/framework3/trunk@12762 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-29 03:00:13 +00:00
Tod Beardsley b6f79ec070 Updating nmap's nokogiri state tracker as well.
git-svn-id: file:///home/svn/framework3/trunk@12744 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 18:15:49 +00:00
Tod Beardsley 19f50d9b1d Updates the nokogiri streaming document state machine to something a little more grown up.
git-svn-id: file:///home/svn/framework3/trunk@12742 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 17:53:56 +00:00
Tod Beardsley a891d53be4 Adding a Nokogiri stream parser for Nexpose raw XML files.
git-svn-id: file:///home/svn/framework3/trunk@12740 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 17:30:11 +00:00
Tod Beardsley 3eabf41a67 Adds a Nokogiri parser for Nexpose vuln imports.
git-svn-id: file:///home/svn/framework3/trunk@12737 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-26 20:29:47 +00:00
Tod Beardsley 528e9e2b3a update from chlee
git-svn-id: file:///home/svn/framework3/trunk@12723 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 19:26:41 +00:00
Tod Beardsley 252830f3dd See #4471 - Moving off some common methods to a mixin.
git-svn-id: file:///home/svn/framework3/trunk@12720 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 18:48:23 +00:00
Tod Beardsley e09d4fb771 Patch from chlee for the nexpose XML parser. Adds "potential" as a vulnerable marker (so imports them), adds import cases for description and solution as well.
git-svn-id: file:///home/svn/framework3/trunk@12707 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 00:24:20 +00:00
Tod Beardsley 38504b39a8 Warn the user if there's a truncated nmap file.
git-svn-id: file:///home/svn/framework3/trunk@12704 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-24 21:48:22 +00:00
Tod Beardsley 81e1b41840 Fixes #4578. If the user has Nokogiri of a reasonable version installed, use that to parse Nmap-created XML documents. Otherwise, fall back to the existing REXML parser.
git-svn-id: file:///home/svn/framework3/trunk@12702 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-24 19:40:50 +00:00
Tod Beardsley 60dcac616e Renames some nessus-imported vulnerabilities to drop the NSS identifier and just stick with the plugin name (if available). Also drops junk NSS-0 vulnerabilities.
git-svn-id: file:///home/svn/framework3/trunk@12653 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 22:18:43 +00:00
James Lee 7c2455b704 un-revert the last of r12600's overzealousness. see #4378 and r12569
git-svn-id: file:///home/svn/framework3/trunk@12649 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 17:40:48 +00:00
Tod Beardsley f542bdbb84 Fixes r12634, should be a regex not a not-equal. Using unless instead of if to avoid negative matching.
git-svn-id: file:///home/svn/framework3/trunk@12648 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 17:37:04 +00:00
Tod Beardsley 5f3e451e4d Fixes #4441. I believe this will solve the empty element problem for the nmap parser, but I'm having trouble reproducing it. Basically it wraps tag_start in a begin/rescue, and will ignore bad calls to nil objects (and nil objects only).
git-svn-id: file:///home/svn/framework3/trunk@12634 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 13:49:35 +00:00
Tod Beardsley 7f21eb8406 Allows for nessus imports to grab the plugin name as well as the plugin ID.
git-svn-id: file:///home/svn/framework3/trunk@12609 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-13 16:29:07 +00:00
HD Moore 9ce47c01bd Reverting the autoload changes until we can upgrade to a new ActiveSupport library or find a workaround
git-svn-id: file:///home/svn/framework3/trunk@12600 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 20:03:55 +00:00
James Lee 2e1d25dad7 store some state so we can associate scripts with the right port/host. fixes #4378
git-svn-id: file:///home/svn/framework3/trunk@12569 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 18:10:56 +00:00
Tod Beardsley ce90282884 See #4378 -- this should limit the nmap parser to script tags that are associated only with ports. egyp7 may have a better way with dealing with this though, so not calling it fixed yet.
git-svn-id: file:///home/svn/framework3/trunk@12568 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 17:24:43 +00:00
Tod Beardsley 2031c0d288 Importing Nexpose reports should retain test keys (which are usually some kind of proof or expanded details about a vulnerability).
git-svn-id: file:///home/svn/framework3/trunk@12442 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 17:31:26 +00:00
HD Moore b24b787e0a Add the right class wrappers
git-svn-id: file:///home/svn/framework3/trunk@12426 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 19:35:25 +00:00
HD Moore 4426a1b7f2 Port of the python Manifest.mbdb parser
git-svn-id: file:///home/svn/framework3/trunk@12424 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 18:21:13 +00:00
James Lee 03fdd9a0d0 add support method used in previous commit (r12341)
git-svn-id: file:///home/svn/framework3/trunk@12342 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-17 00:35:32 +00:00
James Lee 827bec98d6 ljust the option names so we don't have funky alignment for multi-char option names
git-svn-id: file:///home/svn/framework3/trunk@12335 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 15:57:52 +00:00
James Lee 857b5c786b don't store less accurate nmap fingerprints, see #4099
git-svn-id: file:///home/svn/framework3/trunk@12302 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 23:05:07 +00:00
James Lee 36367f8a67 save os version info (usually windows service packs) and close the names tag, so we don't store every xml tag's text as a hostname
git-svn-id: file:///home/svn/framework3/trunk@12298 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 22:16:25 +00:00
James Lee cd8866d22f add doc for initialize
git-svn-id: file:///home/svn/framework3/trunk@12235 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 17:32:17 +00:00
James Lee dcefdc5f28 whitespace and rdoc fixes
git-svn-id: file:///home/svn/framework3/trunk@12234 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 17:27:12 +00:00
James Lee 7444436750 fix directives for rdoc
git-svn-id: file:///home/svn/framework3/trunk@12233 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 17:06:59 +00:00
Tod Beardsley b68396351a See #3941. This is a first attempt at supporting driving nmap via a metasploit module. It's a somewhat hefty checkin that includes the Nmap auxiliary mixin as well as an oracle login bruteforce module that uses it.
This definitely needs to be tested on Win32 before it can be called f i x e d, due to the differences between the nmap binaries and the way files are created and used.

Also, the oracle_login scanner could use another once-over for error handling -- don't rely on that yet.

Once this all works the way I expect, I'll document the procedure more thoroghly so people can take advantage.



git-svn-id: file:///home/svn/framework3/trunk@11948 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-13 22:52:50 +00:00
HD Moore 2618e4fffe Add traceroute parsing to nmap
git-svn-id: file:///home/svn/framework3/trunk@11661 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-28 23:32:14 +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
HD Moore 652764ebd3 Merge in nCircle support from Dave Lassalle, handle file reads more consistently
git-svn-id: file:///home/svn/framework3/trunk@10902 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 21:44:16 +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
HD Moore 5a2444eb24 Clean up web_vuln import, use additional fields
git-svn-id: file:///home/svn/framework3/trunk@10635 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-11 02:57:07 +00:00
HD Moore 6a47af814a Basic, still buggy support for NetSparker XML
git-svn-id: file:///home/svn/framework3/trunk@10585 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 06:24:26 +00:00
HD Moore 1afba58f94 Fix typos
git-svn-id: file:///home/svn/framework3/trunk@10584 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 04:16:48 +00:00
HD Moore 3250ab13e0 Add a parser for Retina XML
git-svn-id: file:///home/svn/framework3/trunk@10582 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 02:33:57 +00:00
Tod Beardsley 50c59a9ab1 Skip nmap port imports where the result is unknown and the target is really localhost.
git-svn-id: file:///home/svn/framework3/trunk@9553 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-18 03:03:11 +00:00
James Lee 9fe0186ddb document in a comment the fact that vulns don't have service info yet
git-svn-id: file:///home/svn/framework3/trunk@9213 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 18:16:23 +00:00
James Lee 1ab399d0ea use a stream parser to import NeXpose raw xml, short-circuit find_or_create_ref to avoid going to the task queue when possible
git-svn-id: file:///home/svn/framework3/trunk@9199 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 19:16:52 +00:00
HD Moore 2539a6fc09 Updated nmap parsing, store notes for last boot and os matches
git-svn-id: file:///home/svn/framework3/trunk@8494 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 19:07:15 +00:00
HD Moore bfa3ae28cb Import OS and hostname information
git-svn-id: file:///home/svn/framework3/trunk@8491 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 18:32:37 +00:00
James Lee d261b39206 actually save the result of the merge
git-svn-id: file:///home/svn/framework3/trunk@8072 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-05 18:18:49 +00:00
James Lee 3b6126bfd9 actually commit what i said i was committing. =(
git-svn-id: file:///home/svn/framework3/trunk@7567 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 06:35:44 +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 19749865b0 Performance patch from Yoann Guillot <john-metasploit[at]ofjj.net>
git-svn-id: file:///home/svn/framework3/trunk@6316 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 23:41:47 +00:00
HD Moore 95f6aa0d02 Revert last commit temporarily
git-svn-id: file:///home/svn/framework3/trunk@6313 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 23:00:17 +00:00
HD Moore aa4274a3bb Upgrading metasm...
git-svn-id: file:///home/svn/framework3/trunk@6312 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 22:58:19 +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
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
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 95f8210853 major doc update
git-svn-id: file:///home/svn/incoming/trunk@3029 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-15 05:22:13 +00:00
Matt Miller 6a5870ddcd updated comments to be more uniformed in class definition
git-svn-id: file:///home/svn/incoming/trunk@3004 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-02 16:49:45 +00:00
Matt Miller 15ce3c424b added is_usable check
git-svn-id: file:///home/svn/incoming/trunk@3003 4d416f70-5f16-0410-b530-b9f4589650da
2005-11-02 14:18:50 +00:00
Matt Miller 203f185ad7 rockin 32 windows payloads, fixed some bugs, other cool shit, OptInt, what what what
git-svn-id: file:///home/svn/incoming/trunk@2796 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 23:32:34 +00:00
Matt Miller b14a626ad1 fixed nop handler n stuff
git-svn-id: file:///home/svn/incoming/trunk@2795 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-18 14:39:00 +00:00
Matt Miller 645725a3b5 config file parsing, datastore persistence, shared data stores, save in the ui
git-svn-id: file:///home/svn/incoming/trunk@2761 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-15 22:30:04 +00:00
Matt Miller e5186edd13 option import fix, switched to using shellwords
git-svn-id: file:///home/svn/incoming/trunk@2748 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-13 22:57:29 +00:00
Matt Miller 0cd473ce43 yea yea
git-svn-id: file:///home/svn/incoming/trunk@2724 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-11 05:25:50 +00:00
Matt Miller 2c6014fbb3 pretty output
git-svn-id: file:///home/svn/incoming/trunk@2705 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 08:33:29 +00:00
Matt Miller 26a28807eb oops
git-svn-id: file:///home/svn/incoming/trunk@2704 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 07:27:50 +00:00
Matt Miller 01aff25bd0 how you like me now, gold teef when I smile
git-svn-id: file:///home/svn/incoming/trunk@2703 4d416f70-5f16-0410-b530-b9f4589650da
2005-07-10 07:15:20 +00:00