diff --git a/CHANGELOG b/CHANGELOG index f428ddadc..b9a8b0091 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -21,6 +21,13 @@ o [NSE][GH#3447] IP options parsing by the packet library no longer crashes on incomplete options. IP header data after EOOL are no longer parsed as options. [nnposter] +o [NSE][GH#3213] Rudimentary support for 802.1Q / 802.1ad VLAN tags [nnposter] + - NSE packet.Frame:new() parses VLAN tags and captures the result in list + frame.vlans. Each element is a table containing the expected fields: + TPID, CPC, DEI, and VID (all in lowercase). + - NSE packet.Frame:build_ether_frame() takes an an optional parameter + in the form of the list above to build 802.1Q / 802.1ad headers. + o [NSE][GH#3456] Script http-config-backup was always failing. [h00die] o [NSE][GH#3440] The rsync library was not correctly parsing server responses diff --git a/libdnet-stripped/include/dnet/eth.h b/libdnet-stripped/include/dnet/eth.h index 8a9c1a879..f0c35cb9f 100644 --- a/libdnet-stripped/include/dnet/eth.h +++ b/libdnet-stripped/include/dnet/eth.h @@ -46,6 +46,7 @@ struct eth_hdr { #define ETH_TYPE_MPLS_MCAST 0x8848 /* MPLS Multicast */ #define ETH_TYPE_PPPOEDISC 0x8863 /* PPP Over Ethernet Discovery Stage */ #define ETH_TYPE_PPPOE 0x8864 /* PPP Over Ethernet Session Stage */ +#define ETH_TYPE_8021AD 0x88A8 /* IEEE 802.1ad VLAN tagging */ #define ETH_TYPE_LOOPBACK 0x9000 /* used to test interfaces */ #define ETH_IS_MULTICAST(ea) (*(ea) & 0x01) /* is address mcast/bcast? */ diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc index 5261b15f0..0ab55ff0a 100644 --- a/libnetutil/netutil.cc +++ b/libnetutil/netutil.cc @@ -3297,6 +3297,8 @@ int read_reply_pcap(pcap_t *pd, long to_usec, int badcounter = 0; struct timeval tv_start, tv_end; int ioffset; + size_t l2len; + unsigned ethertype; if (!pd) netutil_fatal("NULL packet device passed to %s", __func__); @@ -3359,11 +3361,14 @@ int read_reply_pcap(pcap_t *pd, long to_usec, } if (pcap_status == 1 && *p != NULL) { - /* Offset may be different in the case of 802.1q */ - if (*datalink == DLT_EN10MB - && (*head)->caplen >= sizeof(struct eth_hdr) - && 0 == memcmp((*p) + offsetof(struct eth_hdr, eth_type), "\x81\x00", 2)) { - *offset += 4; + /* Offset may be different in the case of 802.1Q */ + if (*datalink == DLT_EN10MB) { + /* Skip over 802.1Q tags; 802.1ad allows more than one */ + for (l2len = *offset; l2len <= (*head)->caplen; l2len += 4) { + ethertype = ntohs(*(uint16_t *)(*p + l2len - 2)); + if (ethertype != ETH_TYPE_8021Q && ethertype != ETH_TYPE_8021AD) break; + } + *offset = l2len; } if (accept_callback(*p, *head, *datalink, *offset)) { break; diff --git a/nselib/nmap.luadoc b/nselib/nmap.luadoc index b0f9b94fd..92becafac 100644 --- a/nselib/nmap.luadoc +++ b/nselib/nmap.luadoc @@ -711,7 +711,7 @@ function pcap_open(device, snaplen, promisc, bpf) -- @return The length of the captured packet (this may be smaller than the -- actual packet length since packets are truncated when the -- libpcap snaplen parameter is smaller than the total packet length). --- @return Data from the second OSI layer (e.g. ethernet headers). +-- @return Data from the second OSI layer (e.g. ethernet and VLAN headers). -- @return Data from the third OSI layer (e.g. IPv4 headers). -- @return Packet capture time, as floating point seconds since the epoch -- @see pcap_open diff --git a/nselib/packet.lua b/nselib/packet.lua index 704fb3e78..6ef3bc601 100644 --- a/nselib/packet.lua +++ b/nselib/packet.lua @@ -7,6 +7,7 @@ local ipOps = require "ipOps" local stdnse = require "stdnse" local string = require "string" +local tableaux = require "tableaux" local unittest = require "unittest" _ENV = stdnse.module("packet", stdnse.seeall) @@ -136,22 +137,34 @@ ND_OPT_RTR_ADV_INTERVAL = 7 ND_OPT_HOME_AGENT_INFO = 8 ETHER_TYPE_IPV4 = 0x0800 +ETHER_TYPE_8021Q = 0x8100 ETHER_TYPE_IPV6 = 0x86dd ETHER_TYPE_PPPOE_DISCOVERY = 0x8863 ETHER_TYPE_PPPOE_SESSION = 0x8864 ETHER_TYPE_EAPOL = 0x888e ETHER_TYPE_PROFINET = 0x8892 ETHER_TYPE_ATAOE = 0x88a2 +ETHER_TYPE_8021AD = 0x88a8 ---------------------------------------------------------------------------------------------------------------- -- Frame is a class Frame = {} function Frame:new(frame, force_continue) - local mac_dst, mac_src, ether_type, packet + local mac_dst, mac_src, ether_type, vlans, packet if frame and #frame >= 14 then local pos mac_dst, mac_src, ether_type, pos = ("c6c6>I2"):unpack(frame) + vlans = {} + while pos < #frame + 2 and (ether_type == ETHER_TYPE_8021Q or ether_type == ETHER_TYPE_8021AD) do + local vlan = {tpid=ether_type} + local tci + tci, ether_type, pos = (">I2I2"):unpack(frame, pos) + vlan.pcp = 0x0007 & (tci >> 13) + vlan.dei = 0x0001 & (tci >> 12) + vlan.vid = 0x0FFF & tci + table.insert(vlans, vlan) + end packet = frame:sub(pos, -1) if #packet == 0 then packet = nil end end @@ -162,6 +175,7 @@ function Frame:new(frame, force_continue) o.mac_dst = mac_dst o.mac_src = mac_src o.ether_type = ether_type + o.vlans = vlans return o end --- Build an Ethernet frame. @@ -169,16 +183,31 @@ end -- @param mac_src six-byte string of the source MAC address. -- @param ether_type IEEE 802 ethertype as a 16-bit integer (0x0800 for IPv4) -- @param packet string of the payload. +-- @param vlans list of VLAN tags. Each tag is a table of TPID and +-- TCI fields PCP, DEI, and VID. All fields are in lowercase and +-- optional. TPID defaults to 802.1Q for the last/inner-most tag +-- and 802.1ad otherwise. All TCI fields default to 0. -- @return frame string of the Ether frame. -function Frame:build_ether_frame(mac_dst, mac_src, ether_type, packet) +function Frame:build_ether_frame(mac_dst, mac_src, ether_type, packet, vlans) self.mac_dst = mac_dst or self.mac_dst self.mac_src = mac_src or self.mac_src self.ether_type = ether_type or self.ether_type + self.vlans = vlans and tableaux.tcopy(vlans) or self.vlans self.buf = packet or self.buf if not self.ether_type then return nil, "Unknown packet type." end - self.frame_buf = self.mac_dst..self.mac_src..(">I2"):pack(self.ether_type)..self.buf + local chunks = {self.mac_dst, self.mac_src} + for idx, vlan in ipairs(self.vlans or {}) do + vlan.tpid = 0xFFFF & (vlan.tpid or idx < #self.vlans and ETHER_TYPE_8021AD or ETHER_TYPE_8021Q) + vlan.pcp = 0x0007 & (vlan.pcp or 0) + vlan.dei = 0x0001 & (vlan.dei or 0) + vlan.vid = 0x0FFF & (vlan.vid or 0) + table.insert(chunks, (">I2I2"):pack(vlan.tpid, vlan.pcp << 13 | vlan.dei << 12 | vlan.vid)) + end + table.insert(chunks, (">I2"):pack(self.ether_type)) + table.insert(chunks, self.buf) + self.frame_buf = table.concat(chunks) end ---------------------------------------------------------------------------------------------------------------- @@ -1096,6 +1125,25 @@ for i, t in ipairs(opt_tests) do end end +-- Frame parsing tests +local frame1bytes = "\xff\xff\xff\xff\xff\xff\x00\x0c\x29\xad\x4f\x05" + .. "\x88\xa8" -- 802.1ad + .. "\x80\x6f" + .. "\x81\x00" -- 802.1Q + .. "\xd0\xde" + .. "\xba\xbe" -- reserved ;-) +local frame1 = Frame:new(frame1bytes) +local frame2 = Frame:new() +frame2:build_ether_frame("\xff\xff\xff\xff\xff\xff", + "\x00\x0c\x29\xad\x4f\x05", + 0xBABE, + nil, + {{vid=111,pcp=4},{vid=222,dei=1,pcp=6}}) +for k in ("frame_buf mac_dst mac_src ether_type vlans"):gmatch("%S+") do + test_suite:add_test(unittest.identical(frame1[k], frame2[k]), "Frame." .. k) +end + + -- TODO: UDP parsing/checksum -- TODO: IPv6 parsing, ICMPv6 checksum -- Basically, we need a lot more test coverage here. diff --git a/nsock/src/nsock_pcap.c b/nsock/src/nsock_pcap.c index 6762a5816..76a9ad574 100644 --- a/nsock/src/nsock_pcap.c +++ b/nsock/src/nsock_pcap.c @@ -73,6 +73,13 @@ #include "nsock_pcap.h" +#ifndef ETHERTYPE_8021Q +#define ETHERTYPE_8021Q 0x8100 +#endif +#ifndef ETHERTYPE_8021AD +#define ETHERTYPE_8021AD 0x88a8 +#endif + #if HAVE_PCAP #ifndef PCAP_NETMASK_UNKNOWN @@ -477,6 +484,7 @@ void nse_readpcap(nsock_event nsev, const unsigned char **l2_data, size_t *l2_le nsock_pcap *n; size_t l2l; size_t l3l; + unsigned ethertype; n = (nsock_pcap *)fs_str(&(nse->iobuf)); if (fs_length(&(nse->iobuf)) < sizeof(nsock_pcap)) { @@ -494,14 +502,17 @@ void nse_readpcap(nsock_event nsev, const unsigned char **l2_data, size_t *l2_le } l2l = mp->l3_offset; - if (mp->datalink == DLT_EN10MB - && n->caplen >= 14 /* size of ethernet header */ - && 0 == memcmp(n->packet + 12 /* offset of eth_type */, "\x81\x00", 2)) { - l2l += 4; + if (mp->datalink == DLT_EN10MB) { + /* Skip over 802.1Q tags; 802.1ad allows more than one */ + while (l2l < n->caplen) { + ethertype = ntohs(*(uint16_t *)(n->packet + l2l - 2)); + if (ethertype != ETHERTYPE_8021Q && ethertype != ETHERTYPE_8021AD) break; + l2l += 4; + } } if (l2l > n->caplen) l2l = n->caplen; - l3l = MAX(0, n->caplen - l2l); + l3l = n->caplen - l2l; if (l2_data) *l2_data = n->packet;