1
0
mirror of https://github.com/nmap/nmap.git synced 2026-01-07 23:19:02 +00:00
Commit Graph

7950 Commits

Author SHA1 Message Date
david
45cd30eea0 NMAP_ARGS typo. 2013-01-08 04:28:01 +00:00
henri
fb90c4ff33 Replaced the LOWER_MAX_FD macro by a static inline function. 2013-01-07 21:54:07 +00:00
fyodor
13401ed640 Note a done task 2013-01-04 19:40:22 +00:00
david
a6dd675fd3 Don't do operations with side effects inside asserts.
ncat_assert is safe because it cannot be disabled. <assert.h> assert is
also safe because we make sure that NDEBUG remains defined. Doing this
helps avoid potential bad effects of something changing in the future.
2013-01-04 18:59:56 +00:00
david
63d9e8b5d5 Use ncat_assert in place of assert everywhere. 2013-01-04 18:59:47 +00:00
david
b44d477344 Comment typo. 2013-01-04 18:59:44 +00:00
david
f86b575aa1 Remove -q (quash argv to "pine" option). 2013-01-04 18:59:11 +00:00
david
e03dcf3d8a Do a connect on rpc-grind UDP sockets to invoke socket_lock.
This connect should be side effect–free except for calling socket_lock,
which prevents the creation of an excessive number of sockets. Not using
the lock was causing "Too many open files" errors.

We should have a cleaner general solution for this, and not require
scripts to "connect" their unconnected UDP sockets. I seem to remember
that there was a good reason for not enforcing the lock on socket
creation, but only on connect, as we do.

http://seclists.org/nmap-dev/2012/q4/435
2012-12-31 19:06:33 +00:00
david
4cf5d561cb Limit murmur-version to five ports.
It can be configured to run on any port, but
http://mumble.sourceforge.net/FAQ/English#What_is_the_default_server_port_for_Murmur.3F
says the default is 64738. Include that port and the next four higher.
The script was running for every open|filtered port, which is excessive.
2012-12-30 00:52:36 +00:00
david
02659c3de2 Use version_port_or_service over port_or_service. 2012-12-30 00:39:30 +00:00
henri
941b73ac8a Minor style fixes. 2012-12-29 15:59:59 +00:00
david
d24ab2d43c Make dns-nsec-enum and dns-nsec3-enum reference each other. 2012-12-29 15:25:41 +00:00
david
83f9cf53c1 Remove executable bit from nmap-man-id.xml. 2012-12-25 01:28:30 +00:00
david
4dbcf63d48 Move Japanese man page from nmap-jp to nmap-ja.
jp is the code for the country of Japan (ISO 3166). ja is the code for
the Japanese language (ISO 639). This bug was reported by Christian
Neukirchen.

http://seclists.org/nmap-dev/2012/q4/518
2012-12-25 01:28:26 +00:00
henri
b6765c03fa Fixed SUN_LEN definition in nsock.h.
Added missing parenthesis to nsock's SUN_LEN for platforms
where the macro isn't defined.

Report and patch by Conor McCarthy
2012-12-24 23:29:18 +00:00
henri
f8da38fab5 Performance improvement.
Replaced try/except sequences by a dict.get()/if not None.
This simple change improves parsing time by 1s on a ~150MB file.
2012-12-23 08:35:32 +00:00
henri
36f8adf2a6 Improved XML parsing speed.
Replaced long if/elif/else sequence of checks by a direct access
data structure based on an element_name -> callback mapping.
2012-12-23 08:35:28 +00:00
david
73e6e9a2d9 Whitespace in nmap-payloads. 2012-12-23 01:13:56 +00:00
david
76e68ed6a1 More specific match for TeamSpeak TCPQuery and ServerQuery.
http://seclists.org/nmap-dev/2012/q4/490
2012-12-23 01:13:47 +00:00
henri
2774c8cce6 Filespace code cleanup.
- Removed dead code.
- Fixed style, improved consistency.
- Replaced FILESPACE_LENGTH and FILESPACE_STR macros by identical
  static inline functions.
- Made fs_cat() a regular function. There's no actual benefit of
  having it inlined.
2012-12-22 21:59:38 +00:00
david
89f69c40e7 Make ServiceNFO::currentprobe_timemsleft take a probe argument.
It seems that this function was usually called after having called
currentProbe outside the call to currentprobe_timemsleft, with the call
to currentProbe inside the function having the same result. This is a
bit tenuous, so make the probe we're talking about explicit.

