Module Name: src
Committed By: ozaki-r
Date: Wed May 10 09:08:25 UTC 2017
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/net/ipsec: Makefile
Added Files:
src/tests/net/ipsec: t_ipsec_tunnel_odd.sh
Log Message:
Test tunnel mode with IPv4 over IPv6 and IPv6 over IPv4
To generate a diff of this commit:
cvs rdiff -u -r1.737 -r1.738 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.4 -r1.5 src/tests/net/ipsec/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/ipsec/t_ipsec_tunnel_odd.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.737 src/distrib/sets/lists/tests/mi:1.738
--- src/distrib/sets/lists/tests/mi:1.737 Thu Apr 27 06:53:44 2017
+++ src/distrib/sets/lists/tests/mi Wed May 10 09:08:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.737 2017/04/27 06:53:44 ozaki-r Exp $
+# $NetBSD: mi,v 1.738 2017/05/10 09:08:25 ozaki-r Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3303,6 +3303,7 @@
./usr/tests/net/ipsec/t_ipsec_sysctl tests-net-tests atf,rump
./usr/tests/net/ipsec/t_ipsec_transport tests-net-tests atf,rump
./usr/tests/net/ipsec/t_ipsec_tunnel tests-net-tests atf,rump
+./usr/tests/net/ipsec/t_ipsec_tunnel_odd tests-net-tests atf,rump
./usr/tests/net/ipsec/t_ipsec_gif tests-net-tests atf,rump
./usr/tests/net/ipsec/t_ipsec_l2tp tests-net-tests atf,rump
./usr/tests/net/mcast tests-net-tests compattestfile,atf
Index: src/tests/net/ipsec/Makefile
diff -u src/tests/net/ipsec/Makefile:1.4 src/tests/net/ipsec/Makefile:1.5
--- src/tests/net/ipsec/Makefile:1.4 Tue May 9 04:25:28 2017
+++ src/tests/net/ipsec/Makefile Wed May 10 09:08:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/05/09 04:25:28 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.5 2017/05/10 09:08:25 ozaki-r Exp $
#
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
TESTSDIR= ${TESTSBASE}/net/ipsec
.for name in ipsec_ah_keys ipsec_esp_keys ipsec_gif ipsec_l2tp ipsec_sysctl \
- ipsec_transport ipsec_tunnel
+ ipsec_transport ipsec_tunnel ipsec_tunnel_odd
TESTS_SH+= t_${name}
TESTS_SH_SRC_t_${name}= ../net_common.sh ./common.sh ./algorithms.sh \
t_${name}.sh
Added files:
Index: src/tests/net/ipsec/t_ipsec_tunnel_odd.sh
diff -u /dev/null src/tests/net/ipsec/t_ipsec_tunnel_odd.sh:1.1
--- /dev/null Wed May 10 09:08:25 2017
+++ src/tests/net/ipsec/t_ipsec_tunnel_odd.sh Wed May 10 09:08:25 2017
@@ -0,0 +1,354 @@
+# $NetBSD: t_ipsec_tunnel_odd.sh,v 1.1 2017/05/10 09:08:25 ozaki-r Exp $
+#
+# Copyright (c) 2017 Internet Initiative Japan Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+SOCK_LOCAL=unix://ipsec_local
+SOCK_TUNNEL_LOCAL=unix://ipsec_tunel_local
+SOCK_TUNNEL_REMOTE=unix://ipsec_tunnel_remote
+SOCK_REMOTE=unix://ipsec_remote
+BUS_LOCAL=./bus_ipsec_local
+BUS_TUNNEL=./bus_ipsec_tunnel
+BUS_REMOTE=./bus_ipsec_remote
+
+DEBUG=${DEBUG:-false}
+
+setup_servers()
+{
+
+ # See https://www.netbsd.org/docs/network/ipsec/#sample_vpn
+ rump_server_crypto_start $SOCK_LOCAL netinet6
+ rump_server_crypto_start $SOCK_TUNNEL_LOCAL netipsec netinet6
+ rump_server_crypto_start $SOCK_TUNNEL_REMOTE netipsec netinet6
+ rump_server_crypto_start $SOCK_REMOTE netinet6
+ rump_server_add_iface $SOCK_LOCAL shmif0 $BUS_LOCAL
+ rump_server_add_iface $SOCK_TUNNEL_LOCAL shmif0 $BUS_LOCAL
+ rump_server_add_iface $SOCK_TUNNEL_LOCAL shmif1 $BUS_TUNNEL
+ rump_server_add_iface $SOCK_TUNNEL_REMOTE shmif0 $BUS_REMOTE
+ rump_server_add_iface $SOCK_TUNNEL_REMOTE shmif1 $BUS_TUNNEL
+ rump_server_add_iface $SOCK_REMOTE shmif0 $BUS_REMOTE
+}
+
+check_tunnel_packets()
+{
+ local outfile=$1
+ local src=$2
+ local dst=$3
+ local proto=$4
+
+ atf_check -s exit:0 -o match:"$src > $dst: $proto" cat $outfile
+ atf_check -s exit:0 -o match:"$dst > $src: $proto" cat $outfile
+}
+
+test_ipsec46_tunnel()
+{
+ local proto=$1
+ local algo=$2
+ local ip_local=10.0.1.2
+ local ip_gw_local=10.0.1.1
+ local ip_gw_local_tunnel=20.0.0.1
+ local ip_gw_remote_tunnel=20.0.0.2
+ local ip6_gw_local_tunnel=fc00::1
+ local ip6_gw_remote_tunnel=fc00::2
+ local ip_gw_remote=10.0.2.1
+ local ip_remote=10.0.2.2
+ local subnet_local=10.0.1.0
+ local subnet_remote=10.0.2.0
+ local keylen=$(get_one_valid_keylen $algo)
+ local key=$(generate_key $keylen)
+ local tmpfile=./tmp
+ local outfile=./out
+ local opt= proto_cap=
+
+ if [ $proto = esp ]; then
+ opt=-E
+ proto_cap=ESP
+ else
+ opt=-A
+ proto_cap=AH
+ fi
+
+ setup_servers
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.dad_count=0
+ atf_check -s exit:0 rump.ifconfig shmif0 $ip_local/24
+ atf_check -s exit:0 -o ignore \
+ rump.route -n add -net $subnet_remote $ip_gw_local
+
+ export RUMP_SERVER=$SOCK_TUNNEL_LOCAL
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.dad_count=0
+ atf_check -s exit:0 rump.sysctl -q -w net.inet6.ip6.dad_count=0
+ atf_check -s exit:0 rump.ifconfig shmif0 $ip_gw_local/24
+ atf_check -s exit:0 rump.ifconfig shmif1 $ip_gw_local_tunnel/24
+ atf_check -s exit:0 rump.ifconfig shmif1 inet6 $ip6_gw_local_tunnel/24
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=1
+ atf_check -s exit:0 -o ignore \
+ rump.route -n add -net $subnet_remote $ip_gw_remote_tunnel
+
+ export RUMP_SERVER=$SOCK_TUNNEL_REMOTE
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.dad_count=0
+ atf_check -s exit:0 rump.sysctl -q -w net.inet6.ip6.dad_count=0
+ atf_check -s exit:0 rump.ifconfig shmif0 $ip_gw_remote/24
+ atf_check -s exit:0 rump.ifconfig shmif1 $ip_gw_remote_tunnel/24
+ atf_check -s exit:0 rump.ifconfig shmif1 inet6 $ip6_gw_remote_tunnel/24
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=1
+ atf_check -s exit:0 -o ignore \
+ rump.route -n add -net $subnet_local $ip_gw_local_tunnel
+
+ export RUMP_SERVER=$SOCK_REMOTE
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.dad_count=0
+ atf_check -s exit:0 rump.ifconfig shmif0 $ip_remote/24
+ atf_check -s exit:0 -o ignore \
+ rump.route -n add -net $subnet_local $ip_gw_remote
+
+ extract_new_packets $BUS_TUNNEL > $outfile
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore rump.ping -c 1 -n -w 3 $ip_remote
+
+ extract_new_packets $BUS_TUNNEL > $outfile
+ atf_check -s exit:0 \
+ -o match:"$ip_local > $ip_remote: ICMP echo request" \
+ cat $outfile
+ atf_check -s exit:0 \
+ -o match:"$ip_remote > $ip_local: ICMP echo reply" \
+ cat $outfile
+
+ export RUMP_SERVER=$SOCK_TUNNEL_LOCAL
+ # from https://www.netbsd.org/docs/network/ipsec/
+ cat > $tmpfile <<-EOF
+ add $ip6_gw_local_tunnel $ip6_gw_remote_tunnel $proto 10000 $opt $algo $key;
+ add $ip6_gw_remote_tunnel $ip6_gw_local_tunnel $proto 10001 $opt $algo $key;
+ spdadd $subnet_local/24 $subnet_remote/24 any -P out ipsec
+ $proto/tunnel/$ip6_gw_local_tunnel-$ip6_gw_remote_tunnel/require;
+ spdadd $subnet_remote/24 $subnet_local/24 any -P in ipsec
+ $proto/tunnel/$ip6_gw_remote_tunnel-$ip6_gw_local_tunnel/require;
+ EOF
+ $DEBUG && cat $tmpfile
+ atf_check -s exit:0 -o empty $HIJACKING setkey -c < $tmpfile
+ check_sa_entries $SOCK_TUNNEL_LOCAL $ip6_gw_local_tunnel \
+ $ip6_gw_remote_tunnel
+
+ export RUMP_SERVER=$SOCK_TUNNEL_REMOTE
+ cat > $tmpfile <<-EOF
+ add $ip6_gw_local_tunnel $ip6_gw_remote_tunnel $proto 10000 $opt $algo $key;
+ add $ip6_gw_remote_tunnel $ip6_gw_local_tunnel $proto 10001 $opt $algo $key;
+ spdadd $subnet_remote/24 $subnet_local/24 any -P out ipsec
+ $proto/tunnel/$ip6_gw_remote_tunnel-$ip6_gw_local_tunnel/require;
+ spdadd $subnet_local/24 $subnet_remote/24 any -P in ipsec
+ $proto/tunnel/$ip6_gw_local_tunnel-$ip6_gw_remote_tunnel/require;
+ EOF
+ $DEBUG && cat $tmpfile
+ atf_check -s exit:0 -o empty $HIJACKING setkey -c < $tmpfile
+ check_sa_entries $SOCK_TUNNEL_REMOTE $ip6_gw_local_tunnel \
+ $ip6_gw_remote_tunnel
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore rump.ping -c 1 -n -w 3 $ip_remote
+
+ extract_new_packets $BUS_TUNNEL > $outfile
+ check_tunnel_packets $outfile $ip6_gw_local_tunnel $ip6_gw_remote_tunnel \
+ $proto_cap
+
+ test_flush_entries $SOCK_TUNNEL_LOCAL
+ test_flush_entries $SOCK_TUNNEL_REMOTE
+}
+
+test_ipsec64_tunnel()
+{
+ local proto=$1
+ local algo=$2
+ local ip_local=fd00:1::2
+ local ip_gw_local=fd00:1::1
+ local ip_gw_local_tunnel=fc00::1
+ local ip_gw_remote_tunnel=fc00::2
+ local ip4_gw_local_tunnel=20.0.0.1
+ local ip4_gw_remote_tunnel=20.0.0.2
+ local ip_gw_remote=fd00:2::1
+ local ip_remote=fd00:2::2
+ local subnet_local=fd00:1::
+ local subnet_remote=fd00:2::
+ local keylen=$(get_one_valid_keylen $algo)
+ local key=$(generate_key $keylen)
+ local tmpfile=./tmp
+ local outfile=./out
+ local opt= proto_cap=
+
+ if [ $proto = esp ]; then
+ opt=-E
+ proto_cap=ESP
+ else
+ opt=-A
+ proto_cap=AH
+ fi
+
+ setup_servers
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 rump.sysctl -q -w net.inet6.ip6.dad_count=0
+ atf_check -s exit:0 rump.ifconfig shmif0 inet6 $ip_local/64
+ atf_check -s exit:0 -o ignore \
+ rump.route -n add -inet6 -net $subnet_remote/64 $ip_gw_local
+
+ export RUMP_SERVER=$SOCK_TUNNEL_LOCAL
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.dad_count=0
+ atf_check -s exit:0 rump.sysctl -q -w net.inet6.ip6.dad_count=0
+ atf_check -s exit:0 rump.ifconfig shmif0 inet6 $ip_gw_local/64
+ atf_check -s exit:0 rump.ifconfig shmif1 inet6 $ip_gw_local_tunnel/64
+ atf_check -s exit:0 rump.ifconfig shmif1 $ip4_gw_local_tunnel
+ atf_check -s exit:0 rump.sysctl -q -w net.inet6.ip6.forwarding=1
+ atf_check -s exit:0 -o ignore \
+ rump.route -n add -inet6 -net $subnet_remote/64 $ip_gw_remote_tunnel
+
+ export RUMP_SERVER=$SOCK_TUNNEL_REMOTE
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.dad_count=0
+ atf_check -s exit:0 rump.sysctl -q -w net.inet6.ip6.dad_count=0
+ atf_check -s exit:0 rump.ifconfig shmif0 inet6 $ip_gw_remote/64
+ atf_check -s exit:0 rump.ifconfig shmif1 inet6 $ip_gw_remote_tunnel/64
+ atf_check -s exit:0 rump.ifconfig shmif1 $ip4_gw_remote_tunnel
+ atf_check -s exit:0 rump.sysctl -q -w net.inet6.ip6.forwarding=1
+ atf_check -s exit:0 -o ignore \
+ rump.route -n add -inet6 -net $subnet_local/64 $ip_gw_local_tunnel
+
+ export RUMP_SERVER=$SOCK_REMOTE
+ atf_check -s exit:0 rump.sysctl -q -w net.inet6.ip6.dad_count=0
+ atf_check -s exit:0 rump.ifconfig shmif0 inet6 $ip_remote
+ atf_check -s exit:0 -o ignore \
+ rump.route -n add -inet6 -net $subnet_local/64 $ip_gw_remote
+
+ extract_new_packets $BUS_TUNNEL > $outfile
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore rump.ping6 -c 1 -n -X 3 $ip_remote
+
+ extract_new_packets $BUS_TUNNEL > $outfile
+ atf_check -s exit:0 \
+ -o match:"$ip_local > $ip_remote: ICMP6, echo request" \
+ cat $outfile
+ atf_check -s exit:0 \
+ -o match:"$ip_remote > $ip_local: ICMP6, echo reply" \
+ cat $outfile
+
+ export RUMP_SERVER=$SOCK_TUNNEL_LOCAL
+ # from https://www.netbsd.org/docs/network/ipsec/
+ cat > $tmpfile <<-EOF
+ add $ip4_gw_local_tunnel $ip4_gw_remote_tunnel $proto 10000 $opt $algo $key;
+ add $ip4_gw_remote_tunnel $ip4_gw_local_tunnel $proto 10001 $opt $algo $key;
+ spdadd $subnet_local/64 $subnet_remote/64 any -P out ipsec
+ $proto/tunnel/$ip4_gw_local_tunnel-$ip4_gw_remote_tunnel/require;
+ spdadd $subnet_remote/64 $subnet_local/64 any -P in ipsec
+ $proto/tunnel/$ip4_gw_remote_tunnel-$ip4_gw_local_tunnel/require;
+ EOF
+ $DEBUG && cat $tmpfile
+ atf_check -s exit:0 -o empty $HIJACKING setkey -c < $tmpfile
+ check_sa_entries $SOCK_TUNNEL_LOCAL $ip4_gw_local_tunnel \
+ $ip4_gw_remote_tunnel
+
+ export RUMP_SERVER=$SOCK_TUNNEL_REMOTE
+ cat > $tmpfile <<-EOF
+ add $ip4_gw_local_tunnel $ip4_gw_remote_tunnel $proto 10000 $opt $algo $key;
+ add $ip4_gw_remote_tunnel $ip4_gw_local_tunnel $proto 10001 $opt $algo $key;
+ spdadd $subnet_remote/64 $subnet_local/64 any -P out ipsec
+ $proto/tunnel/$ip4_gw_remote_tunnel-$ip4_gw_local_tunnel/require;
+ spdadd $subnet_local/64 $subnet_remote/64 any -P in ipsec
+ $proto/tunnel/$ip4_gw_local_tunnel-$ip4_gw_remote_tunnel/require;
+ EOF
+ $DEBUG && cat $tmpfile
+ atf_check -s exit:0 -o empty $HIJACKING setkey -c < $tmpfile
+ check_sa_entries $SOCK_TUNNEL_REMOTE $ip4_gw_local_tunnel \
+ $ip4_gw_remote_tunnel
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore rump.ping6 -c 1 -n -X 3 $ip_remote
+
+ extract_new_packets $BUS_TUNNEL > $outfile
+ check_tunnel_packets $outfile $ip4_gw_local_tunnel $ip4_gw_remote_tunnel \
+ $proto_cap
+
+ test_flush_entries $SOCK_TUNNEL_LOCAL
+ test_flush_entries $SOCK_TUNNEL_REMOTE
+}
+
+test_tunnel_common()
+{
+ local ipproto=$1
+ local proto=$2
+ local algo=$3
+
+ if [ $ipproto = v4v6 ]; then
+ test_ipsec46_tunnel $proto $algo
+ else
+ test_ipsec64_tunnel $proto $algo
+ fi
+}
+
+add_test_tunnel_mode()
+{
+ local ipproto=$1
+ local proto=$2
+ local algo=$3
+ local _algo=$(echo $algo | sed 's/-//g')
+ local name= desc=
+
+ name="ipsec_tunnel_${ipproto}_${proto}_${_algo}"
+ if [ $ipproto = v4v6 ]; then
+ desc="Tests of IPsec tunnel mode (IPv4 over IPv6) with $proto ($algo)"
+ else
+ desc="Tests of IPsec tunnel mode (IPv6 over IPv4) with $proto ($algo)"
+ fi
+
+ atf_test_case ${name} cleanup
+ eval " \
+ ${name}_head() { \
+ atf_set \"descr\" \"$desc\"; \
+ atf_set \"require.progs\" \"rump_server\" \"setkey\"; \
+ }; \
+ ${name}_body() { \
+ test_tunnel_common $ipproto $proto $algo; \
+ rump_server_destroy_ifaces; \
+ }; \
+ ${name}_cleanup() { \
+ $DEBUG && dump; \
+ cleanup; \
+ } \
+ "
+ atf_add_test_case ${name}
+}
+
+atf_init_test_cases()
+{
+ local algo=
+
+ for algo in $ESP_ENCRYPTION_ALGORITHMS; do
+ add_test_tunnel_mode v4v6 esp $algo
+ add_test_tunnel_mode v6v4 esp $algo
+ done
+
+ for algo in $AH_AUTHENTICATION_ALGORITHMS; do
+ add_test_tunnel_mode v4v6 ah $algo
+ add_test_tunnel_mode v6v4 ah $algo
+ done
+}
