The branch main has been updated by kp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=db0d002a217b1171ca85e8c17706de744ab6635d

commit db0d002a217b1171ca85e8c17706de744ab6635d
Author:     Kristof Provost <[email protected]>
AuthorDate: 2025-10-28 13:13:56 +0000
Commit:     Kristof Provost <[email protected]>
CommitDate: 2025-10-29 08:38:58 +0000

    pf tests: tftp-proxy test case
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 tests/sys/netpfil/pf/Makefile               |  2 +
 tests/sys/netpfil/pf/proxy.sh               | 61 +++++++++++++++++++++++++++++
 tests/sys/netpfil/pf/tftpd_inetd.conf       | 28 +++++++++++++
 tests/sys/netpfil/pf/tftpd_proxy_inetd.conf | 27 +++++++++++++
 4 files changed, 118 insertions(+)

diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile
index b363e0b17c76..9416f6abbdf1 100644
--- a/tests/sys/netpfil/pf/Makefile
+++ b/tests/sys/netpfil/pf/Makefile
@@ -90,6 +90,8 @@ ${PACKAGE}FILES+=     \
                        pft_ether.py \
                        pft_read_ipfix.py \
                        rdr-srcport.py \
+                       tftpd_inetd.conf \
+                       tftpd_proxy_inetd.conf \
                        utils.subr \
                        utils.py
 
diff --git a/tests/sys/netpfil/pf/proxy.sh b/tests/sys/netpfil/pf/proxy.sh
index 78ce25930c04..a07bb259b544 100644
--- a/tests/sys/netpfil/pf/proxy.sh
+++ b/tests/sys/netpfil/pf/proxy.sh
@@ -88,7 +88,68 @@ ftp_cleanup()
        pft_cleanup
 }
 
+atf_test_case "tftp" "cleanup"
+tftp_head()
+{
+       atf_set descr 'Test tftp-proxy'
+       atf_set require.user root
+}
+
+tftp_body()
+{
+       pft_init
+
+       epair_client=$(vnet_mkepair)
+       epair_link=$(vnet_mkepair)
+
+       ifconfig ${epair_client}a 192.0.2.2/24 up
+       route add -net 198.51.100.0/24 192.0.2.1
+
+       vnet_mkjail fwd ${epair_client}b ${epair_link}a
+       jexec fwd ifconfig lo0 127.0.0.1/8 up
+       jexec fwd ifconfig ${epair_client}b 192.0.2.1/24 up
+       jexec fwd ifconfig ${epair_link}a 198.51.100.1/24 up
+       jexec fwd ifconfig lo0 127.0.0.1/8 up
+       jexec fwd sysctl net.inet.ip.forwarding=1
+
+       vnet_mkjail srv ${epair_link}b
+       jexec srv ifconfig ${epair_link}b 198.51.100.2/24 up
+       jexec srv route add default 198.51.100.1
+
+       # Start tftp server in srv
+       jexec srv /usr/sbin/inetd -p ${PWD}/inetd-srv.pid \
+           $(atf_get_srcdir)/tftpd_inetd.conf
+
+       jexec fwd /usr/sbin/inetd -p ${PWD}/inetd-fwd.pid \
+           $(atf_get_srcdir)/tftpd_proxy_inetd.conf
+
+       jexec fwd pfctl -e
+       pft_set_rules fwd \
+               "nat on ${epair_link}a inet from 192.0.2.0/24 to any -> 
(${epair_link}a)" \
+               "nat-anchor \"tftp-proxy/*\"" \
+               "rdr-anchor \"tftp-proxy/*\"" \
+               "rdr pass on ${epair_client}b proto udp from 192.0.2.0/24 to 
any port 69 -> 127.0.0.1 port 69" \
+               "anchor \"tftp-proxy/*\"" \
+               "pass out proto udp from 127.0.0.1 to any port 69"
+
+       # Create a dummy file to download
+       echo 'foo' > /tmp/remote.txt
+       echo 'get remote.txt local.txt' | tftp 198.51.100.2
+
+       # Compare the downloaded file to the original
+       if ! diff -q local.txt /tmp/remote.txt;
+       then
+               atf_fail 'Failed to retrieve file'
+       fi
+}
+
+tftp_cleanup()
+{
+       pft_cleanup
+}
+
 atf_init_test_cases()
 {
        atf_add_test_case "ftp"
+       atf_add_test_case "tftp"
 }
diff --git a/tests/sys/netpfil/pf/tftpd_inetd.conf 
b/tests/sys/netpfil/pf/tftpd_inetd.conf
new file mode 100644
index 000000000000..3554d0a7fb08
--- /dev/null
+++ b/tests/sys/netpfil/pf/tftpd_inetd.conf
@@ -0,0 +1,28 @@
+#
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2025 Rubicon Communications, LLC (Netgate)
+#
+# 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.
+
+tftp   dgram   udp     wait    root    /usr/libexec/tftpd      tftpd -l -S -s 
/tmp
+tftp   dgram   udp6    wait    root    /usr/libexec/tftpd      tftpd -l -S -s 
/tmp
diff --git a/tests/sys/netpfil/pf/tftpd_proxy_inetd.conf 
b/tests/sys/netpfil/pf/tftpd_proxy_inetd.conf
new file mode 100644
index 000000000000..aa5f000f3bba
--- /dev/null
+++ b/tests/sys/netpfil/pf/tftpd_proxy_inetd.conf
@@ -0,0 +1,27 @@
+#
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2025 Rubicon Communications, LLC (Netgate)
+#
+# 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.
+
+tftp   dgram   udp     wait    root    /usr/libexec/tftp-proxy tftp-proxy

Reply via email to