Date: Thu, 23 Jun 2022 14:58:48 GMT From: Tom Jones <thj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 795888971628 - main - Add tests for TCP_MD5 getsockopt Message-ID: <202206231458.25NEwmeT040320@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=795888971628db9cffbbd88cf3a7883897ff657d commit 795888971628db9cffbbd88cf3a7883897ff657d Author: Claudio Jeker <claudio@openbsd.org> AuthorDate: 2022-06-23 14:54:26 +0000 Commit: Tom Jones <thj@FreeBSD.org> CommitDate: 2022-06-23 14:57:56 +0000 Add tests for TCP_MD5 getsockopt Add tests for TCP_MD5 getsockopt for ipv6 and ipv4. These will only run when the kernel module is loaded, but will be in place if further regressions are found. Reviewed by: rscheff MFC after: 3 days Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D35532 --- tests/sys/netinet/Makefile | 3 +- tests/sys/netinet/tcp_md5_getsockopt.c | 135 +++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 1 deletion(-) diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile index ec2e6e679c18..f21e254cd30f 100644 --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -10,7 +10,8 @@ TESTS_SUBDIRS+= libalias ATF_TESTS_C= ip_reass_test \ so_reuseport_lb_test \ socket_afinet \ - tcp_connect_port_test + tcp_connect_port_test \ + tcp_md5_getsockopt ATF_TESTS_SH= carp fibs fibs_test redirect divert forward output lpm arp TEST_METADATA.output+= required_programs="python" diff --git a/tests/sys/netinet/tcp_md5_getsockopt.c b/tests/sys/netinet/tcp_md5_getsockopt.c new file mode 100644 index 000000000000..deaa4170caea --- /dev/null +++ b/tests/sys/netinet/tcp_md5_getsockopt.c @@ -0,0 +1,135 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2022, Klara Inc. + * Copyright (c) 2022, Claudio Jeker <claudio@openbsd.org> + * + * 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. + */ + +#include <sys/param.h> +#include <sys/linker.h> +#include <sys/socket.h> + +#include <netinet/in.h> +#include <netinet/tcp.h> + +#include <fcntl.h> +#include <unistd.h> +#include <err.h> + +#include <atf-c.h> + +void test_tcp_md5_getsockopt(int); + +void +test_tcp_md5_getsockopt(int v6) +{ + if (kldfind("tcpmd5.ko") == -1) + atf_tc_skip("Test requires the tcpmd5 kernel module to be loaded"); + + struct sockaddr_in *s; + struct sockaddr_in6 s6 = { 0 }; + struct sockaddr_in s4 = { 0 }; + socklen_t len; + int csock, ssock, opt; + int pf; + + if (v6) { + pf = PF_INET6; + len = sizeof(s6); + + s6.sin6_family = pf; + s6.sin6_len = sizeof(s6); + s6.sin6_addr = in6addr_loopback; + s6.sin6_port = 0; + + s = (struct sockaddr_in *)&s6; + } else { + pf = PF_INET; + len = sizeof(s4); + + s4.sin_family = pf; + s4.sin_len = sizeof(s4); + s4.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + s4.sin_port = 0; + + s = &s4; + } + + if ((ssock = socket(pf, SOCK_STREAM, 0)) == -1) + atf_tc_fail("creating server socket"); + + fcntl(ssock, F_SETFL, O_NONBLOCK); + + if ((bind(ssock, (struct sockaddr *)s, len) == -1)) + atf_tc_fail("binding to localhost"); + + getsockname(ssock, (struct sockaddr *)s, &len); + + listen(ssock, 1); + + if ((csock = socket(pf, SOCK_STREAM, 0)) == -1) + atf_tc_fail("creating client socket"); + + if (connect(csock, (struct sockaddr *)s, len) == -1) + atf_tc_fail("connecting to server instance"); + + if (getsockopt(csock, IPPROTO_TCP, TCP_MD5SIG, &opt, &len) == -1) + atf_tc_fail("getsockopt"); + + close(csock); + close(ssock); + + atf_tc_pass(); +} + +ATF_TC(tcp_md5_getsockopt_v4); +ATF_TC_HEAD(tcp_md5_getsockopt_v4, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test getsockopt for TCP MD5 SIG (IPv4)"); +} + +ATF_TC_BODY(tcp_md5_getsockopt_v4, tc) +{ + test_tcp_md5_getsockopt(0); +} + +ATF_TC(tcp_md5_getsockopt_v6); +ATF_TC_HEAD(tcp_md5_getsockopt_v6, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test getsockopt for TCP MD5 SIG (IPv6)"); +} + +ATF_TC_BODY(tcp_md5_getsockopt_v6, tc) +{ + test_tcp_md5_getsockopt(1); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, tcp_md5_getsockopt_v4); + ATF_TP_ADD_TC(tp, tcp_md5_getsockopt_v6); + + return atf_no_error(); +}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206231458.25NEwmeT040320>