From: "cron2 (Code Review)" Date: Mon, 29 Jan 2024 09:07:00 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="CFhU04zTEeA="; charset=UTF-8 Subject: [Openvpn-devel] [L] Change in openvpn[master]: test_user_pass: new UT for get_user_pass List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld , plaisthos Cc: openvpn-devel --CFhU04zTEeA= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has uploaded a new patch set (#9) to the change originally created by= flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/468?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 by plaisthos Change subject: test_user_pass: new UT for get_user_pass ...................................................................... test_user_pass: new UT for get_user_pass UTs for basic functionality, without management functions. v2: - add CMake support - add GHA support for both MSVC and mingw v3: - fix distcheck by adding input/ directory to dist Change-Id: I193aef06912f01426dd4ac298aadfab97dd75a35 Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe Message-Id: <20240127200716.10255-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28= 138.html Signed-off-by: Gert Doering --- M .github/workflows/build.yaml M CMakeLists.txt M src/openvpn/misc.h M src/openvpn/syshead.h M tests/unit_tests/openvpn/Makefile.am A tests/unit_tests/openvpn/input/user_only.txt A tests/unit_tests/openvpn/input/user_pass.txt A tests/unit_tests/openvpn/test_user_pass.c 8 files changed, 327 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/68/468/9 diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cc98813..bc937e5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -85,11 +85,13 @@ fail-fast: false matrix: arch: [x86, x64] - test: [argv, auth_token, buffer, cryptoapi, crypto, misc, ncp, pac= ket_id, pkt, provider, ssl, tls_crypt] + test: [argv, auth_token, buffer, cryptoapi, crypto, misc, ncp, pac= ket_id, pkt, provider, ssl, tls_crypt, user_pass] runs-on: windows-latest name: "mingw unittest ${{ matrix.test }} - ${{ matrix.arch }} - OSSL" steps: + - name: Checkout OpenVPN + uses: actions/checkout@...2689... - name: Retrieve mingw unittest uses: actions/download-artifact@...2689... with: @@ -97,6 +99,8 @@ path: unittests - name: Run ${{ matrix.test }} unit test run: ./unittests/test_${{ matrix.test }}.exe + env: + srcdir: "${{ github.workspace }}/tests/unit_tests/openvpn" ubuntu: strategy: @@ -279,6 +283,7 @@ configurePreset: win-${{ matrix.arch }}-release buildPreset: win-${{ matrix.arch }}-release testPreset: win-${{ matrix.arch }}-release + testPresetAdditionalArgs: "['--output-on-failure']" - uses: actions/upload-artifact@...2689... with: diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e07d50..be55c60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -604,6 +604,7 @@ "test_pkt" "test_provider" "test_ssl" + "test_user_pass" ) if (WIN32) @@ -662,6 +663,10 @@ # test_networking needs special environment if (NOT ${test_name} STREQUAL "test_networking") add_test(${test_name} ${test_name}) + # for compat with autotools make check + set(_UT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tests/unit_test= s/openvpn) + set_tests_properties(${test_name} PROPERTIES + ENVIRONMENT "srcdir=3D${_UT_SOURCE_DIR}") endif () add_executable(${test_name} tests/unit_tests/openvpn/${test_name}.c @@ -782,6 +787,15 @@ src/openvpn/base64.c ) + target_sources(test_user_pass PRIVATE + tests/unit_tests/openvpn/mock_get_random.c + tests/unit_tests/openvpn/mock_win32_execve.c + src/openvpn/base64.c + src/openvpn/console.c + src/openvpn/env_set.c + src/openvpn/run_command.c + ) + if (TARGET test_argv) target_link_options(test_argv PRIVATE -Wl,--wrap=3Dparse_line) target_sources(test_argv PRIVATE diff --git a/src/openvpn/misc.h b/src/openvpn/misc.h index d51609d..5ae61b5 100644 --- a/src/openvpn/misc.h +++ b/src/openvpn/misc.h @@ -118,12 +118,31 @@ #define GET_USER_PASS_INLINE_CREDS (1<<10) /* indicates that auth_file is= actually inline creds */ +/** + * Retrieves the user credentials from various sources depending on the fl= ags. + * + * @param up The user_pass structure to store the retrieved credentials. + * @param auth_file The path to the authentication file. Might be NULL. + * @param prefix The prefix to prepend to user prompts. + * @param flags Additional flags to control the behavior of the function. + * @param auth_challenge The authentication challenge string. + * @return true if the user credentials were successfully retrieved, false= otherwise. + */ bool get_user_pass_cr(struct user_pass *up, const char *auth_file, const char *prefix, const unsigned int flags, const char *auth_challenge); +/** + * Retrieves the user credentials from various sources depending on the fl= ags. + * + * @param up The user_pass structure to store the retrieved credentials. + * @param auth_file The path to the authentication file. Might be NULL. + * @param prefix The prefix to prepend to user prompts. + * @param flags Additional flags to control the behavior of the function. + * @return true if the user credentials were successfully retrieved, false= otherwise. + */ static inline bool get_user_pass(struct user_pass *up, const char *auth_file, diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index a021c91..d2859fe 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -524,4 +524,10 @@ #define ENABLE_MEMSTATS #endif +#ifdef _MSC_VER +#ifndef PATH_MAX +#define PATH_MAX MAX_PATH +#endif +#endif + #endif /* ifndef SYSHEAD_H */ diff --git a/tests/unit_tests/openvpn/Makefile.am b/tests/unit_tests/openvp= n/Makefile.am index f81a10f..88a694d 100644 --- a/tests/unit_tests/openvpn/Makefile.am +++ b/tests/unit_tests/openvpn/Makefile.am @@ -1,5 +1,7 @@ AUTOMAKE_OPTIONS =3D foreign +EXTRA_DIST =3D input + AM_TESTSUITE_SUMMARY_HEADER =3D ' for $(PACKAGE_STRING) Unit-Tests' test_binaries=3D @@ -9,7 +11,7 @@ endif test_binaries +=3D crypto_testdriver packet_id_testdriver auth_token_testd= river ncp_testdriver misc_testdriver \ - pkt_testdriver ssl_testdriver + pkt_testdriver ssl_testdriver user_pass_testdriver if HAVE_LD_WRAP_SUPPORT if !WIN32 @@ -251,6 +253,22 @@ $(top_srcdir)/src/openvpn/base64.c +user_pass_testdriver_CFLAGS =3D @TEST_CFLAGS@ \ + -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/op= envpn +user_pass_testdriver_LDFLAGS =3D @TEST_LDFLAGS@ + +user_pass_testdriver_SOURCES =3D test_user_pass.c mock_msg.c \ + $(top_srcdir)/src/openvpn/buffer.c \ + $(top_srcdir)/src/openvpn/console.c \ + $(top_srcdir)/src/openvpn/env_set.c \ + mock_win32_execve.c \ + $(top_srcdir)/src/openvpn/run_command.c \ + mock_get_random.c \ + $(top_srcdir)/src/openvpn/platform.c \ + $(top_srcdir)/src/openvpn/win32-util.c \ + $(top_srcdir)/src/openvpn/base64.c + + ncp_testdriver_CFLAGS =3D @TEST_CFLAGS@ \ -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/op= envpn \ $(OPTIONAL_CRYPTO_CFLAGS) diff --git a/tests/unit_tests/openvpn/input/user_only.txt b/tests/unit_test= s/openvpn/input/user_only.txt new file mode 100644 index 0000000..3ca0db3 --- /dev/null +++ b/tests/unit_tests/openvpn/input/user_only.txt @@ -0,0 +1 @@ +fuser diff --git a/tests/unit_tests/openvpn/input/user_pass.txt b/tests/unit_test= s/openvpn/input/user_pass.txt new file mode 100644 index 0000000..31b38ef --- /dev/null +++ b/tests/unit_tests/openvpn/input/user_pass.txt @@ -0,0 +1,2 @@ +fuser +fpassword diff --git a/tests/unit_tests/openvpn/test_user_pass.c b/tests/unit_tests/o= penvpn/test_user_pass.c new file mode 100644 index 0000000..ab4dfe4 --- /dev/null +++ b/tests/unit_tests/openvpn/test_user_pass.c @@ -0,0 +1,260 @@ +/* + * 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) 2023 OpenVPN Inc + * + * 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, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#undef ENABLE_SYSTEMD + +#include "syshead.h" +#include "manage.h" + +#include +#include +#include +#include + +#include "misc.c" + +struct management *management; /* global */ + +/* mocking */ +bool +query_user_exec_builtin(void) +{ + /* Loop through configured query_user slots */ + for (int i =3D 0; i < QUERY_USER_NUMSLOTS && query_user[i].response != =3D NULL; i++) + { + check_expected(query_user[i].prompt); + strncpy(query_user[i].response, mock_ptr_type(char *), query_user[= i].response_len); + } + + return mock(); +} +void +management_auth_failure(struct management *man, const char *type, const ch= ar *reason) +{ + assert_true(0); +} +bool +management_query_user_pass(struct management *man, + struct user_pass *up, + const char *type, + const unsigned int flags, + const char *static_challenge) +{ + assert_true(0); + return false; +} +/* stubs for some unused functions instead of pulling in too many dependen= cies */ +int +parse_line(const char *line, char **p, const int n, const char *file, + const int line_num, int msglevel, struct gc_arena *gc) +{ + assert_true(0); + return 0; +} + +/* tooling */ +static void +reset_user_pass(struct user_pass *up) +{ + up->defined =3D false; + up->token_defined =3D false; + up->nocache =3D false; + strcpy(up->username, "user"); + strcpy(up->password, "password"); +} + +static void +test_get_user_pass_defined(void **state) +{ + struct user_pass up =3D { 0 }; + reset_user_pass(&up); + up.defined =3D true; + assert_true(get_user_pass_cr(&up, NULL, "UT", 0, NULL)); +} + +static void +test_get_user_pass_needok(void **state) +{ + struct user_pass up =3D { 0 }; + reset_user_pass(&up); + unsigned int flags =3D GET_USER_PASS_NEED_OK; + + expect_string(query_user_exec_builtin, query_user[i].prompt, "NEED-OK|= UT|user:"); + will_return(query_user_exec_builtin, ""); + will_return(query_user_exec_builtin, true); + /*FIXME: query_user_exec() called even though nothing queued */ + will_return(query_user_exec_builtin, true); + assert_true(get_user_pass_cr(&up, NULL, "UT", flags, NULL)); + assert_true(up.defined); + assert_string_equal(up.password, "ok"); + + reset_user_pass(&up); + + expect_string(query_user_exec_builtin, query_user[i].prompt, "NEED-OK|= UT|user:"); + will_return(query_user_exec_builtin, "cancel"); + will_return(query_user_exec_builtin, true); + /*FIXME: query_user_exec() called even though nothing queued */ + will_return(query_user_exec_builtin, true); + assert_true(get_user_pass_cr(&up, NULL, "UT", flags, NULL)); + assert_true(up.defined); + assert_string_equal(up.password, "cancel"); +} + +static void +test_get_user_pass_inline_creds(void **state) +{ + struct user_pass up =3D { 0 }; + reset_user_pass(&up); + unsigned int flags =3D GET_USER_PASS_INLINE_CREDS; + + /*FIXME: query_user_exec() called even though nothing queued */ + will_return(query_user_exec_builtin, true); + assert_true(get_user_pass_cr(&up, "iuser\nipassword", "UT", flags, NUL= L)); + assert_true(up.defined); + assert_string_equal(up.username, "iuser"); + assert_string_equal(up.password, "ipassword"); + + reset_user_pass(&up); + + expect_string(query_user_exec_builtin, query_user[i].prompt, "Enter UT= Password:"); + will_return(query_user_exec_builtin, "cpassword"); + will_return(query_user_exec_builtin, true); + /* will try to retrieve missing password from stdin */ + assert_true(get_user_pass_cr(&up, "iuser", "UT", flags, NULL)); + assert_true(up.defined); + assert_string_equal(up.username, "iuser"); + assert_string_equal(up.password, "cpassword"); + + reset_user_pass(&up); + + flags |=3D GET_USER_PASS_PASSWORD_ONLY; + /*FIXME: query_user_exec() called even though nothing queued */ + will_return(query_user_exec_builtin, true); + assert_true(get_user_pass_cr(&up, "ipassword\n", "UT", flags, NULL)); + assert_true(up.defined); + assert_string_equal(up.username, "user"); + assert_string_equal(up.password, "ipassword"); + + reset_user_pass(&up); + + flags |=3D GET_USER_PASS_PASSWORD_ONLY; + expect_string(query_user_exec_builtin, query_user[i].prompt, "Enter UT= Password:"); + will_return(query_user_exec_builtin, "cpassword"); + will_return(query_user_exec_builtin, true); + /* will try to retrieve missing password from stdin */ + assert_true(get_user_pass_cr(&up, "", "UT", flags, NULL)); + assert_true(up.defined); + assert_string_equal(up.username, "user"); + assert_string_equal(up.password, "cpassword"); +} + +static void +test_get_user_pass_authfile_stdin(void **state) +{ + struct user_pass up =3D { 0 }; + reset_user_pass(&up); + unsigned int flags =3D 0; + + expect_string(query_user_exec_builtin, query_user[i].prompt, "Enter UT= Username:"); + expect_string(query_user_exec_builtin, query_user[i].prompt, "Enter UT= Password:"); + will_return(query_user_exec_builtin, "cuser"); + will_return(query_user_exec_builtin, "cpassword"); + will_return(query_user_exec_builtin, true); + assert_true(get_user_pass_cr(&up, "stdin", "UT", flags, NULL)); + assert_true(up.defined); + assert_string_equal(up.username, "cuser"); + assert_string_equal(up.password, "cpassword"); + + reset_user_pass(&up); + + flags |=3D GET_USER_PASS_PASSWORD_ONLY; + expect_string(query_user_exec_builtin, query_user[i].prompt, "Enter UT= Password:"); + will_return(query_user_exec_builtin, "cpassword"); + will_return(query_user_exec_builtin, true); + assert_true(get_user_pass_cr(&up, "stdin", "UT", flags, NULL)); + assert_true(up.defined); + assert_string_equal(up.username, "user"); + assert_string_equal(up.password, "cpassword"); +} + +static void +test_get_user_pass_authfile_file(void **state) +{ + struct user_pass up =3D { 0 }; + reset_user_pass(&up); + unsigned int flags =3D 0; + + const char *srcdir =3D getenv("srcdir"); + assert_non_null(srcdir); + char authfile[PATH_MAX] =3D { 0 }; + + snprintf(authfile, PATH_MAX, "%s/%s", srcdir, "input/user_pass.txt"); + /*FIXME: query_user_exec() called even though nothing queued */ + will_return(query_user_exec_builtin, true); + assert_true(get_user_pass_cr(&up, authfile, "UT", flags, NULL)); + assert_true(up.defined); + assert_string_equal(up.username, "fuser"); + assert_string_equal(up.password, "fpassword"); + + reset_user_pass(&up); + + snprintf(authfile, PATH_MAX, "%s/%s", srcdir, "input/user_only.txt"); + expect_string(query_user_exec_builtin, query_user[i].prompt, "Enter UT= Password:"); + will_return(query_user_exec_builtin, "cpassword"); + will_return(query_user_exec_builtin, true); + /* will try to retrieve missing password from stdin */ + assert_true(get_user_pass_cr(&up, authfile, "UT", flags, NULL)); + assert_true(up.defined); + assert_string_equal(up.username, "fuser"); + assert_string_equal(up.password, "cpassword"); + + reset_user_pass(&up); + + flags |=3D GET_USER_PASS_PASSWORD_ONLY; + snprintf(authfile, PATH_MAX, "%s/%s", srcdir, "input/user_only.txt"); + /*FIXME: query_user_exec() called even though nothing queued */ + will_return(query_user_exec_builtin, true); + assert_true(get_user_pass_cr(&up, authfile, "UT", flags, NULL)); + assert_true(up.defined); + assert_string_equal(up.username, "user"); + assert_string_equal(up.password, "fuser"); +} + +const struct CMUnitTest user_pass_tests[] =3D { + cmocka_unit_test(test_get_user_pass_defined), + cmocka_unit_test(test_get_user_pass_needok), + cmocka_unit_test(test_get_user_pass_inline_creds), + cmocka_unit_test(test_get_user_pass_authfile_stdin), + cmocka_unit_test(test_get_user_pass_authfile_file), +}; + +int +main(void) +{ + return cmocka_run_group_tests(user_pass_tests, NULL, NULL); +} -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/468?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: I193aef06912f01426dd4ac298aadfab97dd75a35 Gerrit-Change-Number: 468 Gerrit-PatchSet: 9 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: newpatchset --CFhU04zTEeA= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 uploaded patch set #9 to the change originally cr= eated by flichtenheld.

View Change

The following approvals got outda= ted and were removed: Code-Review+2 by plaisthos

test_user_pass: new UT for get_user_pass

= UTs for basic functionality, without management functions.

v2:
-= add CMake support
- add GHA support for both MSVC and mingw
v3:
= - fix distcheck by adding input/ directory to dist

Change-Id: I193a= ef06912f01426dd4ac298aadfab97dd75a35
Signed-off-by: Frank Lichtenheld &l= t;frank@...2641...>
Acked-by: Arne Schwabe <arne-openvpn@...2477...= .>
Message-Id: <20240127200716.10255-1-gert@...1296...>
URL:= https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28138.= html
Signed-off-by: Gert Doering <gert@...1296...>
---
M .gi= thub/workflows/build.yaml
M CMakeLists.txt
M src/openvpn/misc.h
M = src/openvpn/syshead.h
M tests/unit_tests/openvpn/Makefile.am
A tests/= unit_tests/openvpn/input/user_only.txt
A tests/unit_tests/openvpn/input/= user_pass.txt
A tests/unit_tests/openvpn/test_user_pass.c
8 files cha= nged, 327 insertions(+), 2 deletions(-)

git pull ssh://gerrit.ope=
nvpn.net:29418/openvpn refs/changes/68/468/9
diff --git a/.github/w=
orkflows/build.yaml b/.github/workflows/build.yaml
index cc= 98813..bc937e5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -85,11 = +85,13 @@
fail-fast: false
ma= trix:
arch: [x86, x64]
- test: [argv, auth_token, buffer, cryptoap= i, crypto, misc, ncp, packet_id, pkt, provider, ssl, tls_crypt]
<= span style=3D"color: hsl(120, 100%, 40%);">+ test: [argv, auth_token= , buffer, cryptoapi, crypto, misc, ncp, packet_id, pkt, provider, ssl, tls_= crypt, user_pass]


runs-on: windows-l= atest
name: "mingw unittest ${{ matrix.test }} - = ${{ matrix.arch }} - OSSL"
steps:
+ - name: Checkout OpenVPN
+ uses: actions/ch= eckout@...2689...
- name: Retrieve mingw unittest
uses: actions/download-artifact@...2689... with:
@@ -97,6 +99,8 @@
= path: unittests
- name: Run ${{ matrix.test = }} unit test
run: ./unittests/test_${{ matrix.test= }}.exe
+ env:=
+ srcdir: &= quot;${{ github.workspace }}/tests/unit_tests/openvpn"

ubuntu:
strategy:
@@ -279,6 +283,7 @@
configurePreset: win-${{ m= atrix.arch }}-release
buildPreset: win-${{ matri= x.arch }}-release
testPreset: win-${{ matrix.arc= h }}-release
+ = testPresetAdditionalArgs: "['--output-on-failure']"

- uses: actions/upload-artifact@...1665...= 689...
with:
diff --git a/CMakeLis= ts.txt b/CMakeLists.txt
index 5e07d50..be55c60 100644

--- a/CMakeLists.txt
+++ b/CMakeLists.txt=
@@ -604,6 +604,7 @@
"test_pkt"=
"test_provider"
= "test_ssl"
+ # for compat = with autotools make check
+ set(_UT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tests/unit= _tests/openvpn)
+ = set_tests_properties(${test_name} PROPERTIES
+ ENVIRONMENT "srcdir= =3D${_UT_SOURCE_DIR}")
endif ()
add_executable(${test_name}
tests/= unit_tests/openvpn/${test_name}.c
@@ -782,6 +787,15 @@
src/openvpn/base64.c
)=

+ targ= et_sources(test_user_pass PRIVATE
+ tests/unit_tests/openvpn/mock_get_random.c
= + tests/unit_tests/openv= pn/mock_win32_execve.c
+ src/openvpn/console.c
+ src/openvpn/env_set.c
+ src/openvpn/run_command.c<= br>+ )
+
if (TARGET test= _argv)
target_link_options(test_argv PRIVATE -Wl,-= -wrap=3Dparse_line)
target_sources(test_argv PRIVA= TE
diff --git a/src/openvpn/misc.h b/src/openvpn/misc.h

index d51609d..5ae61b5 100644
--- a/src/openvp= n/misc.h
+++ b/src/openvpn/misc.h
@@ -118,1= 2 +118,31 @@

#define GET_USER_PASS_INLIN= E_CREDS (1<<10) /* indicates that auth_file is actually inline creds= */

+/**
+ * Retrieves t= he user credentials from various sources depending on the flags.
= + *
+ * @param up The user_pass structure to store t= he retrieved credentials.
+ * @param auth_file The path to the authentication file. Might be NUL= L.
+ * @param prefix = The prefix to prepend to user prompts.
+ * @param flags Additional flags to control the behavior= of the function.
+ *= @param auth_challenge The authentication challenge string.
+ * @return true if the user credent= ials were successfully retrieved, false otherwise.
+ */
bool get_user_pass_cr(s= truct user_pass *up,
const char *aut= h_file,
const char *prefix, const unsigned int flags,
= const char *auth_challenge);
<= br>+/**
+ * Retrieves the user credentials from va= rious sources depending on the flags.
+ *
= + * @param up The user_pass structure to store the retrieved credentials.
+ * @param auth_file T= he path to the authentication file. Might be NULL.
+ * @param prefix The prefix to prepend to us= er prompts.
+ * @para= m flags Additional flags to control the behavior of the function.+ * @return true if the user c= redentials were successfully retrieved, false otherwise.
+ */
static inline boo= l
get_user_pass(struct user_pass *up,
= const char *auth_file,
diff --git a/src/openvpn/= syshead.h b/src/openvpn/syshead.h
index a021c91..d2859fe 10= 0644
--- a/src/openvpn/syshead.h
+++ b/src/= openvpn/syshead.h
@@ -524,4 +524,10 @@
#de= fine ENABLE_MEMSTATS
#endif

+#ifdef _MSC_VER

+#ifndef PATH_MAX
+#define PATH_MAX MAX_PATH
+#endif
+#endif
+
#endif /* ifndef SYSHEAD_H */
<= span>diff --git a/tests/unit_tests/openvpn/Makefile.am b/tests/unit_tests/o= penvpn/Makefile.am
index f81a10f..88a694d 100644
= --- a/tests/unit_tests/openvpn/Makefile.am
+++ b/test= s/unit_tests/openvpn/Makefile.am
@@ -1,5 +1,7 @@
= AUTOMAKE_OPTIONS =3D foreign

+EXTRA_DIST =3D input
+
AM_TESTSUITE_SUMMARY_H= EADER =3D ' for $(PACKAGE_STRING) Unit-Tests'

test_binaries=3D
@@ -9,7 +11,7 @@
<= span> endif

test_binaries +=3D crypto_te= stdriver packet_id_testdriver auth_token_testdriver ncp_testdriver misc_tes= tdriver \
- pkt_testdri= ver ssl_testdriver
+ = pkt_testdriver ssl_testdriver user_pass_testdriver
=
if HAVE_LD_WRAP_SUPPORT
if !WIN32
@@ -251,6 +253,22 @@
$(top_srcdir)/src/openvpn/base64.= c


+user_pass_testdriver_CFLAGS =3D @TEST_CFLAGS@ \+ -I$(top_srcdir)/include -I$= (top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn
+user_pass_testdriver_LDFLAGS =3D @TEST_LD= FLAGS@
+
+user_pass_testdriver_SOURCES =3D= test_user_pass.c mock_msg.c \
+ $(top_srcdir)/src/openvpn/buffer.c \
+ $(top_srcdir)/src/openvpn/console.c \<= br>+ $(top_srcdir)/src/openvpn/= env_set.c \
+ mock_wi= n32_execve.c \
+ $(to= p_srcdir)/src/openvpn/run_command.c \
+ mock_get_random.c \
+ $(top_srcdir)/src/openvpn/platform.c \
+ $(top_srcdir)/src/openvpn/win32-uti= l.c \
+ $(top_srcdir)= /src/openvpn/base64.c
+
+
= ncp_testdriver_CFLAGS =3D @TEST_CFLAGS@ \
-I$(top_srcdi= r)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \<= br> $(OPTIONAL_CRYPTO_CFLAGS)
diff --git a/tests/uni= t_tests/openvpn/input/user_only.txt b/tests/unit_tests/openvpn/input/user_o= nly.txt
new file mode 100644
index 0000000.= .3ca0db3
--- /dev/null
+++ b/tests/unit_tes= ts/openvpn/input/user_only.txt
@@ -0,0 +1 @@
+fuser
diff --git a= /tests/unit_tests/openvpn/input/user_pass.txt b/tests/unit_tests/openvpn/in= put/user_pass.txt
new file mode 100644
inde= x 0000000..31b38ef
--- /dev/null
+++ b/test= s/unit_tests/openvpn/input/user_pass.txt
@@ -0,0 +1,2 @@

+fuser
+fpassword
diff --git= a/tests/unit_tests/openvpn/test_user_pass.c b/tests/unit_tests/openvpn/tes= t_user_pass.c
new file mode 100644
index 00= 00000..ab4dfe4
--- /dev/null
+++ b/tests/un= it_tests/openvpn/test_user_pass.c
@@ -0,0 +1,260 @@<= br>+/*
+ * OpenVPN -- An application to securely tu= nnel IP networks
+ * = over a single UDP port, with support for SSL/TLS-based+ * session authe= ntication and key exchange,
+ * packet encryption, packet authentication, and=
+ * packet comp= ression.
+ *+ * Copyright (C) 2023 OpenV= PN Inc <sales@...515...>
+ *
+ * Th= is program is free software; you can redistribute it and/or modify+ * it under the terms of th= e GNU General Public License as published by the
+ * Free Software Foundation, either version 2= of the License,
+ * = or (at your option) any later version.
+ *
+ * but WITHOUT ANY WARR= ANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURP= OSE. See the
+ * GN= U General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License= along
+ * with this= program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Fl= oor, Boston, MA 02110-1301 USA.
+ */
+

+#ifdef HAVE_CONFIG_H
+#include "config.= h"
+#endif

+
+#undef ENABLE_SYSTEMD
+
+#include "syshead.h"
+#include "manage.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
+#include "misc.c"
+
+struct management *management; /* global */
+
+/* mocking */
+bool
+query= _user_exec_builtin(void)
+{
+ /* Loop t= hrough configured query_user slots */
+ for (int i =3D 0; i < QUERY_USER_NUMSLOTS &&am= p; query_user[i].response !=3D NULL; i++)
+ {
+ check_expected(query_user[i].prompt);
+ strncpy(query_user[i].response, m= ock_ptr_type(char *), query_user[i].response_len);
+ }
+
+ = return mock();
+}
+void
+management_auth_failure(struct manag= ement *man, const char *type, const char *reason)
+{
+ assert_true(0);
+}
+bool
+management_query_user= _pass(struct management *man,
+ struct user_pass *up,
+ const cha= r *type,
+ = const unsigned int flags,
+ const char *static_challen= ge)
+{
+ assert_true(0);

+ return false;

+}
+/* stubs for some unused functions instead of pulling = in too many dependencies */
+int
+parse_li= ne(const char *line, char **p, const int n, const char *file,
+ const int line_num, in= t msglevel, struct gc_arena *gc)
+{
+ a= ssert_true(0);
+ r= eturn 0;
+}+
+/* tooling */
+static void
+reset_user_pass(struct user_pass *up)
+{
+ up->defined =3D false;
+ up->token_defined =3D false;
+ up->nocache =3D false;=
+ strcpy(up->username= , "user");
= + strcpy(up->password, "password");
+}
+
+sta= tic void
+test_get_us= er_pass_defined(void **state)
+{
+ stru= ct user_pass up =3D { 0 };
+ reset_user_pass(&up);
+ up.defined =3D true;
+ assert_true(get_user_pass_cr(&up, NULL, "= ;UT", 0, NULL));
+}
+
+static void
+test_get_user_pass_needok(void **state)
+{
+ struct user_pass up =3D { 0 };

+ reset_user_pass(&= ;up);
+ unsigned i= nt flags =3D GET_USER_PASS_NEED_OK;
+
+ = expect_string(query_user_exec_builtin, query_user[i].prompt, "NEED-OK= |UT|user:");
+ = will_return(query_user_exec_builtin, "");
+ will_return(query_user_exec_builtin, = true);
+ /*FIXME: = query_user_exec() called even though nothing queued */
+ will_return(query_user_exec_builtin,= true);
+ assert_t= rue(get_user_pass_cr(&up, NULL, "UT", flags, NULL));+ assert_true(up.defined);=
+ assert_string_e= qual(up.password, "ok");
+
+ = reset_user_pass(&up);
+
+ expect_st= ring(query_user_exec_builtin, query_user[i].prompt, "NEED-OK|UT|user:&= quot;);
+ will_ret= urn(query_user_exec_builtin, "cancel");
+ will_return(query_user_exec_builtin, true= );
+ /*FIXME: quer= y_user_exec() called even though nothing queued */
+ will_return(query_user_exec_builtin, tru= e);
+ assert_true(= get_user_pass_cr(&up, NULL, "UT", flags, NULL));
+ assert_true(up.defined);
+ assert_string_equal= (up.password, "cancel");
+}
+

+static void
= +test_get_user_pass_inline_cred= s(void **state)
+{
+ struct user_pass u= p =3D { 0 };
+ res= et_user_pass(&up);
+
+ /*FIXME: query_user_exec() called even though nothin= g queued */
+ will= _return(query_user_exec_builtin, true);
+ assert_true(get_user_pass_cr(&up, "iuser\n= ipassword", "UT", flags, NULL));
+ assert_true(up.defined);
+ assert_string_equal(up.username, &= quot;iuser");
+ = assert_string_equal(up.password, "ipassword");
+

+ reset_user_pass(&up);
+
+ expect_string(query_user_exec_builtin, query_user[i].prompt= , "Enter UT Password:");
+ will_return(query_user_exec_builtin, "cpassword&quo= t;);
+ will_return= (query_user_exec_builtin, true);
+ /* will try to retrieve missing password from stdin */
+ assert_true(get_use= r_pass_cr(&up, "iuser", "UT", flags, NULL));=
+ assert_true(up.defined= );
+ assert_string= _equal(up.username, "iuser");
+ assert_string_equal(up.password, "cpassword&qu= ot;);
+
+ reset_user_pass(&up);
+
+ flags |=3D GET_USER_PASS_PASSWORD_ONL= Y;
+ /*FIXME: quer= y_user_exec() called even though nothing queued */
+ will_return(query_user_exec_builtin, tru= e);
+ assert_true(= get_user_pass_cr(&up, "ipassword\n", "UT", flags, N= ULL));
+ assert_tr= ue(up.defined);
+ = assert_string_equal(up.username, "user");
+ assert_string_equal(up.password, &quo= t;ipassword");
+=
+ reset_user_pass= (&up);
++ flags |=3D GET_USER_PASS= _PASSWORD_ONLY;
+ = expect_string(query_user_exec_builtin, query_user[i].prompt, "Enter UT= Password:");
+ = will_return(query_user_exec_builtin, "cpassword");
<= span style=3D"color: hsl(120, 100%, 40%);">+ will_return(query_user_exec= _builtin, true);

+ = /* will try to retrieve missing password from stdin */
+ assert_true(get_user_pass_cr(&u= p, "", "UT", flags, NULL));
+ assert_true(up.defined);
+ assert_string_equal(up.username, &= quot;user");
+ = assert_string_equal(up.password, "cpassword");
+}
+
+static void
+test_g= et_user_pass_authfile_stdin(void **state)
+{
+ struct user_pass up =3D { 0 };
+ reset_user_pass(&up);
+ unsigned int flags =3D 0;
+
+ expect_string(query_user_exec_builtin, query_user[i= ].prompt, "Enter UT Username:");
+ expect_string(query_user_exec_builtin, query_use= r[i].prompt, "Enter UT Password:");
+ will_return(query_user_exec_builtin, "cu= ser");
+ will= _return(query_user_exec_builtin, "cpassword");
+ will_return(query_user_exec_builti= n, true);
+ assert= _true(get_user_pass_cr(&up, "stdin", "UT", flags, N= ULL));
+ assert_tr= ue(up.defined);
+ = assert_string_equal(up.username, "cuser");
+ assert_string_equal(up.password, &quo= t;cpassword");
+=
+ reset_user_pass= (&up);
++ flags |=3D GET_USER_PASS= _PASSWORD_ONLY;
+ = expect_string(query_user_exec_builtin, query_user[i].prompt, "Enter UT= Password:");
+ = will_return(query_user_exec_builtin, "cpassword");
<= span style=3D"color: hsl(120, 100%, 40%);">+ will_return(query_user_exec= _builtin, true);
+ = assert_true(get_user_pass_cr(&up, "stdin", "UT", f= lags, NULL));
+ as= sert_true(up.defined);
+ assert_string_equal(up.password,= "cpassword");
+}
+
+static void
+test_get_user_pass_authfile_file(void **= state)
+{
<= span style=3D"color: hsl(120, 100%, 40%);">+ struct user_pass up =3D { 0= };
+ reset_user_p= ass(&up);
+ un= signed int flags =3D 0;
+
+ const char = *srcdir =3D getenv("srcdir");
+ assert_non_null(srcdir);
+ char authfile[PATH_MAX] =3D { 0 };<= br>+
+ snprintf(authfile, PATH_MAX, "%s/%s&q= uot;, srcdir, "input/user_pass.txt");
+ /*FIXME: query_user_exec() called even thou= gh nothing queued */
= + will_return(query_user_exec_builtin, true);
+ assert_true(get_user_pass_cr(&up, auth= file, "UT", flags, NULL));
+ assert_true(up.defined);
+ assert_string_equal(up.username, "fuser&= quot;);
+ assert_s= tring_equal(up.password, "fpassword");
+
+ reset_user_pass(&up);
+
= + snprintf(authfile, PATH_MAX, "%s/%s", srcdir, "input/us= er_only.txt");
+= expect_string(query_user_exec_builtin, query_user[i].prompt, "Ente= r UT Password:");
+ will_return(query_user_= exec_builtin, true);
= + /* will try to retrieve missing password from stdin */
+ assert_true(get_user_pass_cr(&a= mp;up, authfile, "UT", flags, NULL));
+ assert_true(up.defined);
+ assert_string_equal(up.username, &= quot;fuser");
+ = assert_string_equal(up.password, "cpassword");
+
+ reset_user_pass(&up);
+
+ flags |=3D GET_USER_PASS_PASSWORD_ONLY;
+ snprintf(authfile, PATH_MAX, "= %s/%s", srcdir, "input/user_only.txt");
+ /*FIXME: query_user_exec() called ev= en though nothing queued */
+ will_return(query_user_exec_builtin, true);
+ assert_true(get_user_pass_cr(&u= p, authfile, "UT", flags, NULL));
+ assert_true(up.defined);
+ assert_string_equal(up.username, &quo= t;user");
+ a= ssert_string_equal(up.password, "fuser");
+}
+
+con= st struct CMUnitTest user_pass_tests[] =3D {
+ cmocka_unit_test(test_get_user_pass_defined),<= /span>
+ cmocka_unit_test= (test_get_user_pass_needok),
+ cmocka_unit_test(test_get_user_pass_inline_creds),
<= span style=3D"color: hsl(120, 100%, 40%);">+ cmocka_unit_test(test_get_u= ser_pass_authfile_stdin),

+ cmocka_unit_test(test_get_user_pass_authfile_file),
+};
+
+int
+main(void)=
+{
+ return cmocka_run_group_tests(use= r_pass_tests, NULL, NULL);
+}

To view, visit change 468. To unsub= scribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I193aef06912f01426dd4ac298aa= dfab97dd75a35
Gerrit-Change-Number: 468
Gerrit-PatchSet: 9
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: newpatchset
--CFhU04zTEeA=--