1
0
mirror of https://github.com/nmap/nmap.git synced 2026-02-03 03:59:02 +00:00
Commit Graph

59 Commits

Author SHA1 Message Date
fyodor
6cf3b33924 Update version number to 5.21 to reflect the latest Nmap user (even though technically the 5.21 release is coming from the /nmap-exp/stable-5.2 branch 2010-01-27 02:51:09 +00:00
david
3c09069ee4 Show a nicer error message in Ndiff when an input file can't be opened. 2010-01-25 23:07:16 +00:00
fyodor
df19889e22 Regenerate all the auto-generated Nmap files in prep for the next release 2010-01-15 08:27:21 +00:00
fyodor
8d4edcb4fb auto-generated files in prep for next release 2009-12-24 21:53:45 +00:00
fyodor
a0da2ad148 Remove some junk lines that got left in the CHANGELOG 2009-11-23 07:19:33 +00:00
fyodor
a8c6c0cce0 I'm still not quite done with the CHANGELOG--this release has a LOT of improvements! Also, I changed the version to 5.10BETA1 and regenerated the appropriate files 2009-11-21 11:23:37 +00:00
fyodor
07dae5d498 Next release will be 5.05BETA2 to distinguish it from the BETA1 used in svn for the last several months 2009-11-19 08:30:27 +00:00
david
05e5348b57 Normalize the Ndiff exit codes.
0 if the scans are equal,
	1 if they differ, and
	2 for runtime errors.
Add tests and man page documentation.
2009-07-30 14:40:46 +00:00
david
25e77a8535 Add <refmiscinfo source="..."> and <refmiscinfo manual="..."> to
ndiff.xml to avoid FIXME errors in ndiff.1.
2009-07-23 03:41:30 +00:00
david
3a4a181f2d Remove extraports state inference from Ndiff. This was a feature that,
if there was only one extraports state, would create a Port object for
each scanned port that was not listed explictly. So for example, if a
scan of 100 ports had 5 open ports and an extraports of "filtered",
Ndiff would create 95 port records in the "filtered" state in addition
to the 5 "open". If there was more than one extraports state this was
not possible.

This turned out to be a slow operation, out of all proportion to its
utility. Here are times for a diff of random-1.xml and random-2.xml,
before and after:

real    0m11.912s
user    0m10.970s
sys     0m0.249s

real    0m0.773s
user    0m0.726s
sys     0m0.046s

In most cases extraports are not shown in the output, so this was wasted
effort. I know of only one place where it affected the output, when an
extraports in the A scan because a non-extraports in a different state
in the B scan. Then the previous state would be included in the <a>
port, where now it will just be listed without a state.
2009-07-17 19:46:41 +00:00
david
163dab3acd Regenerate ndiff.1. 2009-07-16 20:37:02 +00:00
david
b4e3fd762a Add test and XML Ndiff output samples from Fyodor's Facebook scans. 2009-07-16 20:36:53 +00:00
david
1bec7dcc21 Add a "quick start" example section right below the options summary. 2009-07-16 19:42:48 +00:00
david
8ad317c706 Add a description of XML output to the Ndiff man page. Still need to
fill in the output examples.
2009-07-16 19:26:35 +00:00
david
8ed86b8696 Some improvements to the Ndiff man page: a description of text output
and a shell script for daily scanning with cron. Still a work in
progress.
2009-07-16 18:47:58 +00:00
david
635850af8b Small documentation updates for script output support in Ndiff. 2009-07-13 06:06:58 +00:00
david
ba53f578b3 Show script output in Ndiff text output. 2009-07-13 05:59:05 +00:00
david
b9f994e71d Add script output to Ndiff XML output. 2009-07-13 05:34:13 +00:00
david
fda75eea6c Move the text output of port diffs from the HostDiff class to the
PortDiff class.
2009-07-13 04:19:21 +00:00
david
5abf361663 Visually simplify the code that builds the port table. 2009-07-11 02:26:02 +00:00
david
a660b37026 Parse script results. 2009-07-10 23:55:29 +00:00
david
4b99c96667 Run whois.nse in complex.xml so it has a hostscript. 2009-07-10 23:50:44 +00:00
david
72949e27e8 Remove the test for the sort order of addresses. The idea behind that
was that if a host had multiple addresses of the same type, they should
be sorted numerically, not alphabetically. So 20.0.0.1 should come
before 100.0.0.1. But the way Nmap works, I don't think a host can have
more than one address of the same type, and it's not worth the code it
would take to make them sort properly if it did.
2009-07-10 23:30:32 +00:00
david
3d3e3b8515 Regnerate test scan files, add script scanning, version detection, and
OS detection to complex.xml.
2009-07-10 23:28:28 +00:00
david
98af0bba24 Add an append_raw method to the Table class to add an unformatted string
to a table. This is going to be for script output.
2009-07-10 01:25:39 +00:00
david
f6b10157f7 Fix a bug: in deciding whenther to print the diff for a port, a port in
host B was being check to see if it was an extraport in host A.
2009-07-06 22:27:53 +00:00
fyodor
ae33f827b3 Note that James Levine wrote an old utility named Ndiff back in 2000 which served a similar purpose 2009-07-04 03:04:33 +00:00
david
6e25eff176 Fix a bug I found by reading Daniel Roethlisberger's article at
http://www.linux-magazin.de/Heft-Abo/Ausgaben/2009/06/Alles-inklusive/(offset)/4.
Don't print a "Not shown: " line if there were no extraports.
2009-05-24 18:59:19 +00:00
david
26361a4642 Remove the claim that XML output is not supported from "ndiff -h". That
was left over from when the output was being redesigned.
2009-05-13 00:41:55 +00:00
david
e5d21d371e Oops, don't print the program name twice when reporting an option
parsing error.
2009-05-13 00:40:38 +00:00
david
67c34404f2 Print the "Try -h for help" message when there's an option error in
addition to the error message getopt prints.
2009-05-13 00:39:40 +00:00
david
314b79b901 Document the --xml option in the Ndiff man page. (It claimed it was
unsupported.)
2009-04-21 06:11:44 +00:00
david
017339e372 [Ndiff] The setup.py installation script now suggests installing the
python-dev package in a certain error situation. Previously the
error message it printed was misleading:
  error: invalid Python installation: unable to open
  /usr/lib/python2.6/config/Makefile (No such file or directory)
The change was suggested by Aaron Leininger.
2009-04-20 19:15:00 +00:00
david
6b4c3c5532 Replace random-1.xml and random-2.xml with bigger scans that include OS
detection. Update README.
2009-04-10 19:14:18 +00:00
david
4c13088d1e Use "Host is up.", not "Host appears to be up." to match Nmap output. 2009-04-10 19:08:48 +00:00
david
c701b9559b Merge from /nmap-exp/david/ndiff-mkii and
/nmap-exp/david/zenmap-ndiff-alt. This is the new Ndiff output format
described in http://seclists.org/nmap-dev/2009/q1/0825.html and
http://seclists.org/nmap-dev/2009/q2/0127.html.
2009-04-10 19:07:39 +00:00
david
88ad786c73 Remove service fingerprints in anonymize.py because they often contain
identifying information.
2009-03-26 18:45:25 +00:00
david
72e9a1fd93 Adjust capitalization of "ndiff" to "Ndiff" in a couple of comments. 2009-03-26 01:57:57 +00:00
david
683382bd68 Revert r12572. I remember why I split the element handlers into a helper
function. It was to make it easy to return out of the handler on error and
still have startElement and endElement maintain the element stack.
2009-03-25 16:33:50 +00:00
david
28705df8ac Use substitution to insert the element name in XML parsing error messages. I
had a copy-paste error where a message under "status" referred to the
"extraports" element.
2009-03-25 16:30:26 +00:00
david
99ebbe3d13 Fix variables names in the code that generates XML for the host-hostname-remove
and host-hostname add elements to refer to hostnames and not addresses.
2009-03-25 01:35:26 +00:00
david
9c3cc6458b Add new Ndiff version and OS differencing to CHANGELOG. 2009-03-18 02:07:40 +00:00
david
7ecfe34fe5 Add OS difference reporting to Ndiff. It looks like
Remove OS "Linux 2.6.18 - 2.6.25".
        Remove OS "Linux 2.6.8 - 2.6.20".
        Remove OS "OpenWrt (Linux 2.6.19 - 2.6.21)".
        Add OS "Archos 605 WiFi video player".
        Add OS "Linux 2.6.27 (Ubuntu)".
        Add OS "Linux 2.6.22".
        Add OS "Linux 2.6.27".
2009-03-18 01:21:25 +00:00
david
ccd55623c7 Record OS information in Ndiff. 2009-03-18 00:09:14 +00:00
david
fd41fcd0f7 Include service detection information in Ndiff output. Change the output format
from

	21/tcp is open, was filtered.
	23/tcp is open, was filtered.
	80/tcp is open, was filtered.
	8701/tcp is filtered, was open.

to

	-21/tcp filtered  
	+21/tcp open ftp Netgear broadband router ftpd 1.0
	-23/tcp filtered  
	+23/tcp open telnet Netgear broadband router admin telnetd
	-80/tcp filtered  
	+80/tcp open http Embedded Allegro RomPager webserver 4.07 UPnP/1.0 (ZyXEL ZyWALL 2)
	-8701/tcp open unknown 
	+8701/tcp filtered
2009-03-16 19:53:34 +00:00
david
63d5040557 Remove the startElementAux and endElementAux methods. Just handle the element
stack management in startElement and endElement.
2009-03-13 21:43:33 +00:00
david
91956287c2 Make each possible diff hunk its own class, rather than having them all be in
the DiffHunk class with a type tag. Now output is handled with polymorphism
rather than dispatching with if/else. It also better shows what members each
hunk type has.
2009-03-13 00:17:48 +00:00
david
df7f565cc5 [Ndiff] Added a workaround for a bug in PyXML. The bug would cause a
crash that looked like "KeyError: 0". Fyodor reported the error.
2009-03-10 15:31:27 +00:00
david
4db82f9351 When ndiff gets a command-line option it doesn't understand, print just the
exception message rather than the whole exception tuple. This changes
./ndiff: ('option --foo not recognized', 'foo')
to
./ndiff: option --foo not recognized
2009-01-23 21:03:13 +00:00
fyodor
0823b8d1d8 slight rewording 2009-01-23 02:14:09 +00:00