pf tests: Fix accidental duplication of content

Also use the correct name for the scapy test script.
This commit is contained in:
Kristof Provost 2019-03-23 01:07:51 +00:00
parent bc94b70098
commit dcccc93ae4
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=345430

View File

@ -32,56 +32,7 @@ cve_2019_5598_body()
"pass in proto udp to 198.51.100.3 port 53" \
"pass out proto udp to 198.51.100.3 port 53"
atf_check -s exit:0 $(atf_get_srcdir)/CVE-2019-icmp.py \
--sendif ${epair_in}a \
--recvif ${epair_out}a \
--src 192.0.2.1 \
--to 198.51.100.3
}
cve_2019_5598_cleanup()
{
pft_cleanup
}
atf_init_test_cases()
{
atf_add_test_case "cve_2019_5598"
}
# $FreeBSD$
. $(atf_get_srcdir)/utils.subr
atf_test_case "cve_2019_5598" "cleanup"
cve_2019_5598_head()
{
atf_set descr 'Test CVE-2019-5598'
atf_set require.user root
atf_set require.progs scapy
}
cve_2019_5598_body()
{
pft_init
epair_in=$(vnet_mkepair)
epair_out=$(vnet_mkepair)
ifconfig ${epair_in}a 192.0.2.1/24 up
ifconfig ${epair_out}a up
vnet_mkjail alcatraz ${epair_in}b ${epair_out}b
jexec alcatraz ifconfig ${epair_in}b 192.0.2.2/24 up
jexec alcatraz ifconfig ${epair_out}b 198.51.100.2/24 up
jexec alcatraz sysctl net.inet.ip.forwarding=1
jexec alcatraz arp -s 198.51.100.3 00:01:02:03:04:05
route add -net 198.51.100.0/24 192.0.2.2
jexec alcatraz pfctl -e
pft_set_rules alcatraz "block all" \
"pass in proto udp to 198.51.100.3 port 53" \
"pass out proto udp to 198.51.100.3 port 53"
atf_check -s exit:0 $(atf_get_srcdir)/CVE-2019-icmp.py \
atf_check -s exit:0 $(atf_get_srcdir)/CVE-2019-5598.py \
--sendif ${epair_in}a \
--recvif ${epair_out}a \
--src 192.0.2.1 \