1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-20 22:49:01 +00:00
Commit Graph

9911 Commits

Author SHA1 Message Date
jay
42510e649d Update scripts/script.db 2014-07-30 07:16:52 +00:00
jay
d93a78f502 Make version scripts (with non shortport portrules) obey nmap.version_intensity() >= 7 2014-07-30 07:12:50 +00:00
jay
61d13e12d2 Make version intensity scripts use shortport.version_port_or_service() instead of shortport.port_or_service() 2014-07-30 07:10:35 +00:00
jay
341e447868 Add the nmap.version_intensity() function for use in NSE version scripts. Modify shortport.version_port_or_service() to also take a rarity parameter. 2014-07-30 07:05:58 +00:00
jay
20235c2389 Improve OS detection by moving to a different port if 'tcpwrapped' is detected 2014-07-30 06:55:48 +00:00
jay
c613586570 Reduce Zenmap's Topology noise by collapsing equivalent 'anonymous' nodes 2014-07-30 06:37:24 +00:00
paulino
d98fd9c909 Adds mikrotik-routeros-brute to the CHANGELOG. 2014-07-30 03:51:56 +00:00
paulino
95f897fffb Updates category to 'intrusive'. 2014-07-30 03:49:26 +00:00
paulino
1cc4d246b9 Adds mikrotik-routeros-brute.nse. This script performs brute force password auditing against the Mikrotik RouterOS API. 2014-07-30 03:48:03 +00:00
dmiller
f17edebfc2 Fix IPv4 source address for host discovery
Reported here: http://seclists.org/nmap-dev/2014/q3/137

