From: "flichtenheld (Code Review)" Date: Thu, 8 Jan 2026 12:26:07 +0000 In-Reply-To: References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="OffDHVT3Ekc="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: openvpnserv: Add a first unit test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --OffDHVT3Ekc= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1459?usp=3Demail to look at the new patch set (#3). Change subject: openvpnserv: Add a first unit test ...................................................................... openvpnserv: Add a first unit test This adds the required build infrastructure and adds tests for two functions related to GetItfDnsDomains(). Change-Id: I33583e51e1143c53fbe0aef16546fa3f602b17c0 Signed-off-by: Frank Lichtenheld --- M configure.ac M src/openvpnserv/CMakeLists.txt M tests/unit_tests/Makefile.am M tests/unit_tests/openvpn/test_common.h A tests/unit_tests/openvpnserv/Makefile.am A tests/unit_tests/openvpnserv/test_openvpnserv.c 6 files changed, 173 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/59/1459/3 diff --git a/configure.ac b/configure.ac index 8ba5673..d3d548b 100644 --- a/configure.ac +++ b/configure.ac @@ -1460,6 +1460,7 @@ tests/unit_tests/Makefile tests/unit_tests/example_test/Makefile tests/unit_tests/openvpn/Makefile + tests/unit_tests/openvpnserv/Makefile tests/unit_tests/plugins/Makefile tests/unit_tests/plugins/auth-pam/Makefile sample/Makefile diff --git a/src/openvpnserv/CMakeLists.txt b/src/openvpnserv/CMakeLists.txt index 2c8f310..67a89ef 100644 --- a/src/openvpnserv/CMakeLists.txt +++ b/src/openvpnserv/CMakeLists.txt @@ -74,3 +74,44 @@ endif() add_dependencies(openvpnserv msg_mc_gen) + +if (BUILD_TESTING) + set(unit_tests + "test_openvpnserv" + ) + + foreach (test_name ${unit_tests}) + add_test(${test_name} ${test_name}) + add_executable(${test_name} + ../../tests/unit_tests/openvpnserv/${test_name}.c + ${MC_GEN_DIR}/eventmsg.h + ) + + target_link_libraries(${test_name} PUBLIC ${CMOCKA_LIBRARIES}) + target_include_directories(${test_name} PRIVATE + . + ../../include + ../openvpn + ${MC_GEN_DIR} + ../../tests/unit_tests/openvpn + ) + target_compile_options(${test_name} PRIVATE + -D_UNICODE + -UNTDDI_VERSION + -D_WIN32_WINNT=3D_WIN32_WINNT_VISTA + ) + target_link_libraries(${test_name} PRIVATE + advapi32.lib userenv.lib iphlpapi.lib fwpuclnt.lib rpcrt4.lib + shlwapi.lib netapi32.lib ws2_32.lib ntdll.lib ole32.lib pathcc= h.lib) + if (MINGW) + target_compile_options(${test_name} PRIVATE -municode) + target_link_options(${test_name} PRIVATE -municode) + endif () + endforeach() + + target_sources(test_openvpnserv PRIVATE + common.c + validate.c + ../openvpn/wfp_block.c ../openvpn/wfp_block.h + ) +endif () diff --git a/tests/unit_tests/Makefile.am b/tests/unit_tests/Makefile.am index 33fefaa..ce6278e 100644 --- a/tests/unit_tests/Makefile.am +++ b/tests/unit_tests/Makefile.am @@ -1,5 +1,5 @@ AUTOMAKE_OPTIONS =3D foreign if ENABLE_UNITTESTS -SUBDIRS =3D example_test openvpn plugins +SUBDIRS =3D example_test openvpn openvpnserv plugins endif diff --git a/tests/unit_tests/openvpn/test_common.h b/tests/unit_tests/open= vpn/test_common.h index f898e89..156e5a9 100644 --- a/tests/unit_tests/openvpn/test_common.h +++ b/tests/unit_tests/openvpn/test_common.h @@ -20,8 +20,9 @@ * with this program; if not, see . */ -#include #include +#include +#include #include /* Do we use cmocka < 2.0.0? */ diff --git a/tests/unit_tests/openvpnserv/Makefile.am b/tests/unit_tests/op= envpnserv/Makefile.am new file mode 100644 index 0000000..5758cd4 --- /dev/null +++ b/tests/unit_tests/openvpnserv/Makefile.am @@ -0,0 +1,15 @@ +AUTOMAKE_OPTIONS =3D foreign + +EXTRA_DIST =3D input + +AM_TESTSUITE_SUMMARY_HEADER =3D ' for $(PACKAGE_STRING) service Unit-Tests' + +if WIN32 +test_binaries =3D openvpnserv_testdriver +endif + +openvpnserv_testdriver_CFLAGS =3D -I$(top_srcdir)/include -I$(top_srcdir)= /src/openvpn -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpnserv @TE= ST_CFLAGS@ +openvpnserv_testdriver_LDFLAGS =3D @TEST_LDFLAGS@ -L$(top_srcdir)/src/open= vpn +openvpnserv_testdriver_SOURCES =3D test_openvpnserv.c \ + $(top_srcdir)/src/openvpnserv/common.c + diff --git a/tests/unit_tests/openvpnserv/test_openvpnserv.c b/tests/unit_t= ests/openvpnserv/test_openvpnserv.c new file mode 100644 index 0000000..348de4f --- /dev/null +++ b/tests/unit_tests/openvpnserv/test_openvpnserv.c @@ -0,0 +1,113 @@ +/* + * OpenVPN -- An application to securely tunnel IP networks + * over a single UDP port, with support for SSL/TLS-based + * session authentication and key exchange, + * packet encryption, packet authentication, and + * packet compression. + * + * Copyright (C) 2025 Frank Lichtenheld + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by t= he + * Free Software Foundation, either version 2 of the License, + * or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, see . + */ + +#include +#include +#include "test_common.h" + +#include +#include + +#include "interactive.c" + +BOOL +ReportStatusToSCMgr(SERVICE_STATUS_HANDLE service, SERVICE_STATUS *status) +{ + return TRUE; +} + +static void +test_list_contains_domain(void **state) +{ + PCWSTR domain =3D L"openvpn.net"; + size_t domain_len =3D wcslen(domain); + assert_true(ListContainsDomain(domain, domain, domain_len)); + assert_true(ListContainsDomain(L"openvpn.com,openvpn.net", domain, dom= ain_len)); + assert_true(ListContainsDomain(L"openvpn.net,openvpn.com", domain, dom= ain_len)); + + assert_false(ListContainsDomain(L"openvpn.com", domain, domain_len)); + assert_false(ListContainsDomain(L"internal.openvpn.net", domain, domai= n_len)); +} + +#define BUF_SIZE 64 +static void +test_convert_itf_dns_domains(void **state) +{ + DWORD size, orig_size, len, res_len; + LSTATUS err; + const DWORD glyph_size =3D sizeof(wchar_t); + + wchar_t domains_1[BUF_SIZE] =3D L"openvpn.com"; + len =3D (DWORD)wcslen(domains_1) + 1; + size =3D orig_size =3D len * glyph_size; + wchar_t domains_1_res[BUF_SIZE] =3D L".openvpn.com"; + res_len =3D len + 2; /* adds . and \0 */ + err =3D ConvertItfDnsDomains(L"openvpn.net", domains_1, &size, BUF_SIZ= E); + assert_memory_equal(domains_1, domains_1_res, size); + assert_int_equal(size, res_len * glyph_size); + assert_int_equal(err, NO_ERROR); + + wchar_t domains_2[BUF_SIZE] =3D L"openvpn.com,openvpn.net"; + len =3D (DWORD)wcslen(domains_2) + 1; + size =3D orig_size =3D len * glyph_size; + wchar_t domains_2_res[BUF_SIZE] =3D L".openvpn.com"; + res_len =3D (DWORD)wcslen(domains_2_res) + 2; + err =3D ConvertItfDnsDomains(L"openvpn.net", domains_2, &size, BUF_SIZ= E); + assert_memory_equal(domains_2, domains_2_res, size); + assert_int_equal(size, res_len * glyph_size); + assert_int_equal(err, NO_ERROR); + + wchar_t domains_3[BUF_SIZE] =3D L"openvpn.com,openvpn.net"; + len =3D (DWORD)wcslen(domains_3) + 1; + size =3D orig_size =3D len * glyph_size; + wchar_t domains_3_res[BUF_SIZE] =3D L".openvpn.net"; + res_len =3D (DWORD)wcslen(domains_3_res) + 2; + err =3D ConvertItfDnsDomains(L"openvpn.com", domains_3, &size, BUF_SIZ= E); + assert_memory_equal(domains_3, domains_3_res, size); + assert_int_equal(size, res_len * glyph_size); + assert_int_equal(err, NO_ERROR); + + wchar_t domains_4[BUF_SIZE] =3D L"openvpn.com,openvpn.net"; + len =3D (DWORD)wcslen(domains_4) + 1; + size =3D orig_size =3D len * glyph_size; + wchar_t domains_4_res[BUF_SIZE] =3D L".openvpn.com\0.openvpn.net"; + res_len =3D len + 3; /* adds two . and one \0 */ + err =3D ConvertItfDnsDomains(NULL, domains_4, &size, BUF_SIZE); + assert_memory_equal(domains_4, domains_4_res, size); + assert_int_equal(size, res_len * glyph_size); + assert_int_equal(err, NO_ERROR); +} + +int +wmain(void) +{ + openvpn_unit_test_setup(); + const struct CMUnitTest tests[] =3D { + cmocka_unit_test(test_list_contains_domain), + cmocka_unit_test(test_convert_itf_dns_domains), + }; + + int ret =3D cmocka_run_group_tests_name("openvpnserv tests", tests, NU= LL, NULL); + + return ret; +} -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1459?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: newpatchset Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I33583e51e1143c53fbe0aef16546fa3f602b17c0 Gerrit-Change-Number: 1459 Gerrit-PatchSet: 3 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --OffDHVT3Ekc= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: plaisthos.

flichtenheld uploaded patch set #3 to this change.

<= p>View C= hange

openvpnserv: Add a first unit test

This a= dds the required build infrastructure
and adds tests for two functions r= elated to
GetItfDnsDomains().

Change-Id: I33583e51e1143c53fbe0aef= 16546fa3f602b17c0
Signed-off-by: Frank Lichtenheld <frank@...2641...&= gt;
---
M configure.ac
M src/openvpnserv/CMakeLists.txt
M tests= /unit_tests/Makefile.am
M tests/unit_tests/openvpn/test_common.h
A te= sts/unit_tests/openvpnserv/Makefile.am
A tests/unit_tests/openvpnserv/te= st_openvpnserv.c
6 files changed, 173 insertions(+), 2 deletions(-)
<= br>
git pull ssh://gerrit.openvpn.net:29418/openvpn refs=
/changes/59/1459/3
diff --git a/configure.ac b/configure.ac<=
br>index 8ba5673..d3d548b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1460,6 +1460,7 @@
tests/unit_tests/Makefile
te= sts/unit_tests/example_test/Makefile
tests/unit_te= sts/openvpn/Makefile
= + tests/unit_tests/openvpnserv/Makefile
tes= ts/unit_tests/plugins/Makefile
tests/unit_tests/pl= ugins/auth-pam/Makefile
sample/Makefile
d= iff --git a/src/openvpnserv/CMakeLists.txt b/src/openvpnserv/CMakeLists.txt=
index 2c8f310..67a89ef 100644
--- a/src/op= envpnserv/CMakeLists.txt
+++ b/src/openvpnserv/CMakeLists.t= xt
@@ -74,3 +74,44 @@
endif()

add_dependencies(openvpnserv msg_mc_gen)
<= span style=3D"color: hsl(120, 100%, 40%);">+

+if (BUILD_TESTING)
+ set(unit_tests
+ "test_openvpnserv"
+ )
+
+ foreach (test_name ${unit_tests})
+ add_test(${test_name} ${test_name})=
+ add_executable(${t= est_name}
+ = ../../tests/unit_tests/openvpnserv/${test_name}.c
+ ${MC_GEN_DIR}/eventmsg.h
+ )
+

+ target_link_libraries(${test_name} PUBLIC ${C= MOCKA_LIBRARIES})
+ = target_include_directories(${test_name} PRIVATE
+ .
+ ../../include
+ ../openvpn
+ ${MC_GEN_DIR}
+ ../../tests/unit_tes= ts/openvpn
+ )=
+ target_comp= ile_options(${test_name} PRIVATE
+ -D_UNICODE
+ -UNTDDI_VERSION
+ -D_WIN32_WINNT=3D_WIN32_WINNT_VISTA
+ )
+ target_link_libraries(${t= est_name} PRIVATE

+ = advapi32.lib userenv.lib iphlpapi.lib fwpuclnt.lib rpcrt4.lib
+ shlwapi.lib= netapi32.lib ws2_32.lib ntdll.lib ole32.lib pathcch.lib)
+ if (MINGW)
+ target_compile_options(${t= est_name} PRIVATE -municode)
+ target_link_options(${test_name} PRIVATE -municode)

+ endif ()

+ endforeach()+
+ target_sources(test_openvpnserv PRIVATE
+ common.c=
+ validate.c<= br>+ ../openvpn/wfp_bloc= k.c ../openvpn/wfp_block.h
+ )
+endif (= )
diff --git a/tests/unit_tests/Makefile.am b/tests/unit_te= sts/Makefile.am
index 33fefaa..ce6278e 100644
--- a/tests/unit_tests/Makefile.am

+++ b/tests/unit_test= s/Makefile.am
@@ -1,5 +1,5 @@
AUTOMAKE_OPT= IONS =3D foreign

if ENABLE_UNITTESTS
-SUBDIRS =3D example_test = openvpn plugins
+SUBD= IRS =3D example_test openvpn openvpnserv plugins
endif
diff --git a/tests/unit_tests/openvpn/test_common.h b/tests/un= it_tests/openvpn/test_common.h
index f898e89..156e5a9 10064= 4
--- a/tests/unit_tests/openvpn/test_common.h
+++ b/tests/unit_tests/openvpn/test_common.h

@@ -20,8 += 20,9 @@
* with this program; if not, see <https://www= .gnu.org/licenses/>.
*/

-#include <stdio.h>
#include <setjmp.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <= cmocka.h>

/* Do we use cmocka < 2.= 0.0? */
diff --git a/tests/unit_tests/openvpnserv/Makefile.= am b/tests/unit_tests/openvpnserv/Makefile.am
new file mode= 100644
index 0000000..5758cd4
--- /dev/nul= l
+++ b/tests/unit_tests/openvpnserv/Makefile.am
= @@ -0,0 +1,15 @@
+
+EXTRA_D= IST =3D input
+
+AM_TESTSUITE_SUMMARY_HEAD= ER =3D ' for $(PACKAGE_STRING) service Unit-Tests'
+
+if WIN32
+test_binaries =3D openvpnserv_testdriver
+endif
+
+ope= nvpnserv_testdriver_CFLAGS =3D -I$(top_srcdir)/include -I$(top_srcdir)/src= /openvpn -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpnserv @TEST_C= FLAGS@
+openvpnserv_t= estdriver_LDFLAGS =3D @TEST_LDFLAGS@ -L$(top_srcdir)/src/openvpn
= +openvpnserv_testdriver_SOURCES= =3D test_openvpnserv.c \
+ $(top_srcdir)/src/openvpnserv/common.c
+
diff --git a/tests/unit_tests/op= envpnserv/test_openvpnserv.c b/tests/unit_tests/openvpnserv/test_openvpnser= v.c
new file mode 100644
index 0000000..348= de4f
--- /dev/null
+++ b/tests/unit_tests/o= penvpnserv/test_openvpnserv.c
@@ -0,0 +1,113 @@
<= span style=3D"color: hsl(120, 100%, 40%);">+/*

+ * OpenVPN -- An application to securely tunnel= IP networks
+ * = over a single UDP port, with support for SSL/TLS-based
+ * session authentic= ation and key exchange,
+ * packet encryption, packet authentication, and
= + * packet compress= ion.
+ *
+ * Copyright (C) 2025 Frank Lic= htenheld <frank@...2641...>
+ *
+ * = This program is free software; you can redistribute it and/or modify
+ * it under the terms of= the GNU General Public License as published by the
+ * Free Software Foundation, either vers= ion 2 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,=
+ * but WITHOUT ANY= WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR= PURPOSE. See the
+ = * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public Li= cense along
+ * with= this program; if not, see <https://www.gnu.org/licenses/>.+ */
+
+#include <setjmp.h>
+#include <cmocka.h>
+#include "test_common.h"
+
+#include <winsock2.h>
+#include <windows.h>
+
+#include "interactive.c"
+
+BOOL
+Repo= rtStatusToSCMgr(SERVICE_STATUS_HANDLE service, SERVICE_STATUS *status)
+{
+ return TRUE;
+}
+
+static= void
+test_list_cont= ains_domain(void **state)
+{
+ PCWSTR d= omain =3D L"openvpn.net";
+ size_t domain_len =3D wcslen(domain);
+ assert_true(ListContainsDomain(do= main, domain, domain_len));
+ assert_true(ListContainsDomain(L"openvpn.com,openvpn.net&q= uot;, domain, domain_len));
+ assert_true(ListContainsDomain(L"openvpn.net,openvpn.com&q= uot;, domain, domain_len));
+
+ assert_= false(ListContainsDomain(L"openvpn.com", domain, domain_len));

+ assert_false(ListC= ontainsDomain(L"internal.openvpn.net", domain, domain_len));
+}
+
+#define BUF_SIZE 64
+static void
+test_convert_itf_dns_domains(void **state)
+{
+ DWORD size, orig_size, len, res_len;
+ LSTATUS err;
+ const DWORD glyph_size =3D sizeof(wchar_= t);
+
+ wchar_t domains_1[BUF_SIZE] =3D= L"openvpn.com";

+ len =3D (DWORD)wcslen(domains_1) + 1;
+ size =3D orig_size =3D len * glyph_size;
+ wchar_t domains_1= _res[BUF_SIZE] =3D L".openvpn.com";
+ res_len =3D len + 2; /* adds . and \0 */
+ err =3D ConvertItfDn= sDomains(L"openvpn.net", domains_1, &size, BUF_SIZE);<= br>+ assert_memory_equal(dom= ains_1, domains_1_res, size);
+ assert_int_equal(size, res_len * glyph_size);
+ assert_int_equal(err, NO_ERROR)= ;

+
+ wchar_t domains_2[BUF_SIZE] =3D L= "openvpn.com,openvpn.net";
+ len =3D (DWORD)wcslen(domains_2) + 1;
+ size =3D orig_size =3D len * gly= ph_size;
+ wchar_t= domains_2_res[BUF_SIZE] =3D L".openvpn.com";
+ res_len =3D (DWORD)wcslen(domains_2= _res) + 2;
+ err = =3D ConvertItfDnsDomains(L"openvpn.net", domains_2, &size, BU= F_SIZE);
+ assert_= memory_equal(domains_2, domains_2_res, size);
+ assert_int_equal(size, res_len * glyph_size);=
+ assert_int_equa= l(err, NO_ERROR);
+
+ wchar_t domains_3= [BUF_SIZE] =3D L"openvpn.com,openvpn.net";
+ len =3D (DWORD)wcslen(domains_3) + 1;=
+ size =3D orig_s= ize =3D len * glyph_size;
+ wchar_t domains_3_res[BUF_SIZE] =3D L".openvpn.net";

+ res_len =3D (DWORD= )wcslen(domains_3_res) + 2;
+ err =3D ConvertItfDnsDomains(L"openvpn.com", domains_= 3, &size, BUF_SIZE);
+ assert_memory_equal(domains_3, domains_3_res, size);
+ assert_int_equal(size, res_le= n * glyph_size);
+ = assert_int_equal(err, NO_ERROR);
+
+ w= char_t domains_4[BUF_SIZE] =3D L"openvpn.com,openvpn.net";=
+ len =3D (DWORD)wcslen(= domains_4) + 1;
+ = size =3D orig_size =3D len * glyph_size;
+ wchar_t domains_4_res[BUF_SIZE] =3D L".openvp= n.com\0.openvpn.net";
+ res_len =3D len + 3; /* adds two . and one \0 */
+ err =3D ConvertItfDnsDomains(NU= LL, domains_4, &size, BUF_SIZE);
+ assert_memory_equal(domains_4, domains_4_res, size);
+ assert_int_equal(= size, res_len * glyph_size);
+ assert_int_equal(err, NO_ERROR);
+}
+
+int<= br>+wmain(void)
+{

+ openvpn_unit_test_setup();
+ const struct CMUnitTest tests[] =3D {=
+ cmocka_unit= _test(test_list_contains_domain),
+ cmocka_unit_test(test_convert_itf_dns_domains),

+ };
+
+ int ret =3D cmocka_run_group_tests_name("openvpn= serv tests", tests, NULL, NULL);
+
+ = return ret;
+}


To view, visit change 1459. To unsubscribe, or= for help writing mail filters, visit settings.

Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I33583e51e1143c53fbe0aef1654= 6fa3f602b17c0
Gerrit-Change-Number: 1459
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
= --OffDHVT3Ekc=--