1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00
Commit Graph

672 Commits

Author SHA1 Message Date
fyodor
9ca4041ec1 Merged -r13793:HEAD from nmap-exp/dev/nmap branch now that we're opening up trunk development
again.  Here are the items which were merged:

------------------------------------------------------------------------
r13971 | jah | 2009-06-29 14:30:27 -0700 (Mon, 29 Jun 2009) | 2 lines

Improved a pattern for matching HTTP status-line, tidy away some variables and
fix a typo.
------------------------------------------------------------------------
r13967 | daniel | 2009-06-29 13:47:04 -0700 (Mon, 29 Jun 2009) | 5 lines

o Added a convenience top-level BSD makefile redirecting BSD make
  to GNU make on BSD systems.  This should help prevent bogus
  error reports when users run "make" instead of "gmake" on BSD
  systems. [Daniel Roethlisberger]

------------------------------------------------------------------------
r13965 | batrick | 2009-06-29 06:50:11 -0700 (Mon, 29 Jun 2009) | 14 lines

[NSE] The NSE Nsock Library binding no longer relies on garbage collection to
monitor the use of socket "slots". A thread (script) attempting to connect must
first obtain one of a limited number of available socket locks (usually 10 or
--max-parallelism). The binding would use garbage collection of sockets to
determine when a thread has finished using its allocated sockets. This is
unfortunately slow and requires us to constantly run the garbage collector to
cause timely reallocation. I have changed the binding to now regularly inspect
allocated sockets in the nsock_loop function. Available sockets slots are now
immediately reallocated and done with far less execution time.

See [1] for benchmarks and further explanation.

[1] http://seclists.org/nmap-dev/2009/q2/0624.html

------------------------------------------------------------------------
r13964 | batrick | 2009-06-29 06:37:49 -0700 (Mon, 29 Jun 2009) | 10 lines

[NSE] Fixed a rare (and usually undetectable) bug that can cause a SEGFAULT.
The NSE nsock library binding may attempt to push values on the stack of
a thread that ended due to an error. It is possible that the internal
Lua stack was completely full and any further pushed values would result
in a segmentation memory violation.

This bug is very hard to reproduce with a SEGFAULT but is usually visible
when Lua assertion checks are turned on. A socket handler routine must be
called AFTER a thread has ended in error.

------------------------------------------------------------------------
r13963 | batrick | 2009-06-29 05:51:20 -0700 (Mon, 29 Jun 2009) | 3 lines

Fixed some global scoped variables to be local. This caused a many scripts to
overwrite each others' sockets, options, etc.

------------------------------------------------------------------------
r13939 | joao | 2009-06-27 16:07:35 -0700 (Sat, 27 Jun 2009) | 2 lines

Fixed port rule to include ssl pop3 port, now that pop3.lua supports SSL connections in function capabilities

------------------------------------------------------------------------
r13938 | joao | 2009-06-27 16:06:28 -0700 (Sat, 27 Jun 2009) | 2 lines

Added transparent SSL support using comm.tryssl

------------------------------------------------------------------------
r13937 | joao | 2009-06-27 16:05:19 -0700 (Sat, 27 Jun 2009) | 2 lines

Added transparent SSL support using comm.tryssl

------------------------------------------------------------------------
r13936 | joao | 2009-06-27 16:03:50 -0700 (Sat, 27 Jun 2009) | 2 lines

Added SSL transparent support using comm.tryssl

------------------------------------------------------------------------
r13935 | joao | 2009-06-27 16:02:39 -0700 (Sat, 27 Jun 2009) | 2 lines

Added SSL transparent support using comm.tryssl

------------------------------------------------------------------------
r13934 | joao | 2009-06-27 16:01:38 -0700 (Sat, 27 Jun 2009) | 2 lines

Added SSL transparent support using comm.tryssl

------------------------------------------------------------------------
r13933 | joao | 2009-06-27 16:00:27 -0700 (Sat, 27 Jun 2009) | 2 lines

SSL transparent support using comm.tryssl

------------------------------------------------------------------------
r13932 | joao | 2009-06-27 15:19:58 -0700 (Sat, 27 Jun 2009) | 2 lines

Included transparent ssl support to function pop3.capabilities using comm.tryssl

------------------------------------------------------------------------
r13931 | joao | 2009-06-27 15:19:06 -0700 (Sat, 27 Jun 2009) | 3 lines

New version of comm.lua with function tryssl, that transparently adds support to ssl connections


------------------------------------------------------------------------
r13930 | joao | 2009-06-27 14:50:38 -0700 (Sat, 27 Jun 2009) | 6 lines