Resolves these Parfait reports
(http://seclists.org/nmap-dev/2012/q4/412).

Error: Null pointer dereference (CWE 476)
    Read from null pointer 'ServiceNFO::currentProbe(this)'
         at line 1813 of components/nmap/build/amd64/service_scan.cc in function 'ServiceNFO::currentprobe_timemsleft(timeval const*)'.
           Function 'ServiceNFO::currentProbe()' may return constant 'NULL' at line 1707, called at line 1813.
           Null pointer introduced at line 1707 in function 'ServiceNFO::currentProbe()'.
2012-12-22 06:02:39 +00:00
david
c8b9bf8107 Make PortList::mapPort return void.
Contrary to the doc comment, this function could never return false but
only cause a fatal error.

Resolves these Parfait reports
(http://seclists.org/nmap-dev/2012/q4/412).

Error: Null pointer dereference (CWE 476)
    Read from null pointer 'port'
         at line 344 of components/nmap/build/amd64/portlist.cc in function 'PortList::setServiceProbeResults(unsigned short, int, serviceprobestate, char const*, service_tunnel_type, char const*, char const*, char const*, char const*, char const*, char const*, std::vector<char const*, std::allocator<char const*> > const*, char const*)'.
           Function 'PortList::createPort(unsigned short, unsigned char)' may return constant 'NULL' at line 671, called at line 343.
           Null pointer introduced at line 671 in function 'PortList::createPort(unsigned short, unsigned char)'.
Error: Null pointer dereference (CWE 476)
    Write to null pointer 'current'
         at line 520 of components/nmap/build/amd64/portlist.cc in function 'PortList::setPortState(unsigned short, unsigned char, int)'.
           Function 'PortList::createPort(unsigned short, unsigned char)' may return constant 'NULL' at line 671, called at line 518.
           Null pointer introduced at line 671 in function 'PortList::createPort(unsigned short, unsigned char)'.
Error: Null pointer dereference (CWE 476)
    Write to null pointer 'answer'
         at line 880 of components/nmap/build/amd64/portlist.cc in function 'PortList::setStateReason(unsigned short, unsigned char, unsigned short, unsigned char, sockaddr_storage const*)'.
           Function 'PortList::createPort(unsigned short, unsigned char)' may return constant 'NULL' at line 671, called at line 877.
           Null pointer introduced at line 671 in function 'PortList::createPort(unsigned short, unsigned char)'.
         at line 885 of components/nmap/build/amd64/portlist.cc in function 'PortList::setStateReason(unsigned short, unsigned char, unsigned short, unsigned char, sockaddr_storage const*)'.
           Function 'PortList::createPort(unsigned short, unsigned char)' may return constant 'NULL' at line 671, called at line 877.
           Null pointer introduced at line 671 in function 'PortList::createPort(unsigned short, unsigned char)'.
2012-12-22 06:02:34 +00:00
david
4519c2ec74 Assert that get_fdinfo doesn't return NULL.
Resolves these Parfait reports
(http://seclists.org/nmap-dev/2012/q4/412).

Error: Null pointer dereference (CWE 476)
    Read from null pointer 'fdn'
         at line 328 of components/nmap/build/amd64/ncat/ncat_core.c in function 'blocking_fdinfo_send'.
           Function 'get_fdinfo' may return constant 'NULL' at line 615, called at line 366 in function 'ncat_broadcast'.
           Constant 'NULL' passed into function 'blocking_fdinfo_send', argument 'fdn', from call at line 367.
           Null pointer introduced at line 615 of components/nmap/build/amd64/ncat/util.c in function 'get_fdinfo'.
         at line 330 of components/nmap/build/amd64/ncat/ncat_core.c in function 'blocking_fdinfo_send'.
           Function 'get_fdinfo' may return constant 'NULL' at line 615, called at line 366 in function 'ncat_broadcast'.
           Constant 'NULL' passed into function 'blocking_fdinfo_send', argument 'fdn', from call at line 367.
           Null pointer introduced at line 615 of components/nmap/build/amd64/ncat/util.c in function 'get_fdinfo'.
Error: Null pointer dereference (CWE 476)
    Read from null pointer 'fdn'
         at line 946 of components/nmap/build/amd64/ncat/ncat_listen.c in function 'shutdown_sockets'.
           Function 'get_fdinfo' may return constant 'NULL' at line 615, called at line 945.
           Null pointer introduced at line 615 of components/nmap/build/amd64/ncat/util.c in function 'get_fdinfo'.
2012-12-22 06:02:30 +00:00
david
d98bbcc8ab Add an ncat_assert macro.
This is an assert that will remain even if NDEBUG is defined.
2012-12-22 06:02:25 +00:00
henri
a90bafc9f4 Fixed indentation & style.
indent -nut -i2 -kr -br -brs -brf -l0 -bad -npcs -nprs -ncs nbase_str.c
+ manual adjustements.
2012-12-20 18:15:59 +00:00
henri
f2757be055 Proper error reporting during socket creation and initialization. 2012-12-20 18:10:54 +00:00
david
93b978fba8 Merge 30432:30436 from /nmap-exp/david/ipv6-ranges.
This is simple IPv6 unicast ranges. For example,
nmap -6 en.wikipedia.org/120 -sn

The other, more complicated part of this overall change is automatic
multicast scanning of large local subnets. That part isn't done yet.
2012-12-19 01:10:39 +00:00
david
f5de2d9419 Restore UTF-8 in author field of murmur-version.
There's a bug in NSEDoc that we should fix that causes
	Marin Maržić
to appear as
	Marin Mar&#xC5;&#xBE;i&#xC4;&#x87;
in HTML output. It is wrongly assuming a one-byte encoding.

http://seclists.org/nmap-dev/2012/q4/477
2012-12-18 04:36:09 +00:00
patrik
0587b3e0c4 nse_check_globals cleanup 2012-12-18 02:46:01 +00:00
dmiller
b3b3fa70e8 Fix broadcast-dropbox-listener not giving output
The check for output using maxn was changed to use the # operator in
r23147, but the table was not an "array"-style table. Changed it to test
for next(ids) instead, which works.
2012-12-17 23:34:35 +00:00
david
3afb4c9992 Remove TargetGroup::skip_range.
This was left over from when TargetGroup was used for exclude.
2012-12-17 23:18:58 +00:00
david
55e210d589 Formatting in TargetGroup.{cc,h}.
astyle -a -p -H -s2 -m2 TargetGroup.cc TargetGroup.h
2012-12-17 22:41:13 +00:00
david
bfead6f4b7 hostexp[i] is a nicer way to write *(hostexp + i). 2012-12-17 22:39:23 +00:00
aca
d8dc00e0ed Merged mysql-enum from my dev branch 2012-12-17 15:59:35 +00:00
patrik
16d50c48da Squashed commit of the following:
commit fb1fa9373592e81ee004b99cf813e07bf253fbe1
Author: Patrik Karlsson <patrik@cqure.net>
Date:   Sun Dec 16 11:49:36 2012 -0500

    Fix bug where brute library failed to report error on invalid iterators
2012-12-16 16:51:47 +00:00
batrick
5edca6f97b Undo previous commits as http-slowloris-check.nse doesn't do a DOS attack like http-slowloris.nse.
See http://seclists.org/nmap-dev/2012/q4/465
2012-12-16 01:58:59 +00:00
batrick
e8caacae85 Read large chunks instead of lines. 2012-12-16 00:24:37 +00:00
batrick
02369ec7d9 update script.db for r30412 2012-12-16 00:23:22 +00:00
batrick
8b8e4e307e This script never ends and seeks to crash the web server... why was this categorized as safe?? 2012-12-16 00:18:13 +00:00
batrick
76239f73b9 Escape backslashes which may appear in Windows filenames. 2012-12-16 00:02:08 +00:00
henri
b0fe74e355 More log message cleanup. Use __func__ when referring to the current function's name. 2012-12-15 18:21:09 +00:00
henri
3206c48aab Normalized log messages. No idea why I initially put underscores instead of spaces there. 2012-12-15 18:16:59 +00:00
henri
809f1eda68 Merged nsock-logging from nmap-exp/henri/nsock-logging/
Reworked the logging infrastructure to make it more flexible
and consistent.

Updated nmap, nping and ncat accordingly.  Nsock log level can
now be adjusted at runtime by pressing d/D in nmap.
2012-12-15 10:59:30 +00:00
david
26816736b5 Revert part of r29016.
nsock_check_udata needs this parameter indicating whether to set up an
unconnected UDP socket or not. r29016 wrongly made this setup
unconditional and moved the check for connectedness into the calling
function. What went wrong is that the unconnected UDP socket could be
set up prematurely--before calling bind, for example. This broke scripts
using unconnected UDP sockets.

This was reported by Dhiru Kholia.
http://seclists.org/nmap-dev/2012/q4/422
2012-12-15 07:55:31 +00:00
david
43f28b8f4a Add structured output to http-get.nse.
This patch is by Alex Weber.
http://seclists.org/nmap-dev/2012/q4/434
2012-12-13 04:16:01 +00:00
david
a8ed9f57f8 Add UDP payload for Murmur server.
http://seclists.org/nmap-dev/2012/q4/438
2012-12-12 23:39:46 +00:00
fyodor
21f2f2e10d Add David's exlcude list binary decision diagram idea to the todo 2012-12-12 07:20:05 +00:00
fyodor
8ee702f190 Add some npings issues to todo file 2012-12-11 20:16:08 +00:00
david
9083da3e53 Add link to Mumble protocol documentation. 2012-12-11 05:34:03 +00:00
david
59478987fa Change the output of murmur-version a bit. 2012-12-11 05:34:02 +00:00