Page MenuHomeFreeBSD
Files F159776669

D21199.diff
No OneTemporary
Actions

D21199.diff
View Options

Index: head/tests/sys/netpfil/common/Makefile
===================================================================
--- head/tests/sys/netpfil/common/Makefile
+++ head/tests/sys/netpfil/common/Makefile
@@ -5,9 +5,12 @@
TESTSDIR= ${TESTSBASE}/sys/netpfil/common
-ATF_TESTS_SH+= pass_block \
+ATF_TESTS_SH+= \
+ pass_block \
+ nat
-${PACKAGE}FILES+= utils.subr \
- runner.subr
+${PACKAGE}FILES+= \
+ utils.subr \
+ runner.subr
.include <bsd.test.mk>
Index: head/tests/sys/netpfil/common/nat.sh
===================================================================
--- head/tests/sys/netpfil/common/nat.sh
+++ head/tests/sys/netpfil/common/nat.sh
@@ -0,0 +1,156 @@
+#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
+# Copyright (c) 2019 Ahsan Barkati
+#
+# 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 AUTHOR 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 AUTHOR 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.
+#
+# $FreeBSD$
+#
+
+. $(atf_get_srcdir)/utils.subr
+. $(atf_get_srcdir)/runner.subr
+
+basic_head()
+{
+ atf_set descr 'Basic IPv4 NAT test'
+ atf_set require.user root
+}
+
+basic_body()
+{
+ firewall=$1
+ firewall_init $firewall
+ nat_init $firewall
+
+ epair_host_nat=$(vnet_mkepair)
+ epair_client1_nat=$(vnet_mkepair)
+ epair_client2_nat=$(vnet_mkepair)
+
+ vnet_mkjail nat ${epair_host_nat}b ${epair_client1_nat}a ${epair_client2_nat}a
+ vnet_mkjail client1 ${epair_client1_nat}b
+ vnet_mkjail client2 ${epair_client2_nat}b
+
+ ifconfig ${epair_host_nat}a 198.51.100.2/24 up
+ jexec nat ifconfig ${epair_host_nat}b 198.51.100.1/24 up
+
+ jexec nat ifconfig ${epair_client1_nat}a 192.0.2.1/24 up
+ jexec client1 ifconfig ${epair_client1_nat}b 192.0.2.2/24 up
+
+ jexec nat ifconfig ${epair_client2_nat}a 192.0.3.1/24 up
+ jexec client2 ifconfig ${epair_client2_nat}b 192.0.3.2/24 up
+
+ jexec nat sysctl net.inet.ip.forwarding=1
+
+ jexec client1 route add -net 198.51.100.0/24 192.0.2.1
+ jexec client2 route add -net 198.51.100.0/24 192.0.3.1
+
+ # ping fails without NAT configuration
+ atf_check -s exit:2 -o ignore jexec client1 ping -t 1 -c 1 198.51.100.2
+ atf_check -s exit:2 -o ignore jexec client2 ping -t 1 -c 1 198.51.100.2
+
+ firewall_config nat ${firewall} \
+ "pf" \
+ "nat pass on ${epair_host_nat}b inet from any to any -> (${epair_host_nat}b)" \
+ "ipfw" \
+ "ipfw -q nat 123 config if ${epair_host_nat}b" \
+ "ipfw -q add 1000 nat 123 all from any to any" \
+ "ipfnat" \
+ "map ${epair_host_nat}b 192.0.3.0/24 -> 0/32" \
+ "map ${epair_host_nat}b 192.0.2.0/24 -> 0/32" \
+
+
+ # ping is successful now
+ atf_check -s exit:0 -o ignore jexec client1 ping -t 1 -c 1 198.51.100.2
+ atf_check -s exit:0 -o ignore jexec client2 ping -t 1 -c 1 198.51.100.2
+
+}
+
+basic_cleanup()
+{
+ firewall=$1
+ firewall_cleanup $firewall
+}
+
+userspace_nat_head()
+{
+ atf_set descr 'Nat test for ipfw using userspace natd'
+ atf_set require.user root
+}
+userspace_nat_body()
+{
+ firewall=$1
+ firewall_init $firewall
+
+ if ! kldstat -q -m ipdivert; then
+ atf_skip "This test requires ipdivert module loaded"
+ fi
+
+ epair_host_nat=$(vnet_mkepair)
+ epair_client1_nat=$(vnet_mkepair)
+ epair_client2_nat=$(vnet_mkepair)
+
+ vnet_mkjail nat ${epair_host_nat}b ${epair_client1_nat}a ${epair_client2_nat}a
+ vnet_mkjail client1 ${epair_client1_nat}b
+ vnet_mkjail client2 ${epair_client2_nat}b
+
+ ifconfig ${epair_host_nat}a 198.51.100.2/24 up
+ jexec nat ifconfig ${epair_host_nat}b 198.51.100.1/24 up
+
+ jexec nat ifconfig ${epair_client1_nat}a 192.0.2.1/24 up
+ jexec client1 ifconfig ${epair_client1_nat}b 192.0.2.2/24 up
+
+ jexec nat ifconfig ${epair_client2_nat}a 192.0.3.1/24 up
+ jexec client2 ifconfig ${epair_client2_nat}b 192.0.3.2/24 up
+
+ jexec nat sysctl net.inet.ip.forwarding=1
+
+ jexec client1 route add -net 198.51.100.0/24 192.0.2.1
+ jexec client2 route add -net 198.51.100.0/24 192.0.3.1
+ # Test the userspace NAT of ipfw
+ # ping fails without NAT configuration
+ atf_check -s exit:2 -o ignore jexec client1 ping -t 1 -c 1 198.51.100.2
+ atf_check -s exit:2 -o ignore jexec client2 ping -t 1 -c 1 198.51.100.2
+
+ firewall_config nat ${firewall} \
+ "ipfw" \
+ "natd -interface ${epair_host_nat}b" \
+ "ipfw -q add divert natd all from any to any via ${epair_host_nat}b" \
+
+ # ping is successful now
+ atf_check -s exit:0 -o ignore jexec client1 ping -t 1 -c 1 198.51.100.2
+ atf_check -s exit:0 -o ignore jexec client2 ping -t 1 -c 1 198.51.100.2
+}
+
+userspace_nat_cleanup()
+{
+ firewall=$1
+ firewall_cleanup $firewall
+}
+
+setup_tests \
+ basic \
+ pf \
+ ipfw \
+ ipfnat \
+ userspace_nat \
+ ipfw
\ No newline at end of file
Index: head/tests/sys/netpfil/common/utils.subr
===================================================================
--- head/tests/sys/netpfil/common/utils.subr
+++ head/tests/sys/netpfil/common/utils.subr
@@ -37,7 +37,7 @@
shift
while [ $# -gt 0 ]; do
- if [ $(is_firewall $fw) -eq 1 ]; then
+ if [ $(is_firewall "$1") -eq 1 ]; then
current_fw="$1"
shift
filename=${current_fw}.rule
@@ -94,13 +94,23 @@
atf_skip "This test requires ipf"
fi
elif [ ${firewall} == "ipfnat" ]; then
- if ! kldstat -q -m ipfw_nat; then
- atf_skip "This test requires ipfw_nat"
+ if ! kldstat -q -m ipfilter; then
+ atf_skip "This test requires ipf"
fi
else
atf_fail "$fw is not a valid firewall to initialize"
fi
+}
+
+nat_init()
+{
+ firewall=$1
+ if [ ${firewall} == "ipfw" ]; then
+ if ! kldstat -q -m ipfw_nat; then
+ atf_skip "This test requires ipfw_nat"
+ fi
+ fi
}
is_firewall()
@@ -110,4 +120,4 @@
else
echo 0
fi
-}
\ No newline at end of file
+}

File Metadata

Mime Type
text/plain
Expires
Fri, Jun 19, 3:09 AM (10 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34065255
Default Alt Text
D21199.diff (6 KB)

Event Timeline