Commit Graph

82 Commits (6306f8888a64318d4033563b4b43f569285ab498)

Author SHA1 Message Date
Tod Beardsley c532cfd2ef Fixes a problem where vulns were sometimes given the reference of the one before it.
git-svn-id: file:///home/svn/framework3/trunk@13947 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-16 04:46:16 +00:00
Tod Beardsley b72ca9dcc8 Fixes #5452.
Fixes #5446 for real.
Breaks up the regex to more managable registers, ensures that nil is never returned.


git-svn-id: file:///home/svn/framework3/trunk@13729 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-14 16:41:30 +00:00
Tod Beardsley 0413dc25c5 Fixes #5446 by ensuring the method is always sane.
git-svn-id: file:///home/svn/framework3/trunk@13723 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-12 19:59:29 +00:00
James Lee f16e593628 report udp protocol correctly, see #5260, r13569
git-svn-id: file:///home/svn/framework3/trunk@13570 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-15 22:39:41 +00:00
James Lee 4779c039f0 protocol != proto. fixes #5260
git-svn-id: file:///home/svn/framework3/trunk@13569 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-15 22:29:57 +00:00
Tod Beardsley 7667e5aa74 More of the same.
git-svn-id: file:///home/svn/framework3/trunk@13439 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-30 23:50:04 +00:00
Tod Beardsley 58f7618b78 Fixes #5144. Repro's with nexpose-raw.xml in sample data -- before the fix, DNS on port 53 would be marked as "Postfix" which is the same as the service prior, 25/tcp. After the fix, it is appropriately blank. (Same with 80/tcp and 443/tcp both being Apache -- technically probably correct but the service fingerprint isn't there for 443 in the import).
Checking other service importers for the same kind of problem, but it looks unique to nexpose-raw.



git-svn-id: file:///home/svn/framework3/trunk@13438 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-30 23:35:13 +00:00
HD Moore 9f8cbc4145 First pass at an import, still missing a few items to call this done
git-svn-id: file:///home/svn/framework3/trunk@13390 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-28 21:17:30 +00:00
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