From: "flichtenheld (Code Review)" Date: Wed, 6 Dec 2023 15:24:54 +0000 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="XjaOkDuXqc8="; 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: plaisthos Cc: openvpn-devel --XjaOkDuXqc8= 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 do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/468?usp=3Demail to review the following change. 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. Change-Id: I193aef06912f01426dd4ac298aadfab97dd75a35 Signed-off-by: Frank Lichtenheld --- 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 M tests/unit_tests/openvpn/mock_msg.h A tests/unit_tests/openvpn/test_user_pass.c 5 files changed, 289 insertions(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/68/468/1 diff --git a/tests/unit_tests/openvpn/Makefile.am b/tests/unit_tests/openvp= n/Makefile.am index ef45b11..f1a81e9 100644 --- a/tests/unit_tests/openvpn/Makefile.am +++ b/tests/unit_tests/openvpn/Makefile.am @@ -7,7 +7,7 @@ endif test_binaries +=3D crypto_testdriver packet_id_testdriver auth_token_testd= river ncp_testdriver misc_testdriver \ - pkt_testdriver + pkt_testdriver user_pass_testdriver if HAVE_LD_WRAP_SUPPORT if !WIN32 test_binaries +=3D tls_crypt_testdriver @@ -214,6 +214,21 @@ $(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 \ + $(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/mock_msg.h b/tests/unit_tests/openvpn= /mock_msg.h index be5f2e5..d54c262 100644 --- a/tests/unit_tests/openvpn/mock_msg.h +++ b/tests/unit_tests/openvpn/mock_msg.h @@ -24,6 +24,8 @@ #ifndef MOCK_MSG_H #define MOCK_MSG_H +extern bool fatal_error_triggered; + /** * Mock debug level defaults to 0, which gives clean(-ish) test reports. = Call * this function from your test driver to increase debug output when you 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..edd566a --- /dev/null +++ b/tests/unit_tests/openvpn/test_user_pass.c @@ -0,0 +1,268 @@ +/* + * 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 Selva Nair + * + * 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) +{ + (void) man; + (void) type; + (void) 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) +{ + (void) man; + (void) up; + (void) type; + (void) flags; + (void) 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: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-MessageType: newchange --XjaOkDuXqc8= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

Vi= ew Change

test_user_pass: new UT for get_user_pass

UTs for basic= functionality, without management functions.

Change-Id: I193aef0691= 2f01426dd4ac298aadfab97dd75a35
Signed-off-by: Frank Lichtenheld <fran= k@...2641...>
---
M tests/unit_tests/openvpn/Makefile.am
A test= s/unit_tests/openvpn/input/user_only.txt
A tests/unit_tests/openvpn/inpu= t/user_pass.txt
M tests/unit_tests/openvpn/mock_msg.h
A tests/unit_te= sts/openvpn/test_user_pass.c
5 files changed, 289 insertions(+), 1 delet= ion(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/chang=
es/68/468/1
diff --git a/tests/unit_tests/openvpn/Makefile.am b/tes=
ts/unit_tests/openvpn/Makefile.am
index ef45b11..f1a81e9 10= 0644
--- a/tests/unit_tests/openvpn/Makefile.am
<= span>+++ b/tests/unit_tests/openvpn/Makefile.am
@@ -7,7 +7,= 7 @@
endif

test_binarie= s +=3D crypto_testdriver packet_id_testdriver auth_token_testdriver ncp_tes= tdriver misc_testdriver \
- pkt_testdriver
+= pkt_testdriver user_pass_testdriver
if HAVE_LD_WRAP_SUPPO= RT
if !WIN32
test_binaries +=3D tls_crypt= _testdriver
@@ -214,6 +214,21 @@
$(top_sr= cdir)/src/openvpn/base64.c


+user_pass_testdriver_CFLAGS =3D= @TEST_CFLAGS@ \
+ -I= $(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvp= n
+user_pass_testdriv= er_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/open= vpn/console.c \
+ $(t= op_srcdir)/src/openvpn/env_set.c \
+ $(top_srcdir)/src/openvpn/run_command.c \
+ mock_get_random.c \
+ $(top_srcdir)/src/openvpn/platform.= c \
+ $(top_srcdir)/s= rc/openvpn/win32-util.c \
+ $(top_srcdir)/src/openvpn/base64.c
+
+fuserdiff --git a/tests/unit_tests/openvpn/input/user_pass.txt b/tests/u= nit_tests/openvpn/input/user_pass.txt
new file mode 100644<= /span>
index 0000000..31b38ef
--- /dev/null=
+++ b/tests/unit_tests/openvpn/input/user_pass.txt
@@ -0,0 +1,2 @@

+fu= ser
+fpassword=
diff --git a/tests/unit_tests/openvpn/mock_msg.h b/tests/unit_tes= ts/openvpn/mock_msg.h
index be5f2e5..d54c262 100644<= br>--- a/tests/unit_tests/openvpn/mock_msg.h
+++ b/te= sts/unit_tests/openvpn/mock_msg.h
@@ -24,6 +24,8 @@<= br> #ifndef MOCK_MSG_H
#define MOCK_MSG_H
=
+extern bool = fatal_error_triggered;
+/*
+ * OpenVPN -- An application to= securely tunnel IP networks

+ * over a single UDP port, with support for SSL/TLS-ba= sed
+ * s= ession authentication and key exchange,
+ * packet encryption, packet authentication= , and
+ * = packet compression.
= + *
+ * Copyright (C= ) 2023 Selva Nair <selva.nair@...277...>
+ *
+ * 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 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 Genera= l Public License along
+ * 51 Franklin = Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef = HAVE_CONFIG_H
+#inclu= de "config.h"
+#endif
++#undef ENABLE_SYSTEMD=
+
+#include "syshead.h"
+#include "manage.h"
+
+#include <stdlib.h>
+#include <string.h>+#include <setjmp.h>
+#include <cmocka.h&g= t;
+
+#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_u= ser[i].response, mock_ptr_type(char *), query_user[i].response_len);=
+ }
+
+ return mock();
+}
+voi= d
+management_auth_fa= ilure(struct management *man, const char *type, const char *reason)<= br>+{
+ (void) man;
+ (void) type;
+ (void) 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 *st= atic_challenge)
+{

+ (void) man;=
+ (void) up;
<= span style=3D"color: hsl(120, 100%, 40%);">+ (void) type;
+ (void) flags;
+ (void) static_challenge;<= br>+ assert_true(0);<= br>+ return false;+}
+/* stubs for some unused functions instead of p= ulling in too many dependencies */
+int
+p= arse_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->u= sername, "user");
+ strcpy(up->password, "password");
+}
+
+static void
+test_g= et_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(&= amp;up);
+ unsigne= d 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_builti= n, true);
+ /*FIXM= E: query_user_exec() called even though nothing queued */
+ will_return(query_user_exec_built= in, true);
+ asser= t_true(get_user_pass_cr(&up, NULL, "UT", flags, NULL));
+ assert_true(up.define= d);
+ assert_strin= g_equal(up.password, "ok");
+
+ = reset_user_pass(&up);
+
+ expect= _string(query_user_exec_builtin, query_user[i].prompt, "NEED-OK|UT|use= r:");
+ 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_t= rue(get_user_pass_cr(&up, NULL, "UT", flags, NULL));+ assert_true(up.defined);=
+ assert_string_e= qual(up.password, "cancel");
+}
= +
+static void=
+test_get_user_pass_inline_= creds(void **state)
+= {
+ struct user_pa= ss up =3D { 0 };
+ = reset_user_pass(&up);
+ unsigned int flags =3D GET_USER_PASS_INLINE_CREDS;
+

+ /*FIXME: query_user_exec() called even though no= thing queued */
+ = will_return(query_user_exec_builtin, true);
+ assert_true(get_user_pass_cr(&up, "ius= er\nipassword", "UT", flags, NULL));
+ assert_true(up.defined);
+ assert_string_equal(up.usern= ame, "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, "cpasswo= rd");
+ will_= return(query_user_exec_builtin, true);
+ /* will try to retrieve missing password from stdin = */
+ assert_true(g= et_user_pass_cr(&up, "iuser", "UT", flags, NULL));<= /span>
+ assert_true(up.d= efined);
+ assert_= string_equal(up.username, "iuser");
+ assert_string_equal(up.password, "cpassw= ord");
+<= br>+ reset_user_pass(&up= );
+
+ flags |=3D GET_USER_PASS_PASSWOR= D_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", fla= gs, NULL));
+ asse= rt_true(up.defined);
= + assert_string_equal(up.username, "user");
+ assert_string_equal(up.password, &= quot;ipassword");
+ reset_user_p= ass(&up);
+
+ flags |=3D GET_USER_P= ASS_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_e= xec_builtin, true);
+= /* will try to retrieve missing password from stdin */
+ assert_true(get_user_pass_cr(&am= p;up, "", "UT", flags, NULL));
+ assert_true(up.defined);
+ assert_string_equal(up.username= , "user");

= + assert_string_equal(up.password, "cpassword");
+}

+
+static void
+tes= t_get_user_pass_authfile_stdin(void **state)
+{
+ struct user_pass up =3D { 0 };
+ reset_user_pass(&up);
+ unsigned int flags =3D 0;
<= span style=3D"color: hsl(120, 100%, 40%);">+

+ expect_string(query_user_exec_builtin, query_u= ser[i].prompt, "Enter UT Username:");
+ expect_string(query_user_exec_builtin, quer= y_user[i].prompt, "Enter UT Password:");
+ will_return(query_user_exec_builtin, &qu= ot;cuser");
+ = will_return(query_user_exec_builtin, "cpassword");
+ will_return(query_user_exec_b= uiltin, true);
+ a= ssert_true(get_user_pass_cr(&up, "stdin", "UT", fla= gs, NULL));
+ asse= rt_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, "Ente= r UT Password:");
+ 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.passw= ord, "cpassword");
+}
++static void
+test_get_user_pass_authfile_file(voi= d **state)
+{<= br>+ struct user_pass up =3D= { 0 };
+ reset_us= er_pass(&up);
+ = unsigned int flags =3D 0;
+
+ const c= har *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 eve= n 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, &quo= t;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, &q= uot;Enter UT Password:");
+ will_return(query_user_exec_builtin, "cpassword");=
+ will_return(que= ry_user_exec_builtin, true);
+ /* will try to retrieve missing password from stdin */<= br>+ assert_true(get_user_pa= ss_cr(&up, authfile, "UT", flags, NULL));
+ assert_true(up.defined);
= + assert_string_equal(up.use= rname, "fuser");
+ assert_string_equal(up.password, "cpassword");<= br>+
+ reset_user_pass(&up);
+
+ flags |=3D GET_USER_PASS_PASSWORD_ONLY;
<= span style=3D"color: hsl(120, 100%, 40%);">+ snprintf(authfile, PATH_MAX= , "%s/%s", srcdir, "input/user_only.txt");
+ /*FIXME: query_user_exec() c= alled even though nothing queued */
+ will_return(query_user_exec_builtin, true);
<= span style=3D"color: hsl(120, 100%, 40%);">+ assert_true(get_user_pass_c= r(&up, authfile, "UT", flags, NULL));
+ assert_true(up.defined);
+ assert_string_equal(up.usern= ame, "user");
+ assert_string_equal(up.password, "fuser");
+}
+
+const struct CMUnitTest user_pass_tests[] =3D {
+ cmocka_unit_test(test_get_user_pass_d= efined),
+ cmocka_= unit_test(test_get_user_pass_needok),
+ cmocka_unit_test(test_get_user_pass_inline_creds),

+ cmocka_unit_test(t= est_get_user_pass_authfile_stdin),
+ cmocka_unit_test(test_get_user_pass_authfile_file),
+};
+
+int
+m= ain(void)
+{+ return cmocka_run_group_= tests(user_pass_tests, NULL, NULL);
+}

To view, visit change 468.= To unsubscribe, 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: 1
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...>
Gerrit-MessageType: newchange
--XjaOkDuXqc8=--