Fixed buffering problem exposed by david on nmap-dev list.
The problem was solved using a buffer to receive the data, making the script work fine in cases where the ssh packets are fragmented.

A very similar solution was applied to ssh1.lua.


------------------------------------------------------------------------
r13928 | batrick | 2009-06-27 04:43:12 -0700 (Sat, 27 Jun 2009) | 18 lines

[NSE] We now propogate a NSE initiated yield on a script through all user
coroutines so that NSE may resume control. Previously, scripts that would yield
in a child coroutine (e.g. a script's child coroutine generated by Lua's
coroutine.create function) would give control back to the script. A script
would yield in this way by making a blocking socket operation. NSE would be
unable to correctly resume child coroutine when the socket operation is
finished processing.

By yielding the chain of coroutines a script has operating, we allow to NSE to
handle the socket operation properly. NSE would then resume the entire chain so
execution may correctly resume at the coroutine which initiated the socket
operation. This restores the "illusion" that a script executes without
interruption.

See [1] for more information, further explanation, and some use cases.

[1] http://seclists.org/nmap-dev/2009/q2/0586.html

------------------------------------------------------------------------
r13817 | david | 2009-06-18 15:57:29 -0700 (Thu, 18 Jun 2009) | 3 lines

Improve an OS fingerprint with a model number and broader matching.
Based on a follow-up report from a submitter.

------------------------------------------------------------------------
r13814 | josh | 2009-06-17 21:34:15 -0700 (Wed, 17 Jun 2009) | 3 lines

[zenmap] Added support to zenmap for the new SCTP options: -PY, -sY and -sZ


------------------------------------------------------------------------
r13797 | ron | 2009-06-17 11:02:18 -0700 (Wed, 17 Jun 2009) | 1 line

Applied a patch from Mak Kolibabi that enhances the output of smb-enum-processes. The output is now modeled after the output of the 'ps' tool for higher verbosity levels.
------------------------------------------------------------------------
r13795 | david | 2009-06-17 09:05:21 -0700 (Wed, 17 Jun 2009) | 6 lines

