tcp: Add support for L3 domains to MD5 auth
Subsystems (4)
cover tcp: Add support for L3 domains to MD5 auth
From: David Ahern <[email protected]>
With VRF, the scope of network addresses is limited to the L3 domain the device is associated. MD5 keys are based on addresses, so proper VRF support requires an L3 domain to be considered for the lookups.
Leverage the new TCP_MD5SIG_EXT option to add support for a device index
to MD5 keys. The __tcpm_pad entry in tcp_md5sig is renamed to tcpm_ifindex and a new flag, TCP_MD5SIG_FLAG_IFINDEX, in tcpm_flags determines if the entry is examined. This follows what was done for MD5 and prefixes with commits
8917a777be3b ("tcp: md5: add TCP_MD5SIG_EXT socket option to set a key address prefix") 6797318e623d ("tcp: md5: add an address prefix for key lookup")
Handling both a device AND L3 domain is much more complicated for the response paths. This set focuses only on L3 support - requiring the device index to be an l3mdev (ie, VRF). Support for slave devices can be added later if desired, much like the progression of support for sockets bound to a VRF and then bound to a device in a VRF. Kernel code is setup to explicitly call out that current lookup is for an L3 index, while the uapi just references a device index allowing its meaning to include other devices in the future.
David Ahern (9):
ipv4/tcp: Use local variable for tcp_md5_addr ipv6/tcp: Pass dif and sdif to tcp_v6_inbound_md5_hash ipv4/tcp: Pass dif and sdif to tcp_v4_inbound_md5_hash
tcp: Add l3index to tcp_md5sig_key and md5 functions
net: Add device index to tcp_md5sig
nettest: Return 1 on MD5 failure for server mode
nettest: Add support for TCP_MD5 extensions
fcnal-test: Add TCP MD5 tests
fcnal-test: Add TCP MD5 tests for VRF
include/net/tcp.h | 24 +- include/uapi/linux/tcp.h | 5 +- net/ipv4/tcp_ipv4.c | 126 +++++--- net/ipv6/tcp_ipv6.c | 105 +++++-- tools/testing/selftests/net/fcnal-test.sh | 458 ++++++++++++++++++++++++++++++ tools/testing/selftests/net/nettest.c | 84 +++++- 6 files changed, 715 insertions(+), 87 deletions(-)
Signature · 1 line
2.11.0
PATCH 1/9 ipv4/tcp: Use local variable for tcp_md5_addr
From: David Ahern <[email protected]>
Extract the typecast to (union tcp_md5_addr *) to a local variable rather than the current long, inline declaration with function calls.
No functional change intended.
--- net/ipv4/tcp_ipv4.c | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-)
net/ipv4/tcp_ipv4.c +26 -17
@@ -701,9 +701,13 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)rcu_read_lock (); hash_location =tcp_parse_md5sig_option (th);if (sk &&sk_fullsock (sk)) { - key =tcp_md5_do_lookup (sk, (union tcp_md5_addr *) - &ip_hdr (skb)->saddr,AF_INET ); +const union tcp_md5_addr *addr; + + addr = (union tcp_md5_addr *)&ip_hdr (skb)->saddr; + key =tcp_md5_do_lookup (sk, addr,AF_INET ); }else if (hash_location) { +const union tcp_md5_addr *addr; +/* * active side is lost. Try to find listening socket through * source port, and then find md5 key through listening socket.
@@ -720,8 +724,8 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)if (!sk1) goto out; - key =tcp_md5_do_lookup (sk1, (union tcp_md5_addr *) - &ip_hdr (skb)->saddr,AF_INET ); + addr = (union tcp_md5_addr *)&ip_hdr (skb)->saddr; + key =tcp_md5_do_lookup (sk1, addr,AF_INET );if (!key) goto out;
@@ -905,6 +909,8 @@ static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)static void tcp_v4_reqsk_send_ack (const struct sock *sk,struct sk_buff *skb,struct request_sock *req) { +const union tcp_md5_addr *addr; +/* sk->sk_state == TCP_LISTEN -> for regular TCP_SYN_RECV * sk->sk_state == TCP_SYN_RECV -> for Fast Open. */
@@ -916,14 +922,14 @@ static void tcp_v4_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb,* exception of <SYN> segments, MUST be right-shifted by * Rcv.Wind.Shift bits: */ + addr = (union tcp_md5_addr *)&ip_hdr (skb)->saddr;tcp_v4_send_ack (sk, skb, seq,tcp_rsk (req)->rcv_nxt, req->rsk_rcv_wnd >>inet_rsk (req)->rcv_wscale,tcp_time_stamp_raw () +tcp_rsk (req)->ts_off, req->ts_recent,0 , -tcp_md5_do_lookup (sk, (union tcp_md5_addr *)&ip_hdr (skb)->saddr, -AF_INET ), +tcp_md5_do_lookup (sk, addr,AF_INET ),inet_rsk (req)->no_srccheck ?IP_REPLY_ARG_NOSRCCHECK :0 ,ip_hdr (skb)->tos); }
@@ -1149,6 +1155,7 @@ static int tcp_v4_parse_md5_keys(struct sock *sk, int optname, {struct tcp_md5sig cmd;struct sockaddr_in *sin = (struct sockaddr_in *)&cmd.tcpm_addr; +const union tcp_md5_addr *addr;u8 prefixlen =32 ;if (optlen <sizeof (cmd))
@@ -1167,16 +1174,16 @@ static int tcp_v4_parse_md5_keys(struct sock *sk, int optname,return -EINVAL ; } + addr = (union tcp_md5_addr *)&sin->sin_addr.s_addr; +if (!cmd.tcpm_keylen) -return tcp_md5_do_del (sk, (union tcp_md5_addr *)&sin->sin_addr.s_addr, -AF_INET , prefixlen); +return tcp_md5_do_del (sk, addr,AF_INET , prefixlen);if (cmd.tcpm_keylen >TCP_MD5SIG_MAXKEYLEN )return -EINVAL ; -return tcp_md5_do_add (sk, (union tcp_md5_addr *)&sin->sin_addr.s_addr, -AF_INET , prefixlen, cmd.tcpm_key, cmd.tcpm_keylen, -GFP_KERNEL ); +return tcp_md5_do_add (sk, addr,AF_INET , prefixlen, + cmd.tcpm_key, cmd.tcpm_keylen,GFP_KERNEL ); } static int tcp_v4_md5_hash_headers(struct tcp_md5sig_pool *hp,
@@ -1301,11 +1308,12 @@ static bool tcp_v4_inbound_md5_hash(const struct sock *sk,struct tcp_md5sig_key *hash_expected;const struct iphdr *iph =ip_hdr (skb);const struct tcphdr *th =tcp_hdr (skb); +const union tcp_md5_addr *addr;int genhash;unsigned char newhash[16 ]; - hash_expected =tcp_md5_do_lookup (sk, (union tcp_md5_addr *)&iph->saddr, -AF_INET ); + addr = (union tcp_md5_addr *)&iph->saddr; + hash_expected =tcp_md5_do_lookup (sk, addr,AF_INET ); hash_location =tcp_parse_md5sig_option (th);/* We've parsed the options - do we have a hash? */
@@ -1419,6 +1427,7 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,struct tcp_sock *newtp;struct sock *newsk;#ifdef CONFIG_TCP_MD5SIG +const union tcp_md5_addr *addr;struct tcp_md5sig_key *key;#endif struct ip_options_rcu *inet_opt;
@@ -1468,8 +1477,8 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,#ifdef CONFIG_TCP_MD5SIG /* Copy over the MD5 key from the original socket */ - key =tcp_md5_do_lookup (sk, (union tcp_md5_addr *)&newinet->inet_daddr, -AF_INET ); + addr = (union tcp_md5_addr *)&newinet->inet_daddr; + key =tcp_md5_do_lookup (sk, addr,AF_INET );if (key) {/* * We're using one, so create a matching key
@@ -1477,8 +1486,8 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,* memory, then we end up not copying the key * across. Shucks. */ -tcp_md5_do_add (newsk, (union tcp_md5_addr *)&newinet->inet_daddr, -AF_INET ,32 , key->key, key->keylen,GFP_ATOMIC ); +tcp_md5_do_add (newsk, addr,AF_INET ,32 , + key->key, key->keylen,GFP_ATOMIC ); sk_nocaps_add(newsk, NETIF_F_GSO_MASK); }#endif
Signature · 1 line
2.11.0
PATCH 2/9 ipv6/tcp: Pass dif and sdif to tcp_v6_inbound_md5_hash
In reply to David AhernFrom: David Ahern <[email protected]>
The original ingress device index is saved to the cb space of the skb and the cb is moved during tcp processing. Since tcp_v6_inbound_md5_hash can be called before and after the cb move, pass dif and sdif to it so the caller can save both prior to the cb move. Both are used by a later patch.
--- net/ipv6/tcp_ipv6.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
net/ipv6/tcp_ipv6.c +9 -6
@@ -698,7 +698,8 @@ static int tcp_v6_md5_hash_skb(char *md5_hash,#endif static bool tcp_v6_inbound_md5_hash (const struct sock *sk, -const struct sk_buff *skb) +const struct sk_buff *skb, +int dif,int sdif) {#ifdef CONFIG_TCP_MD5SIG const __u8 *hash_location =NULL ;
@@ -953,6 +954,9 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb)if (sk &&sk_fullsock (sk)) { key =tcp_v6_md5_do_lookup (sk, &ipv6h->saddr); }else if (hash_location) { +int dif =tcp_v6_iif_l3_slave (skb); +int sdif =tcp_v6_sdif (skb); +/* * active side is lost. Try to find listening socket through * source port, and then find md5 key through listening socket.
@@ -964,9 +968,7 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb) &tcp_hashinfo,NULL ,0 , &ipv6h->saddr, th->source, &ipv6h->daddr, -ntohs (th->source), -tcp_v6_iif_l3_slave (skb), - tcp_v6_sdif(skb)); + ntohs(th->source), dif, sdif);if (!sk1) goto out;
@@ -1480,6 +1482,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) {struct sk_buff *skb_to_free;int sdif =inet6_sdif (skb); +int dif =inet6_iif (skb);const struct tcphdr *th;const struct ipv6hdr *hdr;bool refcounted;
@@ -1528,7 +1531,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb)struct sock *nsk; sk = req->rsk_listener; -if (tcp_v6_inbound_md5_hash (sk, skb)) { +if (tcp_v6_inbound_md5_hash (sk, skb, dif, sdif)) {sk_drops_add (sk, skb);reqsk_put (req); goto discard_it;
@@ -1583,7 +1586,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb)if (!xfrm6_policy_check (sk,XFRM_POLICY_IN , skb)) goto discard_and_relse; -if (tcp_v6_inbound_md5_hash (sk, skb)) +if (tcp_v6_inbound_md5_hash (sk, skb, dif, sdif)) goto discard_and_relse;if (tcp_filter (sk, skb))
Signature · 1 line
2.11.0
PATCH 3/9 ipv4/tcp: Pass dif and sdif to tcp_v4_inbound_md5_hash
In reply to David AhernFrom: David Ahern <[email protected]>
The original ingress device index is saved to the cb space of the skb and the cb is moved during tcp processing. Since tcp_v4_inbound_md5_hash can be called before and after the cb move, pass dif and sdif to it so the caller can save both prior to the cb move. Both are used by a later patch.
--- net/ipv4/tcp_ipv4.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
net/ipv4/tcp_ipv4.c +8 -5
@@ -707,6 +707,8 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb) key =tcp_md5_do_lookup (sk, addr,AF_INET ); }else if (hash_location) {const union tcp_md5_addr *addr; +int sdif =tcp_v4_sdif (skb); +int dif =inet_iif (skb);/* * active side is lost. Try to find listening socket through
@@ -718,8 +720,7 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb) sk1 =__inet_lookup_listener (net, &tcp_hashinfo,NULL ,0 ,ip_hdr (skb)->saddr, th->source,ip_hdr (skb)->daddr, -ntohs (th->source),inet_iif (skb), -tcp_v4_sdif (skb)); +ntohs (th->source), dif, sdif);/* don't send rst if it can't find key */ if (!sk1) goto out;
@@ -1293,7 +1294,8 @@ EXPORT_SYMBOL(tcp_v4_md5_hash_skb);/* Called with rcu_read_lock() */ static bool tcp_v4_inbound_md5_hash (const struct sock *sk, -const struct sk_buff *skb) +const struct sk_buff *skb, +int dif,int sdif) {#ifdef CONFIG_TCP_MD5SIG /*
@@ -1817,6 +1819,7 @@ int tcp_v4_rcv(struct sk_buff *skb)struct net *net =dev_net (skb->dev);struct sk_buff *skb_to_free;int sdif =inet_sdif (skb); +int dif =inet_iif (skb);const struct iphdr *iph;const struct tcphdr *th;bool refcounted;
@@ -1865,7 +1868,7 @@ int tcp_v4_rcv(struct sk_buff *skb)struct sock *nsk; sk = req->rsk_listener; -if (unlikely (tcp_v4_inbound_md5_hash (sk, skb))) { +if (unlikely (tcp_v4_inbound_md5_hash (sk, skb, dif, sdif))) {sk_drops_add (sk, skb);reqsk_put (req); goto discard_it;
@@ -1923,7 +1926,7 @@ int tcp_v4_rcv(struct sk_buff *skb)if (!xfrm4_policy_check (sk,XFRM_POLICY_IN , skb)) goto discard_and_relse; -if (tcp_v4_inbound_md5_hash (sk, skb)) +if (tcp_v4_inbound_md5_hash (sk, skb, dif, sdif)) goto discard_and_relse;nf_reset_ct (skb);
Signature · 1 line
2.11.0
PATCH 4/9 tcp: Add l3index to tcp_md5sig_key and md5 functions
In reply to David AhernFrom: David Ahern <[email protected]>
Add l3index to tcp_md5sig_key to represent the L3 domain of a key, and add l3index to tcp_md5_do_add and tcp_md5_do_del to fill in the key.
With the key now based on an l3index, add the new parameter to the lookup functions and consider the l3index when looking for a match.
The l3index comes from the skb when processing ingress packets leveraging the helpers created for socket lookups, tcp_v4_sdif and inet_iif (and the v6 variants). When the sdif index is set it means the packet ingressed a device that is part of an L3 domain and inet_iif points to the VRF device. For egress, the L3 domain is determined from the socket binding and sk_bound_dev_if.
--- include/net/tcp.h | 24 +++++++++--------- net/ipv4/tcp_ipv4.c | 68 +++++++++++++++++++++++++++++++++++--------------- net/ipv6/tcp_ipv6.c | 72 +++++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 113 insertions(+), 51 deletions(-)
include/net/tcp.h +12 -12
@@ -1532,8 +1532,9 @@ struct tcp_md5sig_key {struct hlist_node node;u8 keylen;u8 family;/* AF_INET or AF_INET6 */ -union tcp_md5_addr addr;u8 prefixlen; +union tcp_md5_addr addr; +int l3index;/* set if key added with L3 scope */ u8 key[TCP_MD5SIG_MAXKEYLEN ];struct rcu_head rcu; };
@@ -1577,34 +1578,33 @@ struct tcp_md5sig_pool {int tcp_v4_md5_hash_skb (char *md5_hash,const struct tcp_md5sig_key *key,const struct sock *sk,const struct sk_buff *skb);int tcp_md5_do_add (struct sock *sk,const union tcp_md5_addr *addr, -int family,u8 prefixlen,const u8 *newkey,u8 newkeylen, -gfp_t gfp); +int family,u8 prefixlen,int l3index, +const u8 *newkey,u8 newkeylen,gfp_t gfp);int tcp_md5_do_del (struct sock *sk,const union tcp_md5_addr *addr, -int family,u8 prefixlen); +int family,u8 prefixlen,int l3index);struct tcp_md5sig_key *tcp_v4_md5_lookup (const struct sock *sk,const struct sock *addr_sk);#ifdef CONFIG_TCP_MD5SIG #include <linux/jump_label.h> extern struct static_key_false tcp_md5_needed; -struct tcp_md5sig_key *__tcp_md5_do_lookup (const struct sock *sk, +struct tcp_md5sig_key *__tcp_md5_do_lookup (const struct sock *sk,int l3index,const union tcp_md5_addr *addr,int family);static inline struct tcp_md5sig_key * -tcp_md5_do_lookup (const struct sock *sk, -const union tcp_md5_addr *addr, -int family) +tcp_md5_do_lookup (const struct sock *sk,int l3index, +const union tcp_md5_addr *addr,int family) {if (!static_branch_unlikely (&tcp_md5_needed))return NULL ; -return __tcp_md5_do_lookup (sk, addr, family); +return __tcp_md5_do_lookup (sk, l3index, addr, family); }#define tcp_twsk_md5_key (twsk) ((twsk)->tw_md5_key)#else -static inline struct tcp_md5sig_key *tcp_md5_do_lookup (const struct sock *sk, -const union tcp_md5_addr *addr, -int family) +static inline struct tcp_md5sig_key * +tcp_md5_do_lookup (const struct sock *sk,int l3index, +const union tcp_md5_addr *addr,int family) {return NULL ; }
net/ipv4/tcp_ipv4.c +48 -20
217 lines not on this page · raw message
net/ipv6/tcp_ipv6.c +53 -19
173 lines not on this page · raw message
Signature · 1 line
2.11.0
PATCH 5/9 net: Add device index to tcp_md5sig
In reply to David AhernFrom: David Ahern <[email protected]>
Add support for userspace to specify a device index to limit the scope of an entry via the TCP_MD5SIG_EXT setsockopt. The existing __tcpm_pad is renamed to tcpm_ifindex and the new field is only checked if the new TCP_MD5SIG_FLAG_IFINDEX is set in tcpm_flags. For now, the device index must point to an L3 master device (e.g., VRF). The API and error handling are setup to allow the constraint to be relaxed in the future to any device index.
--- include/uapi/linux/tcp.h | 5 +++-- net/ipv4/tcp_ipv4.c | 18 ++++++++++++++++++ net/ipv6/tcp_ipv6.c | 20 +++++++++++++++++++- 3 files changed, 40 insertions(+), 3 deletions(-)
include/uapi/linux/tcp.h +3 -2
@@ -317,14 +317,15 @@ enum {#define TCP_MD5SIG_MAXKEYLEN 80/* tcp_md5sig extension flags for TCP_MD5SIG_EXT */ -#define TCP_MD5SIG_FLAG_PREFIX 1/* address prefix length */ +#define TCP_MD5SIG_FLAG_PREFIX 0x1/* address prefix length */ +#define TCP_MD5SIG_FLAG_IFINDEX 0x2/* ifindex set */ struct tcp_md5sig {struct __kernel_sockaddr_storage tcpm_addr;/* address associated */ __u8 tcpm_flags;/* extension flags */ __u8 tcpm_prefixlen;/* address prefix */ __u16 tcpm_keylen;/* key length */ -__u32 __tcpm_pad;/* zero */ +int tcpm_ifindex;/* device index for scope */ __u8 tcpm_key[TCP_MD5SIG_MAXKEYLEN ];/* key (binary) */ };
net/ipv4/tcp_ipv4.c +18 -0
@@ -1196,6 +1196,24 @@ static int tcp_v4_parse_md5_keys(struct sock *sk, int optname,return -EINVAL ; } +if (optname ==TCP_MD5SIG_EXT && + cmd.tcpm_flags &TCP_MD5SIG_FLAG_IFINDEX ) { +struct net_device *dev; + +rcu_read_lock (); + dev =dev_get_by_index_rcu (sock_net (sk), cmd.tcpm_ifindex); +if (dev &&netif_is_l3_master (dev)) + l3index = dev->ifindex; + +rcu_read_unlock (); + +/* ok to reference set/not set outside of rcu; +* right now device MUST be an L3 master +*/ +if (!dev || !l3index) +return -EINVAL ; + } + addr = (union tcp_md5_addr *)&sin->sin_addr.s_addr;if (!cmd.tcpm_keylen)
net/ipv6/tcp_ipv6.c +19 -1
@@ -578,10 +578,28 @@ static int tcp_v6_parse_md5_keys(struct sock *sk, int optname, prefixlen =ipv6_addr_v4mapped (&sin6->sin6_addr) ?32 :128 ; } +if (optname ==TCP_MD5SIG_EXT && + cmd.tcpm_flags &TCP_MD5SIG_FLAG_IFINDEX ) { +struct net_device *dev; + +rcu_read_lock (); + dev =dev_get_by_index_rcu (sock_net (sk), cmd.tcpm_ifindex); +if (dev &&netif_is_l3_master (dev)) + l3index = dev->ifindex; +rcu_read_unlock (); + +/* ok to reference set/not set outside of rcu; +* right now device MUST be an L3 master +*/ +if (!dev || !l3index) +return -EINVAL ; + } +if (!cmd.tcpm_keylen) {if (ipv6_addr_v4mapped (&sin6->sin6_addr))return tcp_md5_do_del (sk, (union tcp_md5_addr *)&sin6->sin6_addr.s6_addr32[3 ], -AF_INET , prefixlen, l3index); +AF_INET , prefixlen, + l3index);return tcp_md5_do_del (sk, (union tcp_md5_addr *)&sin6->sin6_addr,AF_INET6 , prefixlen, l3index); }
Signature · 1 line
2.11.0
PATCH 6/9 nettest: Return 1 on MD5 failure for server mode
In reply to David AhernFrom: David Ahern <[email protected]>
On failure to set MD5 password, do_server should return 1 so that the program exits with 1 rather than 255. This used for negative testing when adding MD5 with device option.
--- tools/testing/selftests/net/nettest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/nettest.c +1 -1
@@ -1194,7 +1194,7 @@ static int do_server(struct sock_args *args)if (args->password &&tcp_md5_remote (lsd, args)) {close (lsd); -return -1 ; +return 1 ; }while (1 ) {
Signature · 1 line
2.11.0
PATCH 7/9 nettest: Add support for TCP_MD5 extensions
In reply to David AhernFrom: David Ahern <[email protected]>
Update nettest to implement TCP_MD5SIG_EXT for a prefix and a device.
Add a new option, -m, to specify a prefix and length to use with MD5 auth. The device option comes from the existing -d option. If either are set and MD5 auth is requested, TCP_MD5SIG_EXT is used instead of TCP_MD5SIG.
--- tools/testing/selftests/net/nettest.c | 82 +++++++++++++++++++++++++++++------ 1 file changed, 69 insertions(+), 13 deletions(-)
tools/testing/selftests/net/nettest.c +69 -13
@@ -74,7 +74,14 @@ struct sock_args {int use_cmsg;const char *dev;int ifindex; +const char *password; +/* prefix for MD5 password */ +union { +struct sockaddr_in v4; +struct sockaddr_in6 v6; + } md5_prefix; +unsigned int prefix_len;/* expected addresses and device index for connection */ int expected_ifindex;
@@ -200,20 +207,33 @@ static void log_address(const char *desc, struct sockaddr *sa)fflush (stdout); } -static int tcp_md5sig (int sd,void *addr,socklen_t alen,const char *password) +static int tcp_md5sig (int sd,void *addr,socklen_t alen,struct sock_args *args) { -struct tcp_md5sig md5sig; -int keylen = password ?strlen (password) :0 ; +int keylen =strlen (args->password); +struct tcp_md5sig md5sig = {}; +int opt =TCP_MD5SIG ;int rc; -memset (&md5sig,0 ,sizeof (md5sig)); -memcpy (&md5sig.tcpm_addr, addr, alen); md5sig.tcpm_keylen = keylen; +memcpy (md5sig.tcpm_key, args->password, keylen); -if (keylen) -memcpy (md5sig.tcpm_key, password, keylen); +if (args->prefix_len) { + opt =TCP_MD5SIG_EXT ; + md5sig.tcpm_flags |=TCP_MD5SIG_FLAG_PREFIX ; + + md5sig.tcpm_prefixlen = args->prefix_len; + addr = &args->md5_prefix; + } +memcpy (&md5sig.tcpm_addr, addr, alen); - rc =setsockopt (sd,IPPROTO_TCP ,TCP_MD5SIG , &md5sig,sizeof (md5sig)); +if (args->ifindex) { + opt =TCP_MD5SIG_EXT ; + md5sig.tcpm_flags |=TCP_MD5SIG_FLAG_IFINDEX ; + + md5sig.tcpm_ifindex = args->ifindex; + } + + rc =setsockopt (sd,IPPROTO_TCP , opt, &md5sig,sizeof (md5sig));if (rc <0 ) {/* ENOENT is harmless. Returned when a password is cleared */ if (errno ==ENOENT )
@@ -254,7 +274,7 @@ static int tcp_md5_remote(int sd, struct sock_args *args)exit (1 ); } -if (tcp_md5sig (sd, addr, alen, args->password)) +if (tcp_md5sig (sd, addr, alen, args))return -1 ;return 0 ;
@@ -1313,7 +1333,7 @@ static int connectsock(void *addr, socklen_t alen, struct sock_args *args)if (args->type !=SOCK_STREAM ) goto out; -if (args->password &&tcp_md5sig (sd, addr, alen, args->password)) +if (args->password &&tcp_md5sig (sd, addr, alen, args)) goto err;if (args->bind_test_only)
@@ -1405,16 +1425,18 @@ enum addr_type {ADDR_TYPE_MCAST ,ADDR_TYPE_EXPECTED_LOCAL ,ADDR_TYPE_EXPECTED_REMOTE , + ADDR_TYPE_MD5_PREFIX, };static int convert_addr (struct sock_args *args,const char *_str,enum addr_type atype) { +int pfx_len_max = args->version ==AF_INET6 ?128 :32 ;int family = args->version; +char *str, *dev, *sep;struct in6_addr *in6;struct in_addr *in;const char *desc; -char *str, *dev;void *addr;int rc =0 ;
@@ -1443,6 +1465,30 @@ static int convert_addr(struct sock_args *args, const char *_str, desc ="expected remote" ; addr = &args->expected_raddr;break ; +case ADDR_TYPE_MD5_PREFIX : + desc ="md5 prefix" ; +if (family ==AF_INET ) { + args->md5_prefix.v4.sin_family =AF_INET ; + addr = &args->md5_prefix.v4.sin_addr; + }else if (family ==AF_INET6 ) { + args->md5_prefix.v6.sin6_family =AF_INET6 ; + addr = &args->md5_prefix.v6.sin6_addr; + }else +return 1 ; + + sep =strchr (str,'/' ); +if (sep) { + *sep ='\0' ; + sep++; +if (str_to_uint (sep,1 , pfx_len_max, + &args->prefix_len) !=0 ) { +fprintf (stderr,"Invalid port\n" ); +return 1 ; + } + }else { + args->prefix_len = pfx_len_max; + } +break ;default :log_error ("unknown address type" );exit (1 );
@@ -1522,7 +1568,7 @@ static char *random_msg(int len)return m; } -#define GETOPT_STR "sr:l:p:t:g:P:DRn:M:d:SCi6L:0:1:2:Fbq" +#define GETOPT_STR "sr:l:p:t:g:P:DRn:M:m:d:SCi6L:0:1:2:Fbq"static void print_usage (char *prog) {
@@ -1551,6 +1597,7 @@ static void print_usage(char *prog)" -n num number of times to send message\n" "\n" " -M password use MD5 sum protection\n" +" -m prefix/len prefix and length to use for MD5 key\n" " -g grp multicast group (e.g., 239.1.1.1)\n" " -i interactive mode (default is echo and terminate)\n" "\n"
@@ -1642,6 +1689,10 @@ int main(int argc, char *argv[])case 'M' : args.password = optarg;break ; +case 'm' : +if (convert_addr (&args, optarg,ADDR_TYPE_MD5_PREFIX ) <0 ) +return 1 ; +break ;case 'S' : args.use_setsockopt =1 ;break ;
@@ -1706,11 +1757,16 @@ int main(int argc, char *argv[]) }if (args.password && - (!args.has_remote_ip || args.type !=SOCK_STREAM )) { + ((!args.has_remote_ip && !args.prefix_len) || args.type !=SOCK_STREAM )) {log_error ("MD5 passwords apply to TCP only and require a remote ip for the password\n" );return 1 ; } +if (args.prefix_len && !args.password) { +log_error ("Prefix range for MD5 protection specified without a password\n" ); +return 1 ; + } +if ((args.use_setsockopt || args.use_cmsg) && !args.ifindex) {fprintf (stderr,"Device binding not specified\n" );return 1 ;
Signature · 1 line
2.11.0
PATCH 8/9 fcnal-test: Add TCP MD5 tests
In reply to David AhernFrom: David Ahern <[email protected]>
Add tests for existing TCP MD5 APIs - both single address config and the new extended API for prefixes.
--- tools/testing/selftests/net/fcnal-test.sh | 145 ++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+)
tools/testing/selftests/net/fcnal-test.sh +145 -0
@@ -45,17 +45,22 @@ VRF_TABLE=1101 NSA_IP=172.16.1.1 NSB_IP=172.16.1.2 VRF_IP=172.16.3.1 +NS_NET=172.16.1.0/24 # IPv6 config NSA_IP6=2001:db8:1::1 NSB_IP6=2001:db8:1::2 VRF_IP6=2001:db8:3::1 +NS_NET6=2001:db8:1::/120 NSA_LO_IP=172.16.2.1 NSB_LO_IP=172.16.2.2 NSA_LO_IP6=2001:db8:2::1 NSB_LO_IP6=2001:db8:2::2 +MD5_PW=abc123 +MD5_WRONG_PW=abc1234 + MCAST=ff02::1 # set after namespace create NSA_LINKIP6=
@@ -714,6 +719,74 @@ ipv4_ping() ################################################################################ # IPv4 TCP +# +# MD5 tests without VRF +# +ipv4_tcp_md5_novrf() +{ + # + # single address + # + + # basic use case + log_start + run_cmd nettest -s -M ${MD5_PW} -r ${NSB_IP} & + sleep 1 + run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_PW} + log_test $? 0 "MD5: Single address config" + + # client sends MD5, server not configured + log_start + show_hint "Should timeout due to MD5 mismatch" + run_cmd nettest -s & + sleep 1 + run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_PW} + log_test $? 2 "MD5: Server no config, client uses password" + + # wrong password + log_start + show_hint "Should timeout since client uses wrong password" + run_cmd nettest -s -M ${MD5_PW} -r ${NSB_IP} & + sleep 1 + run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_WRONG_PW} + log_test $? 2 "MD5: Client uses wrong password" + + # client from different address + log_start + show_hint "Should timeout due to MD5 mismatch" + run_cmd nettest -s -M ${MD5_PW} -r ${NSB_LO_IP} & + sleep 1 + run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_PW} + log_test $? 2 "MD5: Client address does not match address configured with password" + + # + # MD5 extension - prefix length + # + + # client in prefix + log_start + run_cmd nettest -s -M ${MD5_PW} -m ${NS_NET} & + sleep 1 + run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_PW} + log_test $? 0 "MD5: Prefix config" + + # client in prefix, wrong password + log_start + show_hint "Should timeout since client uses wrong password" + run_cmd nettest -s -M ${MD5_PW} -m ${NS_NET} & + sleep 1 + run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_WRONG_PW} + log_test $? 2 "MD5: Prefix config, client uses wrong password" + + # client outside of prefix + log_start + show_hint "Should timeout due to MD5 mismatch" + run_cmd nettest -s -M ${MD5_PW} -m ${NS_NET} & + sleep 1 + run_cmd_nsb nettest -l ${NSB_LO_IP} -r ${NSA_IP} -M ${MD5_PW} + log_test $? 2 "MD5: Prefix config, client address not in configured prefix" +} + ipv4_tcp_novrf() { local a
@@ -831,6 +904,8 @@ ipv4_tcp_novrf() show_hint "Should fail 'Connection refused'" run_cmd nettest -d ${NSA_DEV} -r ${a} log_test_addr ${a} $? 1 "No server, device client, local conn" + + ipv4_tcp_md5_novrf } ipv4_tcp_vrf()
@@ -1961,6 +2036,74 @@ ipv6_ping() ################################################################################ # IPv6 TCP +# +# MD5 tests without VRF +# +ipv6_tcp_md5_novrf() +{ + # + # single address + # + + # basic use case + log_start + run_cmd nettest -6 -s -M ${MD5_PW} -r ${NSB_IP6} & + sleep 1 + run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_PW} + log_test $? 0 "MD5: Single address config" + + # client sends MD5, server not configured + log_start + show_hint "Should timeout due to MD5 mismatch" + run_cmd nettest -6 -s & + sleep 1 + run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_PW} + log_test $? 2 "MD5: Server no config, client uses password" + + # wrong password + log_start + show_hint "Should timeout since client uses wrong password" + run_cmd nettest -6 -s -M ${MD5_PW} -r ${NSB_IP6} & + sleep 1 + run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_WRONG_PW} + log_test $? 2 "MD5: Client uses wrong password" + + # client from different address + log_start + show_hint "Should timeout due to MD5 mismatch" + run_cmd nettest -6 -s -M ${MD5_PW} -r ${NSB_LO_IP6} & + sleep 1 + run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_PW} + log_test $? 2 "MD5: Client address does not match address configured with password" + + # + # MD5 extension - prefix length + # + + # client in prefix + log_start + run_cmd nettest -6 -s -M ${MD5_PW} -m ${NS_NET6} & + sleep 1 + run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_PW} + log_test $? 0 "MD5: Prefix config" + + # client in prefix, wrong password + log_start + show_hint "Should timeout since client uses wrong password" + run_cmd nettest -6 -s -M ${MD5_PW} -m ${NS_NET6} & + sleep 1 + run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_WRONG_PW} + log_test $? 2 "MD5: Prefix config, client uses wrong password" + + # client outside of prefix + log_start + show_hint "Should timeout due to MD5 mismatch" + run_cmd nettest -6 -s -M ${MD5_PW} -m ${NS_NET6} & + sleep 1 + run_cmd_nsb nettest -6 -l ${NSB_LO_IP6} -r ${NSA_IP6} -M ${MD5_PW} + log_test $? 2 "MD5: Prefix config, client address not in configured prefix" +} + ipv6_tcp_novrf() { local a
@@ -2077,6 +2220,8 @@ ipv6_tcp_novrf() run_cmd nettest -6 -d ${NSA_DEV} -r ${a} log_test_addr ${a} $? 1 "No server, device client, local conn" done + + ipv6_tcp_md5_novrf } ipv6_tcp_vrf()
Signature · 1 line
2.11.0
PATCH 9/9 fcnal-test: Add TCP MD5 tests for VRF
In reply to David AhernFrom: David Ahern <[email protected]>
Add tests for new TCP MD5 API for L3 domains (VRF).
A new namespace is added to create a duplicate configuration between the VRF and default VRF to verify overlapping config is handled properly.
--- tools/testing/selftests/net/fcnal-test.sh | 313 ++++++++++++++++++++++++++++++ 1 file changed, 313 insertions(+)
tools/testing/selftests/net/fcnal-test.sh +313 -0
@@ -32,12 +32,17 @@ # lo2: 127.0.0.1/8, ::1/128 # 172.16.2.2/32, 2001:db8:2::2/128 # +# ns-A to ns-C connection - only for VRF and same config +# as ns-A to ns-B +# # server / client nomenclature relative to ns-A VERBOSE=0 NSA_DEV=eth1 +NSA_DEV2=eth2 NSB_DEV=eth1 +NSC_DEV=eth2 VRF=red VRF_TABLE=1101
@@ -68,9 +73,11 @@ NSB_LINKIP6= NSA=ns-A NSB=ns-B +NSC=ns-C NSA_CMD="ip netns exec ${NSA}" NSB_CMD="ip netns exec ${NSB}" +NSC_CMD="ip netns exec ${NSC}" which ping6 > /dev/null 2>&1 && ping6=$(which ping6) || ping6=$(which ping)
@@ -200,6 +207,11 @@ run_cmd_nsb() do_run_cmd ${NSB_CMD} $* } +run_cmd_nsc() +{ + do_run_cmd ${NSC_CMD} $* +} + setup_cmd() { local cmd="$*"
@@ -406,6 +418,7 @@ cleanup() fi ip netns del ${NSB} + ip netns del ${NSC} >/dev/null 2>&1 } setup()
@@ -437,6 +450,12 @@ setup() ip -netns ${NSB} ro add ${VRF_IP}/32 via ${NSA_IP} dev ${NSB_DEV} ip -netns ${NSB} -6 ro add ${VRF_IP6}/128 via ${NSA_IP6} dev ${NSB_DEV} + + # some VRF tests use ns-C which has the same config as + # ns-B but for a device NOT in the VRF + create_ns ${NSC} "-" "-" + connect_ns ${NSA} ${NSA_DEV2} ${NSA_IP}/24 ${NSA_IP6}/64 \ + ${NSC} ${NSC_DEV} ${NSB_IP}/24 ${NSB_IP6}/64 else ip -netns ${NSA} ro add ${NSB_LO_IP}/32 via ${NSB_IP} dev ${NSA_DEV} ip -netns ${NSA} ro add ${NSB_LO_IP6}/128 via ${NSB_IP6} dev ${NSA_DEV}
@@ -787,6 +806,150 @@ ipv4_tcp_md5_novrf() log_test $? 2 "MD5: Prefix config, client address not in configured prefix" } +# +# MD5 tests with VRF +# +ipv4_tcp_md5() +{ + # + # single address + # + + # basic use case + log_start + run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -r ${NSB_IP} & + sleep 1 + run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_PW} + log_test $? 0 "MD5: VRF: Single address config" + + # client sends MD5, server not configured + log_start + show_hint "Should timeout since server does not have MD5 auth" + run_cmd nettest -s -d ${VRF} & + sleep 1 + run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_PW} + log_test $? 2 "MD5: VRF: Server no config, client uses password" + + # wrong password + log_start + show_hint "Should timeout since client uses wrong password" + run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -r ${NSB_IP} & + sleep 1 + run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_WRONG_PW} + log_test $? 2 "MD5: VRF: Client uses wrong password" + + # client from different address + log_start + show_hint "Should timeout since server config differs from client" + run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -r ${NSB_LO_IP} & + sleep 1 + run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_PW} + log_test $? 2 "MD5: VRF: Client address does not match address configured with password" + + # + # MD5 extension - prefix length + # + + # client in prefix + log_start + run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET} & + sleep 1 + run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_PW} + log_test $? 0 "MD5: VRF: Prefix config" + + # client in prefix, wrong password + log_start + show_hint "Should timeout since client uses wrong password" + run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET} & + sleep 1 + run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_WRONG_PW} + log_test $? 2 "MD5: VRF: Prefix config, client uses wrong password" + + # client outside of prefix + log_start + show_hint "Should timeout since client address is outside of prefix" + run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET} & + sleep 1 + run_cmd_nsb nettest -l ${NSB_LO_IP} -r ${NSA_IP} -M ${MD5_PW} + log_test $? 2 "MD5: VRF: Prefix config, client address not in configured prefix" + + # + # duplicate config between default VRF and a VRF + # + + log_start + run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -r ${NSB_IP} & + run_cmd nettest -s -M ${MD5_WRONG_PW} -r ${NSB_IP} & + sleep 1 + run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_PW} + log_test $? 0 "MD5: VRF: Single address config in default VRF and VRF, conn in VRF" + + log_start + run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -r ${NSB_IP} & + run_cmd nettest -s -M ${MD5_WRONG_PW} -r ${NSB_IP} & + sleep 1 + run_cmd_nsc nettest -r ${NSA_IP} -M ${MD5_WRONG_PW} + log_test $? 0 "MD5: VRF: Single address config in default VRF and VRF, conn in default VRF" + + log_start + show_hint "Should timeout since client in default VRF uses VRF password" + run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -r ${NSB_IP} & + run_cmd nettest -s -M ${MD5_WRONG_PW} -r ${NSB_IP} & + sleep 1 + run_cmd_nsc nettest -r ${NSA_IP} -M ${MD5_PW} + log_test $? 2 "MD5: VRF: Single address config in default VRF and VRF, conn in default VRF with VRF pw" + + log_start + show_hint "Should timeout since client in VRF uses default VRF password" + run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -r ${NSB_IP} & + run_cmd nettest -s -M ${MD5_WRONG_PW} -r ${NSB_IP} & + sleep 1 + run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_WRONG_PW} + log_test $? 2 "MD5: VRF: Single address config in default VRF and VRF, conn in VRF with default VRF pw" + + log_start + run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET} & + run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NS_NET} & + sleep 1 + run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_PW} + log_test $? 0 "MD5: VRF: Prefix config in default VRF and VRF, conn in VRF" + + log_start + run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET} & + run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NS_NET} & + sleep 1 + run_cmd_nsc nettest -r ${NSA_IP} -M ${MD5_WRONG_PW} + log_test $? 0 "MD5: VRF: Prefix config in default VRF and VRF, conn in default VRF" + + log_start + show_hint "Should timeout since client in default VRF uses VRF password" + run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET} & + run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NS_NET} & + sleep 1 + run_cmd_nsc nettest -r ${NSA_IP} -M ${MD5_PW} + log_test $? 2 "MD5: VRF: Prefix config in default VRF and VRF, conn in default VRF with VRF pw" + + log_start + show_hint "Should timeout since client in VRF uses default VRF password" + run_cmd nettest -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET} & + run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NS_NET} & + sleep 1 + run_cmd_nsb nettest -r ${NSA_IP} -M ${MD5_WRONG_PW} + log_test $? 2 "MD5: VRF: Prefix config in default VRF and VRF, conn in VRF with default VRF pw" + + # + # negative tests + # + log_start + run_cmd nettest -s -d ${NSA_DEV} -M ${MD5_PW} -r ${NSB_IP} + log_test $? 1 "MD5: VRF: Device must be a VRF - single address" + + log_start + run_cmd nettest -s -d ${NSA_DEV} -M ${MD5_PW} -m ${NS_NET} + log_test $? 1 "MD5: VRF: Device must be a VRF - prefix" + +} + ipv4_tcp_novrf() { local a
@@ -958,6 +1121,9 @@ ipv4_tcp_vrf() run_cmd nettest -r ${a} -d ${NSA_DEV} log_test_addr ${a} $? 1 "Global server, local connection" + # run MD5 tests + ipv4_tcp_md5 + # # enable VRF global server #
@@ -2104,6 +2270,150 @@ ipv6_tcp_md5_novrf() log_test $? 2 "MD5: Prefix config, client address not in configured prefix" } +# +# MD5 tests with VRF +# +ipv6_tcp_md5() +{ + # + # single address + # + + # basic use case + log_start + run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -r ${NSB_IP6} & + sleep 1 + run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_PW} + log_test $? 0 "MD5: VRF: Single address config" + + # client sends MD5, server not configured + log_start + show_hint "Should timeout since server does not have MD5 auth" + run_cmd nettest -6 -s -d ${VRF} & + sleep 1 + run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_PW} + log_test $? 2 "MD5: VRF: Server no config, client uses password" + + # wrong password + log_start + show_hint "Should timeout since client uses wrong password" + run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -r ${NSB_IP6} & + sleep 1 + run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_WRONG_PW} + log_test $? 2 "MD5: VRF: Client uses wrong password" + + # client from different address + log_start + show_hint "Should timeout since server config differs from client" + run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -r ${NSB_LO_IP6} & + sleep 1 + run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_PW} + log_test $? 2 "MD5: VRF: Client address does not match address configured with password" + + # + # MD5 extension - prefix length + # + + # client in prefix + log_start + run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET6} & + sleep 1 + run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_PW} + log_test $? 0 "MD5: VRF: Prefix config" + + # client in prefix, wrong password + log_start + show_hint "Should timeout since client uses wrong password" + run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET6} & + sleep 1 + run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_WRONG_PW} + log_test $? 2 "MD5: VRF: Prefix config, client uses wrong password" + + # client outside of prefix + log_start + show_hint "Should timeout since client address is outside of prefix" + run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET6} & + sleep 1 + run_cmd_nsb nettest -6 -l ${NSB_LO_IP6} -r ${NSA_IP6} -M ${MD5_PW} + log_test $? 2 "MD5: VRF: Prefix config, client address not in configured prefix" + + # + # duplicate config between default VRF and a VRF + # + + log_start + run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -r ${NSB_IP6} & + run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -r ${NSB_IP6} & + sleep 1 + run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_PW} + log_test $? 0 "MD5: VRF: Single address config in default VRF and VRF, conn in VRF" + + log_start + run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -r ${NSB_IP6} & + run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -r ${NSB_IP6} & + sleep 1 + run_cmd_nsc nettest -6 -r ${NSA_IP6} -M ${MD5_WRONG_PW} + log_test $? 0 "MD5: VRF: Single address config in default VRF and VRF, conn in default VRF" + + log_start + show_hint "Should timeout since client in default VRF uses VRF password" + run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -r ${NSB_IP6} & + run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -r ${NSB_IP6} & + sleep 1 + run_cmd_nsc nettest -6 -r ${NSA_IP6} -M ${MD5_PW} + log_test $? 2 "MD5: VRF: Single address config in default VRF and VRF, conn in default VRF with VRF pw" + + log_start + show_hint "Should timeout since client in VRF uses default VRF password" + run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -r ${NSB_IP6} & + run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -r ${NSB_IP6} & + sleep 1 + run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_WRONG_PW} + log_test $? 2 "MD5: VRF: Single address config in default VRF and VRF, conn in VRF with default VRF pw" + + log_start + run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET6} & + run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NS_NET6} & + sleep 1 + run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_PW} + log_test $? 0 "MD5: VRF: Prefix config in default VRF and VRF, conn in VRF" + + log_start + run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET6} & + run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NS_NET6} & + sleep 1 + run_cmd_nsc nettest -6 -r ${NSA_IP6} -M ${MD5_WRONG_PW} + log_test $? 0 "MD5: VRF: Prefix config in default VRF and VRF, conn in default VRF" + + log_start + show_hint "Should timeout since client in default VRF uses VRF password" + run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET6} & + run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NS_NET6} & + sleep 1 + run_cmd_nsc nettest -6 -r ${NSA_IP6} -M ${MD5_PW} + log_test $? 2 "MD5: VRF: Prefix config in default VRF and VRF, conn in default VRF with VRF pw" + + log_start + show_hint "Should timeout since client in VRF uses default VRF password" + run_cmd nettest -6 -s -d ${VRF} -M ${MD5_PW} -m ${NS_NET6} & + run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NS_NET6} & + sleep 1 + run_cmd_nsb nettest -6 -r ${NSA_IP6} -M ${MD5_WRONG_PW} + log_test $? 2 "MD5: VRF: Prefix config in default VRF and VRF, conn in VRF with default VRF pw" + + # + # negative tests + # + log_start + run_cmd nettest -6 -s -d ${NSA_DEV} -M ${MD5_PW} -r ${NSB_IP6} + log_test $? 1 "MD5: VRF: Device must be a VRF - single address" + + log_start + run_cmd nettest -6 -s -d ${NSA_DEV} -M ${MD5_PW} -m ${NS_NET6} + log_test $? 1 "MD5: VRF: Device must be a VRF - prefix" + +} + ipv6_tcp_novrf() { local a
@@ -2290,6 +2600,9 @@ ipv6_tcp_vrf() run_cmd nettest -6 -r ${a} -d ${NSA_DEV} log_test_addr ${a} $? 1 "Global server, local connection" + # run MD5 tests + ipv6_tcp_md5 + # # enable VRF global server #
Signature · 1 line
2.11.0
David Miller
maintainerFrom: David Ahern <[email protected]>
Date: Mon, 30 Dec 2019 14:14:24 -0800
Quoted 12 lines
With VRF, the scope of network addresses is limited to the L3 domain the device is associated. MD5 keys are based on addresses, so proper VRF support requires an L3 domain to be considered for the lookups.
Leverage the new
TCP_MD5SIG_EXToption to add support for a device index
to MD5 keys. The__tcpm_padentry intcp_md5sigis renamed totcpm_ifindexand a new flag,TCP_MD5SIG_FLAG_IFINDEX, intcpm_flagsdetermines if the entry is examined. This follows what was done for MD5 and prefixes with commits
8917a777be3b("tcp: md5: addTCP_MD5SIG_EXTsocket option to set a key address prefix")6797318e623d("tcp: md5: add an address prefix for key lookup")
Quoted 8 lines
Handling both a device AND L3 domain is much more complicated for the response paths. This set focuses only on L3 support - requiring the device index to be an l3mdev (ie, VRF). Support for slave devices can be added later if desired, much like the progression of support for sockets bound to a VRF and then bound to a device in a VRF. Kernel code is setup to explicitly call out that current lookup is for an L3 index, while the uapi just references a device index allowing its meaning to include other devices in the future.
Really nice work David, series applied to net-next.