Hostgroups should have a common outgoing interface and source address,
determined by target_needs_new_hostgroup. Source address for raw IP
probes (sendIPScanProbe) is taken from the list of decoys (o.decoys),
which always at least contains a "self" element at index o.decoyturn.
This element was not being set while filling a hostgroup for massping,
so it was using whatever the value from the last hostgroup had. This
only matters when mixing targets that require different source
addresses, as demonstrated by scanning localhost and some other address.
2014-07-28 22:23:07 +00:00
dmiller
b822aa9785 Fix Ncat's SOCKS5 password auth
See http://seclists.org/nmap-dev/2014/q3/4
2014-07-25 15:07:44 +00:00
dmiller
e45016ea61 Remove use of branch-reset pattern from nmap-service-probes
branch-reset patterns (?|...) were introduced in Perl 5.10.0, but some
folks complained when their older PCRE libs crashed on this line.
This changes the use into a single outer capture, then uses the $P()
helper function to strip out the unprintable length bytes.
2014-07-24 21:28:58 +00:00
dmiller
e525388f36 Make -Pn override all other -P* types
This was a case where order of arguments affected the outcome: if -PE
came before -Pn, then -Pn took precedence. Otherwise, -PE took
precedence (except that o.pingtype would also contain PINGTYPE_NONE...
not sure how that affected things). This cleans things up by letting
PINGTYPE_NONE be OR'd into o.opingtype, then checking for it after all
options have been processed and clearing out the other types if it is
found.
2014-07-23 22:01:35 +00:00
d33tah
6355a1bebe Revert my unfinished refactoring commit I pushed by mistake. 2014-07-23 14:43:12 +00:00
d33tah
308d924415 Remove an unneeded duplicate variable assignment. 2014-07-23 14:37:16 +00:00
d33tah
f3f2d57503 This should probably be static. 2014-07-23 14:37:07 +00:00
dmiller
51a633ac3c NSE: Add TLS_RSA_WITH_3DES_EDE_CBC_SHA to default ciphers
As noted (http://seclists.org/nmap-dev/2014/q3/121), some versions of
Windows require a KB before supporting AES, so add a 3DES option.
2014-07-23 01:52:41 +00:00
dmiller
453f655f89 Add mandatory cipher suite to appropriate scripts
The TLS standard (TLS 1.2, but also probably the others) states:

> In the absence of an application profile standard specifying
> otherwise, a TLS-compliant application MUST implement the cipher
> suite TLS_RSA_WITH_AES_128_CBC_SHA

This was causing some problems with some implementations (See
http://seclists.org/nmap-dev/2014/q3/119)
2014-07-22 22:20:34 +00:00
jay
d70f5b364a Show TTL in default output if "--reason -v" is asked for. 2014-07-22 01:55:04 +00:00
jay
f85416b75a If verbosity is greater than 1 (i.e. -vv or higher is used), automatically do reason display (i.e. --reason). 2014-07-22 01:51:46 +00:00
dmiller
eea45a5bf0 Process 177 more OS fingerprint submissions 2014-07-21 03:59:39 +00:00
dmiller
5f8ce142aa Process 200 more OS fingerprint submissions 2014-07-19 03:28:31 +00:00
dmiller
59feae8a5e Process 200 more OS fingerprint submissions 2014-07-18 03:01:56 +00:00
dmiller
04f1b83d0d Process 250 more OS fingerprint submissions 2014-07-17 20:17:00 +00:00
dmiller
9c9533a404 Process 250 more OS fingerprint submissions 2014-07-16 19:15:52 +00:00
dmiller
fc743a77eb Manual merging of OS fingerprints
Because of previous merging, some fingerprints had grown to encompass
others. Other fingerprints for the same or similar devices were close
enough that they could be merged. This was a manual review of 614
fingerprints that were identified as differing from some other
fingerprint by only the SEQ line (256 unique non-SEQ fingerprints).

The result: 44 fingerprints were merged into others, or were deleted
because they were a proper subset of some other fingerprint (e.g. Linux
2.6.17 that is not distinguishable from a broader Linux 2.6.11-2.6.32
fingerprint). A couple of these appeared to be identical copy-and-paste
errors in the past. I was very conservative in what I chose to merge,
choosing only the most-obvious fingerprint pairs that did not lose
information (e.g. not merging unrelated specialized devices, even if
their fingerprints were very close).
2014-07-15 03:04:34 +00:00
dmiller
70e318c2ff Process 200 OS fingerprint submissions 2014-07-12 04:41:28 +00:00
dmiller
5ce61b556e Make a more descriptive error when raw sockets fail.
Doesn't happen often, but as the message says, certain Solaris zones can
cause problems here. This message is more informative than the previous
"socket troubles in Init"
2014-07-11 04:00:26 +00:00
dmiller
e603da4a4f Remove some minor changes to timing updates in connect scans
This change restores the control flow of handling connect() return and
error values. This shouldn't result in any real changes, but makes it
simpler to see the differences introduced in r33185.
2014-07-10 14:21:30 +00:00
jay
f555f91382 Added documentation in docs/refguide.xml for --data and --data-string options 2014-07-10 11:18:37 +00:00
henri
b5a6d20a6e Fail early when unable to properly resolve proxy names.
Some errors were not properly propagated. Ensure proxy_resolve() returns
a negative error code and make the caller fatal() when unable to complete
proxy_chain initialization for whatever reason.
2014-07-08 17:50:51 +00:00
dmiller
12004b5d41 Detect self-connected TCP connect probes
Recent discussion here: http://seclists.org/nmap-dev/2014/q1/136
2014-07-08 16:09:15 +00:00
dmiller
567e344ad7 Fix assertion failure in do_one_select_round
Since the refactor in r33185, getting a good response for a host during
a ping scan can remove all outstanding probes for that host, since we
already know the host is up. This broke the existing iteration in some
cases. I could force the crash with: nmap -sn -PS80-89 scanme.nmap.org

Now we check explicitly for an empty list each time through the loop.
2014-07-08 15:17:12 +00:00
dmiller
65c50eb695 re-apply r33185
Consolidate connect-scan status and errno checking

    Previously, the return value and socket errors from the connect() call
    were checked in two different places: immediately after the call, and
    then later as the sockets were select()ed over. This led to a divergence
    of logic, so the immediate checking failed to set state reasons or
    contribute to timing. This commit puts all such checking into a single
    function, handleConnectResult, so further improvements will not diverge
    again.
2014-07-08 15:17:10 +00:00
d33tah
e267e79938 Coding style fix (grep ' =[^ =]' *.h *.cc). 2014-07-08 14:47:56 +00:00
d33tah
2cc8da210a Revert "Consolidate connect-scan status and errno checking". 2014-07-08 14:23:51 +00:00
dmiller
ae4cae1c6e Consolidate connect-scan status and errno checking
Previously, the return value and socket errors from the connect() call
were checked in two different places: immediately after the call, and
then later as the sockets were select()ed over. This led to a divergence
of logic, so the immediate checking failed to set state reasons or
contribute to timing. This commit puts all such checking into a single
function, handleConnectResult, so further improvements will not diverge
again.
2014-07-08 02:59:15 +00:00
batrick
4d131d2217 Fix a pattern mixup.
\ --> /

found by klaudiu@freenode.

I added some short test asserts to confirm the pattern works.
2014-07-07 17:36:17 +00:00
dmiller
9ac14c97df Fix some globals and name mismatches in telnet-brute 2014-07-07 17:15:13 +00:00
jay
5391cd646c Added --exclude-ports to docs/nmap.usage.txt 2014-07-04 05:58:08 +00:00
jay
3b59b0ae16 Added --exclude-ports option to Nmap 2014-07-04 05:47:11 +00:00
jay
e63eb7211e Corrected some typos in portlist.h 2014-07-03 12:14:58 +00:00
dmiller
cfd1c5fe65 Set reasons when connect() comes back immediately
In sendConnectScanProbe, the usual method is to start a non-blocking
connect() and then do select() on the sockets until we get a result. On
some platforms and in some circumstances, connect() either blocks or
comes back immediately. We handled this by setting the port state
appropriately, but we didn't set the reason, yielding results like "Host
is up, received no-response" and "80/tcp  open  http  no-response"
2014-07-02 15:35:12 +00:00
jay
40722be200 Added an item to todo list 2014-07-02 13:49:06 +00:00
dmiller
64a6e9325d Integrate 240 OS fingerprint submissions 2014-07-02 04:17:01 +00:00
jay
2b30085d90 Catch Zenmap's MemoryError (caused by large Nmap Output) and provide the user a more useful error message so that we get less of the out-of-memory "crash reports" 2014-07-01 16:53:10 +00:00
fyodor
0066d3b24e Add Nmap on Android idea 2014-06-30 19:05:52 +00:00
devin
7dbf13ab3e Modified http-affiliate-id to follow amzn.to tinyurls. 2014-06-30 19:00:14 +00:00
jay
9de9c77d91 Make Zenmap use SIGTERM (instead of SIGKILL) for "Cancel Scan" so that Nmap has a chance to shutdown cleanly.
However, if Nmap is still running after 5 seconds, send a SIGKILL.
2014-06-28 09:59:00 +00:00
dmiller
1d0509f210 Integrate 160 OS fingerprint submissions 2014-06-27 03:03:57 +00:00