From: "cron2 (Code Review)" Date: Fri, 26 Jul 2024 11:57:34 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <4af52f39c1bf80ef0de993928a1113cfffedb44a-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="f+/0hIAwkJc="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: console_systemd: rename query_user_exec to query_user_systemd List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --f+/0hIAwkJc= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/67= 0?usp=3Demail ) Change subject: console_systemd: rename query_user_exec to query_user_syste= md ...................................................................... console_systemd: rename query_user_exec to query_user_systemd This allows us to override query_user_exec for unit tests more consistently without having to jump through weird hoops. Fixes running test_pkcs11 with --enable-systemd. While here also fix documentation comments for query_user_exec*. Change-Id: I379e1eb6dc57b9fe4bbdaefbd947a14326e7117a Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Message-Id: <20240726104032.2112-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28= 983.html Signed-off-by: Gert Doering --- M src/openvpn/console.h M src/openvpn/console_systemd.c M tests/unit_tests/openvpn/test_pkcs11.c M tests/unit_tests/openvpn/test_user_pass.c 4 files changed, 37 insertions(+), 14 deletions(-) diff --git a/src/openvpn/console.h b/src/openvpn/console.h index 7358299..72ae8e0 100644 --- a/src/openvpn/console.h +++ b/src/openvpn/console.h @@ -65,11 +65,10 @@ /** - * Executes a configured setup, using the built-in method for querying the= user. + * Loop through configured query_user slots, using the built-in method for + * querying the user. * This method uses the console/TTY directly. * - * @param setup Pointer to the setup defining what to ask the user - * * @return True if executing all the defined steps completed successfully */ bool query_user_exec_builtin(void); @@ -77,21 +76,34 @@ #if defined(ENABLE_SYSTEMD) /** - * Executes a configured setup, using the compiled method for querying the= user - * - * @param setup Pointer to the setup defining what to ask the user + * Loop through configured query_user slots, using the systemd method for + * querying the user. + * If systemd is not running it will fall back to use + * query_user_exec_builtin() instead. * * @return True if executing all the defined steps completed successfully */ -bool query_user_exec(void); +bool query_user_exec_systemd(void); -#else /* ENABLE_SYSTEMD not defined*/ +/** + * Loop through configured query_user slots, using the compiled method for + * querying the user. + * + * @return True if executing all the defined steps completed successfully + */ +static inline bool +query_user_exec(void) +{ + return query_user_exec_systemd(); +} + +#else /* ENABLE_SYSTEMD not defined */ /** * Wrapper function enabling query_user_exec() if no alternative methods h= ave * been enabled * */ -static bool +static inline bool query_user_exec(void) { return query_user_exec_builtin(); diff --git a/src/openvpn/console_systemd.c b/src/openvpn/console_systemd.c index c7cf1ad..cc91cd1 100644 --- a/src/openvpn/console_systemd.c +++ b/src/openvpn/console_systemd.c @@ -96,7 +96,7 @@ * */ bool -query_user_exec(void) +query_user_exec_systemd(void) { bool ret =3D true; /* Presume everything goes okay */ int i; diff --git a/tests/unit_tests/openvpn/test_pkcs11.c b/tests/unit_tests/open= vpn/test_pkcs11.c index 6d283a2..5518fa1 100644 --- a/tests/unit_tests/openvpn/test_pkcs11.c +++ b/tests/unit_tests/openvpn/test_pkcs11.c @@ -75,6 +75,14 @@ { assert_true(0); } +#if defined(ENABLE_SYSTEMD) +bool +query_user_exec_systemd(void) +{ + assert_true(0); + return false; +} +#endif bool query_user_exec_builtin(void) { diff --git a/tests/unit_tests/openvpn/test_user_pass.c b/tests/unit_tests/o= penvpn/test_user_pass.c index b43e655..de60291 100644 --- a/tests/unit_tests/openvpn/test_user_pass.c +++ b/tests/unit_tests/openvpn/test_user_pass.c @@ -26,10 +26,6 @@ #include "config.h" #endif -#undef ENABLE_SYSTEMD -/* avoid redefining ENABLE_SYSTEMD in misc.c */ -#undef HAVE_CONFIG_H - #include "syshead.h" #include "manage.h" @@ -44,6 +40,13 @@ struct management *management; /* global */ /* mocking */ +#if defined(ENABLE_SYSTEMD) +bool +query_user_exec_systemd(void) +{ + return query_user_exec_builtin(); +} +#endif bool query_user_exec_builtin(void) { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/670?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I379e1eb6dc57b9fe4bbdaefbd947a14326e7117a Gerrit-Change-Number: 670 Gerrit-PatchSet: 5 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --f+/0hIAwkJc= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

console_systemd: rename query_user_exec to que=
ry_user_systemd

This allows us to override query_user_exec for unit<= br>tests more consistently without having to jump through
weird hoops.
Fixes running test_pkcs11 with --enable-systemd.

While here al= so fix documentation comments for
query_user_exec*.

