diff options
| -rw-r--r-- | src/plugins/map/ip4_map_t.c | 8 | ||||
| -rw-r--r-- | test/test_map.py | 149 |
2 files changed, 155 insertions, 2 deletions
diff --git a/src/plugins/map/ip4_map_t.c b/src/plugins/map/ip4_map_t.c index c6b091294bb..a64b767c908 100644 --- a/src/plugins/map/ip4_map_t.c +++ b/src/plugins/map/ip4_map_t.c @@ -736,6 +736,14 @@ ip4_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) ip4_map_t_classify (p0, d0, ip40, ip4_len0, &map_port0, &error0, &next0); + /* Verify that port is not among the well-known ports */ + if ((d0->psid_length > 0 && d0->psid_offset > 0) + && (clib_net_to_host_u16 (map_port0) < + (0x1 << (16 - d0->psid_offset)))) + { + error0 = MAP_ERROR_SEC_CHECK; + } + //Add MAP-T pseudo header in front of the packet vlib_buffer_advance (p0, -sizeof (*pheader0)); pheader0 = vlib_buffer_get_current (p0); diff --git a/test/test_map.py b/test/test_map.py index 1a53492f136..d76c4bc2842 100644 --- a/test/test_map.py +++ b/test/test_map.py @@ -8,8 +8,8 @@ from vpp_ip import DpoProto from vpp_ip_route import VppIpRoute, VppRoutePath from scapy.layers.l2 import Ether, Raw -from scapy.layers.inet import IP, UDP, ICMP -from scapy.layers.inet6 import IPv6 +from scapy.layers.inet import IP, UDP, ICMP, TCP, fragment +from scapy.layers.inet6 import IPv6, ICMPv6TimeExceeded class TestMAP(VppTestCase): @@ -163,5 +163,150 @@ class TestMAP(VppTestCase): pre_res_route.remove_vpp_config() self.vapi.ppcli("map params pre-resolve del ip6-nh 4001::1") + def validate(self, rx, expected): + self.assertEqual(rx, expected.__class__(str(expected))) + + def payload(self, len): + return 'x' * len + + def test_map_t(self): + """ MAP-T """ + + # + # Add a domain that maps from pg0 to pg1 + # + map_dst = socket.inet_pton(socket.AF_INET6, "2001:db8::") + map_src = socket.inet_pton(socket.AF_INET6, "1234:5678:90ab:cdef::") + ip4_pfx = socket.inet_pton(socket.AF_INET, "192.168.0.0") + + self.vapi.map_add_domain(map_dst, 32, map_src, 64, ip4_pfx, + 24, 16, 6, 4, 1) + + # Enable MAP-T on interfaces. + + # self.vapi.map_if_enable_disable(1, self.pg0.sw_if_index, 1) + # self.vapi.map_if_enable_disable(1, self.pg1.sw_if_index, 1) + + map_route = VppIpRoute(self, + "2001:db8::", + 32, + [VppRoutePath(self.pg1.remote_ip6, + self.pg1.sw_if_index, + proto=DpoProto.DPO_PROTO_IP6)], + is_ip6=1) + map_route.add_vpp_config() + + # + # Send a v4 packet that will be translated + # + p_ether = Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) + p_ip4 = IP(src=self.pg0.remote_ip4, dst='192.168.0.1') + payload = TCP(sport=0xabcd, dport=0xabcd) + + p4 = (p_ether / p_ip4 / payload) + p6_translated = (IPv6(src="1234:5678:90ab:cdef:ac:1001:200:0", + dst="2001:db8:1f0::c0a8:1:f") / payload) + p6_translated.hlim -= 1 + rx = self.send_and_expect(self.pg0, p4*1, self.pg1) + for p in rx: + self.validate(p[1], p6_translated) + + # Send back an IPv6 packet that will be "untranslated" + p_ether6 = Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) + p_ip6 = IPv6(src='2001:db8:1f0::c0a8:1:f', + dst='1234:5678:90ab:cdef:ac:1001:200:0') + p6 = (p_ether6 / p_ip6 / payload) + p4_translated = (IP(src='192.168.0.1', + dst=self.pg0.remote_ip4) / payload) + p4_translated.id = 0 + p4_translated.ttl -= 1 + rx = self.send_and_expect(self.pg1, p6*1, self.pg0) + for p in rx: + self.validate(p[1], p4_translated) + + # IPv4 TTL + ip4_ttl_expired = IP(src=self.pg0.remote_ip4, dst='192.168.0.1', ttl=0) + p4 = (p_ether / ip4_ttl_expired / payload) + + icmp4_reply = (IP(id=0, ttl=254, src=self.pg0.local_ip4, + dst=self.pg0.remote_ip4) / + ICMP(type='time-exceeded', + code='ttl-zero-during-transit') / + IP(src=self.pg0.remote_ip4, + dst='192.168.0.1', ttl=0) / payload) + rx = self.send_and_expect(self.pg0, p4*1, self.pg0) + for p in rx: + self.validate(p[1], icmp4_reply) + + ''' + This one is broken, cause it would require hairpinning... + # IPv4 TTL TTL1 + ip4_ttl_expired = IP(src=self.pg0.remote_ip4, dst='192.168.0.1', ttl=1) + p4 = (p_ether / ip4_ttl_expired / payload) + + icmp4_reply = IP(id=0, ttl=254, src=self.pg0.local_ip4, + dst=self.pg0.remote_ip4) / \ + ICMP(type='time-exceeded', code='ttl-zero-during-transit' ) / \ + IP(src=self.pg0.remote_ip4, dst='192.168.0.1', ttl=0) / payload + rx = self.send_and_expect(self.pg0, p4*1, self.pg0) + for p in rx: + self.validate(p[1], icmp4_reply) + ''' + + # IPv6 Hop limit + ip6_hlim_expired = IPv6(hlim=0, src='2001:db8:1ab::c0a8:1:ab', + dst='1234:5678:90ab:cdef:ac:1001:200:0') + p6 = (p_ether6 / ip6_hlim_expired / payload) + + icmp6_reply = (IPv6(hlim=255, src=self.pg1.local_ip6, + dst="2001:db8:1ab::c0a8:1:ab") / + ICMPv6TimeExceeded(code=0) / + IPv6(src="2001:db8:1ab::c0a8:1:ab", + dst='1234:5678:90ab:cdef:ac:1001:200:0', + hlim=0) / payload) + rx = self.send_and_expect(self.pg1, p6*1, self.pg1) + for p in rx: + self.validate(p[1], icmp6_reply) + + # IPv4 Well-known port + p_ip4 = IP(src=self.pg0.remote_ip4, dst='192.168.0.1') + payload = UDP(sport=200, dport=200) + p4 = (p_ether / p_ip4 / payload) + self.send_and_assert_no_replies(self.pg0, p4*1) + + # IPv6 Well-known port + payload = UDP(sport=200, dport=200) + p6 = (p_ether6 / p_ip6 / payload) + self.send_and_assert_no_replies(self.pg1, p6*1) + + # Packet fragmentation + payload = UDP(sport=40000, dport=4000) / self.payload(1453) + p4 = (p_ether / p_ip4 / payload) + self.pg_enable_capture() + self.pg0.add_stream(p4) + self.pg_start() + rx = self.pg1.get_capture(2) + for p in rx: + pass + # TODO: Manual validation + # self.validate(p[1], icmp4_reply) + + # Packet fragmentation send fragments + payload = UDP(sport=40000, dport=4000) / self.payload(1453) + p4 = (p_ether / p_ip4 / payload) + frags = fragment(p4, fragsize=1000) + self.pg_enable_capture() + self.pg0.add_stream(frags) + self.pg_start() + rx = self.pg1.get_capture(2) + for p in rx: + pass + # p.show2() + # reass_pkt = reassemble(rx) + # p4_reply.ttl -= 1 + # p4_reply.id = 256 + # self.validate(reass_pkt, p4_reply) + + if __name__ == '__main__': unittest.main(testRunner=VppTestRunner) |