The configure script now allows cross-compiling by assuming that
libpcap is recent enough. Previously it would quit because a test
program could not be run. libpcap will always be recent enough when
the included copy is used. The patch was contributed by Mike
Frysinger.
2009-06-29 23:48:19 +00:00
ithilgore
aca370f88d Fixed typos with vsnprintf (was vnsprintf). 2009-06-28 17:33:35 +00:00
fyodor
d06068db0d note that the Zenmap display hanging problem is only on Mac OS X 2009-06-25 00:08:57 +00:00
fyodor
8e30fbbb7f add trivial SCTP NAT note 2009-06-24 21:20:27 +00:00
fyodor
aa2fd81f1c Prepare CHANGELOG for stable release candidate 2009-06-24 21:19:16 +00:00
david
0b508999c1 Fixed a memory bug (access of freed memory) when loading exclude
targets with --exclude. This was reported to occasionally cause a
crash. Will Cladek reported the bug and contributed an initial
patch.
2009-06-14 23:00:33 +00:00
fyodor
b0420dd8d5 fix typo 2009-06-13 05:13:47 +00:00
david
7b6a56c2a6 Clarify a CHANGELOG entry: Ncat connect mode only makes sockets blocking
before handing them off to --exec or --sh-exec.
2009-06-13 02:42:19 +00:00
fyodor
a04c5c81f4 Rebuilt stuff, starting release builds 2009-06-13 02:37:20 +00:00
fyodor
386f381dad OK, I think CHANGELOG is finally ready to go. This is another monster release! 2009-06-13 02:33:37 +00:00
fyodor
3d683755dc Almost done with CHANGELOG, about to spell check 2009-06-13 02:17:06 +00:00
fyodor
6f38892828 Working on the CHANGELOG for the 4.85BETA10 release, which I hope to make today if possible. I still have more CHANGELOG entries to add and shuffling/spell-checking/etc to perform 2009-06-12 10:04:11 +00:00
josh
62567d1208 [zenmap] Fixed two bugs. The first had to do with updates from new scans being
added to existing HostInfo objects.  This made examining scan diffs problematic
in zenmap.  The second had to do with canceling a scan and then removing it.
This would clear much of the information from the rest of the GUI.
2009-06-11 20:43:44 +00:00
josh
a36788b554 Updated the CHANGELOG to reflect a change in the zenmap profiles 2009-06-10 20:54:42 +00:00
david
e80f1188e2 [Ncat] There is a backwards-incompatible change in the way that
listen mode works. The new default behavior is to accept only one
connection, and quit when the connection ends. This was necessary to
prevent data loss in some situations; some programs require Ncat to
send an EOF before they flush their internal buffers and finish
processing the last bit of data. See
http://seclists.org/nmap-dev/2009/q2/0528.html for more information.
Use the new -k or --keep-open option to get the old behavior, in
which Ncat will accept multiple simultaneous connection, combine all
their input, and accept more connections after a disconnection.
2009-06-10 03:03:01 +00:00
david
4e117783a1 With --version-trace, show the names of probes as they are sent. Also
show the names of probes that had a match with --version-trace (used to
only happen with -d2). The patch is from Tom Sellers.
2009-06-08 23:42:57 +00:00
david
5e7c794952 Fix SSL in listen mode for BSD systems and others where a socket inherits its
non-blocking status from accept. A non-blocking socket makes SSL_accept fail if
we naively treat it like a blocking socket.
2009-06-08 00:05:11 +00:00
david
75a2244f97 Change "Save Snapshot" to "Save Graphic" in CHANGELOG. 2009-06-07 14:14:55 +00:00
josh
0b078f4af6 Rewrote the port list merge code in validate_scan_lists to be moremaintainable. 2009-06-06 04:33:35 +00:00
david
1eb18b3143 Use conditional compilation with OPENSSL_VERSION_NUMBER to support a
certain function that is not in OpenSSL before 0.9.7, but is required
for correct operation after 0.9.7. The technique is from Network
Security with OpenSSL, whose code is at http://www.opensslbook.com/code.html
(see ssl/common.c).
2009-06-06 02:13:54 +00:00
josh
07011cbb99 Made a change to validate_scan_lists to combine port lists when -PA and -PS are
called together when nmap is running as nonroot or using IPv6.
2009-06-06 00:04:31 +00:00
josh
198cb57ea2 Added another case to NmapOps::RawScan() to fix a bug where the "Raw packets
sent..." message would not be displayed.
2009-06-05 04:06:12 +00:00
josh
881fc1777f Changed the default port for UDP probing. Also changed the ICMP id in ICMP
pinging to be a nonzero number.
2009-06-05 03:29:10 +00:00
david
d011afb07c [Ncat] Handling of newlines on Windows has been improved. CRLF is
automatically converted to bare LF when input is from the console, but
not when it is from a pipe or a file. No newline translation is done
on output (it was being done before). This makes it possible to
transfer binary files with Ncat on Windows without any corruption.
2009-06-05 02:30:58 +00:00
daniel
50830f7488 o Added initial SCTP port scanning support to Nmap. SCTP is
a layer 4 protocol used mostly for telephony related applications.
  This brings the following new features:
  o SCTP INIT chunk port scan (-sY): open ports return an INIT-ACK
    chunk, closed ones an ABORT chunk.  This is the SCTP equivalent
    of a TCP SYN stealth scan.
  o SCTP COOKIE-ECHO chunk port scan (-sZ): open ports are silent,
    closed ports return an ABORT chunk.
  o SCTP INIT chunk ping probes (-PY): host discovery using SCTP
    INIT chunk packets.
  o SCTP-specific IP protocol scan (-sO -p sctp).
  o SCTP-specific traceroute support (--traceroute).
  o The ability to use the deprecated Adler32 algorithm as specified
    in RFC 2960 instead of CRC32C from RFC 4960 (--adler32).
  o 42 well-known SCTP ports were added to the nmap-services file.
  Part of the work on SCTP support was kindly sponsored by
  Compass Security AG, Switzerland.  [Daniel Roethlisberger]