Change-Id: I3= 79e1eb6dc57b9fe4bbdaefbd947a14326e7117a
Signed-off-by: Frank Lichtenheld= <frank@...2641...>
Acked-by: Gert Doering <gert@...1296...>=
Message-Id: <20240726104032.2112-1-gert@...1296...>
URL: https= ://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28983.htmlSigned-off-by: Gert Doering <gert@...1296...>
---
M src/openv= pn/console.h
M src/openvpn/console_systemd.c
M tests/unit_tests/openv= pn/test_pkcs11.c
M tests/unit_tests/openvpn/test_user_pass.c
4 files = changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/openvpn/console.h b/src/openvpn/console.h
index 7358299..72ae8e0 100644
--- a/src/openvpn/console.= h
+++ b/src/openvpn/console.h
@@ -65,11 +65= ,10 @@


/**
<= span style=3D"color: hsl(0, 100%, 40%);">- * Executes a configured setup, u= sing the built-in method for querying the user.
+ * Loop through configured query_user slots, us= ing the built-in method for
+ * querying the user.
* This method uses the cons= ole/TTY directly.
*
- * @param setup Pointer to the setup defining what to as= k the user
- * * @return True if executing all the defined steps completed succe= ssfully
*/
bool query_user_exec_builtin(= void);
@@ -77,21 +76,34 @@

#if defined(ENABLE_SYSTEMD)
/**
- * Executes a configured setup, using the c= ompiled method for querying the user
- *
- * @= param setup Pointer to the setup defining what to ask the user+ * Loop through configured qu= ery_user slots, using the systemd method for
+ * querying the user.
+ * If systemd is not running it will fall back t= o use
+ * query_user_= exec_builtin() instead.
*
* @return Tru= e if executing all the defined steps completed successfully
*/
-bool query_user_= exec(void);
+bool que= ry_user_exec_systemd(void);

-#else /* ENABLE_SYSTEMD not defined*/
+/**
+ * Loop through configured query_user slots, usi= ng the compiled method for
+ * querying the user.
+ *
+ * @retu= rn True if executing all the defined steps completed successfully+ */
+static inline bool
+query_user_exec(void)
+{
+ return query_user_exec_systemd();
+}
+
+#else = /* ENABLE_SYSTEMD not defined */
/**
* = Wrapper function enabling query_user_exec() if no alternative methods have<= /span>
* been enabled
*
*/
-static bool
<= span style=3D"color: hsl(120, 100%, 40%);">+static inline bool

query_user_exec(void)

{
return q= uery_user_exec_builtin();
diff --git a/src/openvpn/console_= systemd.c b/src/openvpn/console_systemd.c
index c7cf1ad..cc= 91cd1 100644
--- a/src/openvpn/console_systemd.c
= +++ b/src/openvpn/console_systemd.c
@@ -96,7 +96,7 @@=
*
*/
bool
<= span style=3D"color: hsl(0, 100%, 40%);">-query_user_exec(void)
<= span style=3D"color: hsl(120, 100%, 40%);">+query_user_exec_systemd(void)
{
bool ret =3D true; /* Presume every= thing goes okay */
int i;
diff --git a= /tests/unit_tests/openvpn/test_pkcs11.c b/tests/unit_tests/openvpn/test_pkc= s11.c
index 6d283a2..5518fa1 100644
--- a/t= ests/unit_tests/openvpn/test_pkcs11.c
+++ b/tests/unit_test= s/openvpn/test_pkcs11.c
@@ -75,6 +75,14 @@
= {
assert_true(0);
}
+#if defined(ENABLE_SYSTEMD)+bool
+query_user_exec_systemd(void)
<= span style=3D"color: hsl(120, 100%, 40%);">+{
+ assert_true(0);
+ return false;
+}
+#endif
bool
query_user_exec_builtin= (void)
{
diff --git a/tests/unit_tests/ope= nvpn/test_user_pass.c b/tests/unit_tests/openvpn/test_user_pass.cindex b43e655..de60291 100644
--- a/tests/unit_tests= /openvpn/test_user_pass.c
+++ b/tests/unit_tests/openvpn/te= st_user_pass.c
@@ -26,10 +26,6 @@
#include= "config.h"
#endif

<= span style=3D"color: hsl(0, 100%, 40%);">-#undef ENABLE_SYSTEMD
<= span style=3D"color: hsl(0, 100%, 40%);">-/* avoid redefining ENABLE_SYSTEM= D in misc.c */
-#undef = HAVE_CONFIG_H
-<= br> #include "syshead.h"
#include "ma= nage.h"

@@ -44,6 +40,13 @@ struct management *management; /* global */

/* mocking */
+#if defined(ENABLE_SYSTEMD)
+bool
+q= uery_user_exec_systemd(void)
+{
+ retur= n query_user_exec_builtin();
+}
+#endif
bool
query_user_exec_builtin(void) {

To view, visit change 670. To uns= ubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I379e1eb6dc57b9fe4bbdaefbd94= 7a14326e7117a
Gerrit-Change-Number: 670
Gerrit-PatchSet: 5
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--f+/0hIAwkJc=--