PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00
Code Issues Projects Releases Wiki Activity

Replaces original experimental DNS ECS option code

Browse Source 
with value prescribed by RFC 7871. Closes #1271
This commit is contained in:
nnposter
2018-07-28 23:06:27 +00:00
parent f31ef12ca3
commit 2e08baefd4
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@@ -1,5 +1,8 @@
#Nmap Changelog ($Id$); -*-text-*- #Nmap Changelog ($Id$); -*-text-*-
o [NSE][GH#1271] The DNS library is now using ECS code (edns-client-subnet)
compliant with RFC 7871 [John Bond]
o [Ncat][GH#1267] Fixed communication with commands launched with -e or -c on o [Ncat][GH#1267] Fixed communication with commands launched with -e or -c on
Windows, especially when --ssl is used. [Daniel Miller] Windows, especially when --ssl is used. [Daniel Miller]

4
nselib/dns.lua
View File

@@ -1398,7 +1398,7 @@ end
--- ---
-- Adds an client-subnet payload to the OPT packet -- Adds an client-subnet payload to the OPT packet
-- --
-- implementing http://tools.ietf.org/html/draft-vandergaast-edns-client-subnet-00 -- implementing https://tools.ietf.org/html/rfc7871
-- @param pkt Table representing DNS packet. -- @param pkt Table representing DNS packet.
-- @param Z Table of Z flags. Only DO is supported. -- @param Z Table of Z flags. Only DO is supported.
-- @param client_subnet table containing the following fields -- @param client_subnet table containing the following fields
@@ -1407,7 +1407,7 @@ end
-- <code>address</code> - string containing the IP address -- <code>address</code> - string containing the IP address
function addClientSubnet(pkt,Z,subnet) function addClientSubnet(pkt,Z,subnet)
local udp_payload_size = 4096 local udp_payload_size = 4096
local code = 20730 -- temporary option-code http://comments.gmane.org/gmane.ietf.dnsext/19776 local code = 8 -- https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-11
local scope_mask = 0 -- In requests, it MUST be set to 0 see draft local scope_mask = 0 -- In requests, it MUST be set to 0 see draft
local data = bin.pack(">SCCA",subnet.family or 1,subnet.mask,scope_mask,ipOps.ip_to_str(subnet.address)) local data = bin.pack(">SCCA",subnet.family or 1,subnet.mask,scope_mask,ipOps.ip_to_str(subnet.address))
local opt = bin.pack(">SS",code, #data) .. data local opt = bin.pack(">SS",code, #data) .. data

2
scripts/dns-client-subnet-scan.nse
View File

@@ -14,7 +14,7 @@ geographically distributed locations in an attempt to enumerate as
many different address records as possible. The script also supports many different address records as possible. The script also supports
requests using a given subnet. requests using a given subnet.
* http://tools.ietf.org/html/draft-vandergaast-edns-client-subnet-00 * https://tools.ietf.org/html/rfc7871
]] ]]
--- ---