2009-06-03 23:15:45 +00:00
david
440980ae38 Add João Medeiros's topology saving feature.
http://seclists.org/nmap-dev/2009/q2/0409.html
2009-06-03 17:43:03 +00:00
josh
fe069f1420 Fixed a bug with the --defeat-rst-ratelimit option. 2009-05-28 23:36:45 +00:00
david
8862e63add Fix CHANGELOG typo. 2009-05-28 22:06:10 +00:00
venkat
cbba41df5c 2009-05-28 20:06:50 +00:00
josh
79b92efffb Updated the CHANGELOG to reflect the move to all PNG images in zenmap [Josh] 2009-05-28 16:20:04 +00:00
david
439e991985 When handling ICMP ping probe replies, make sure we match up with the
right type of probe (0 with 8, 14 with 13, 18 with 17). With the new
default ping, I was scanning a network where an echo reply would
mistakenly be interpreted as a response to a timestamp request, even
though that host didn't respond to timestamp requests. That host would
become the global ping host, and all its probes would be dropped,
slowing the scan way down. A ping scan of a /24 took over 1,000 seconds
when it should have taken about 10.
2009-05-27 22:08:24 +00:00
david
1538e21724 There is a new default ping probe set: -PE -PS443 -PA80 -PP. In
exhaustive testing of 90 different probes, this one emerged as the
best four-probe combination, finding 14% more Internet hosts than
the previous default, -PE -PA80. The default for nonroot users is
-PS80,443, replacing the previous default of -PS80. In addition,
ping probes are now sent in order of effectiveness (-PE first) so
that less likely probes may not have to be sent.
2009-05-27 18:21:28 +00:00
david
35eb7f1137 Use a datetime.date object to store the date criterion in the Zenmap
search dialog, not an ad-hoc (year, month, day) tuple. This fixes an
error introduced when I made the change to use strftime for date
formatting:
  File "zenmapGUI\SearchGUI.pyo", line 583, in operator_changed
  File "zenmapGUI\SearchGUI.pyo", line 566, in new_subcriterion
  File "zenmapGUI\SearchGUI.pyo", line 751, in __init__
  File "zenmapGUI\SearchGUI.pyo", line 816, in set_date
TypeError: argument must be sequence of length 9, not 3
2009-05-24 18:04:47 +00:00
fyodor
0b2b4bdc64 note MAC address prefix update 2009-05-21 00:48:11 +00:00
fyodor
2c41f84d7f o Patched configure.ac to detect Lua include and library files in
"lua5.1" subdirectories of /usr/include and the like. Apparently
  Debian puts them there. We still check the likes of
  /usr/include/lua.h and /usr/include/lua/lua.h as well. [Jan
  Christoph Nordholz]
2009-05-18 21:15:00 +00:00
fyodor
ab1fa58da2 o Fixed an assertion failure which could occur on at least SPARC Linux
The error looked like "nsock_core.c:294: handle_connect_result:
  Assertion `0' failed. Aborted". [David Fifield, Fabio Pedretti]
2009-05-15 03:01:01 +00:00
fyodor
a420fe3d4f o Improved the Oracle DB version detection signatures. [Tom Sellers] 2009-05-14 04:32:50 +00:00
batrick
38c850e8db Fixed a typo. 2009-05-13 05:22:50 +00:00
fyodor
5792af0a9c slight rephrase 2009-05-13 02:13:54 +00:00
fyodor
be9c7bf7ad Tentatively done with CHANGELOG updates for 4.85BETA9 release 2009-05-13 02:12:07 +00:00
david
4692fdc184 Fix typo in CHANGELOG. 2009-05-13 01:11:29 +00:00
fyodor
5ba8735231 Update version numbers in prep for next release; also made some CHANGELOG edits (not done with those yet though) 2009-05-13 01:03:35 +00:00
david
7903fc92bf Assign SEQ.CI a MatchPoints value of 50. 2009-05-12 21:36:05 +00:00
david
c6a739f1b5 Use a thread instead of fork to allow running the HTTP proxy on Windows. 2009-05-09 03:24:52 +00:00
david
801c3628a4 Remove the Zenmap command wizard. The profile editor has always been a
better interface with tabs instead of a linear sequence of pages. The
ability to run a scan from the editor was the one thing the command
wizard could do that the profile editor couldn't, but now it can do that
too.
2009-05-08 15:00:55 +00:00
david
6ad02f6509 Merge from /nmap-exp/david/ncat-ssl. This adds automatic generation of
temporary SSL keys and certificates in Ncat's listen mode.
2009-05-08 06:11:18 +00:00
david
5a522c647f Add a spinning progress throbber to Zenmap that animates while a scan is
running.
2009-05-06 20:32:30 +00:00
daniel
ed77fa1e48 o [Ncat] When using --send-only, Ncat will now close the network
connection and terminate after receiving EOF on standard input.
  [Daniel Roethlisberger]
2009-05-04 07:04:53 +00:00
fyodor
1324a3151a o Fixed a bug in the su-to-zenmap.sh script so that, in the cases
where it calls su, it uses the proper -c option rather than
  -C. [Michal Januszewski, Henry Gebhardt]
2009-05-03 04:33:50 +00:00
daniel
d3651a95ee o [Ncat] Unbreak hostname resolution on BSD systems where a recently
fixed libc bug caused getaddrinfo(3) to fail unless a socket type
  hint is provided. Patch originally provided by Hajimu UMEMOTO of
  FreeBSD. [Daniel Roethlisberger]
2009-05-01 22:04:59 +00:00