PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-07 13:11:28 +00:00
Code Issues Projects Releases Wiki Activity

Improves compliance with RFC 7871 by properly zeroing out insignificant bits

Browse Source 
and discarding insignificant octets.
This commit is contained in:
nnposter
2018-07-29 01:42:19 +00:00
parent 40e6327c64
commit 6c848f1c85
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@@ -1,7 +1,10 @@
#Nmap Changelog ($Id$); -*-text-*- #Nmap Changelog ($Id$); -*-text-*-
o [NSE][GH#1271] The DNS library is now using ECS code (edns-client-subnet) o [NSE] Support for edns-client-subnet (ECS) in dns.lua has been improved by:
compliant with RFC 7871 [John Bond] - Using ECS code compliant with RFC 7871 [John Bond]
- Properly trimming ECS address, as mandated by RFC 7871 [nnposter]
- Fixing a bug that prevented using the same ECS option table more than
once [nnposter]
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]

11
nselib/dns.lua
View File

@@ -1409,8 +1409,15 @@ function addClientSubnet(pkt,Z,subnet)
end end
assert(family == 1 or family == 2, "Unsupported subnet family") assert(family == 1 or family == 2, "Unsupported subnet family")
local code = 8 -- https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-11 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 mask = subnet.mask
local data = bin.pack(">SCCA",family,subnet.mask,scope_mask,ipOps.ip_to_str(subnet.address)) local scope_mask = 0 -- In requests, it MUST be set to 0
-- Per RFC 7871, section 6:
-- Address must have all insignificant bits zeroed out and insignificant bytes
-- must be trimmed off. (/24 IPv4 address is submitted as 3 octets, not 4.)
local addr = ipOps.ip_to_bin(subnet.address)
addr = ipOps.bin_to_ip(addr:sub(1, mask) .. ("0"):rep(#addr - mask))
addr = ipOps.ip_to_str(addr):sub(1, (mask + 7) // 8)
local data = bin.pack(">SCCA", family, mask, scope_mask, addr)
local opt = bin.pack(">SS",code, #data) .. data local opt = bin.pack(">SS",code, #data) .. data
addOPT(pkt,Z,opt) addOPT(pkt,Z,opt)
end end