From: "flichtenheld (Code Review)"
Date: Wed, 7 Feb 2024 14:47:03 +0000
In-Reply-To:
References:
Reply-To: frank@...2641..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net
Message-ID: <0f3ae088b5a675c20cd08071899e6937536ba30d-EmailReplacePatchSet-HTML@...2715...>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="I9k5TZ4Up7E="; charset=UTF-8
Subject: [Openvpn-devel] [M] Change in openvpn[master]: test_user_pass: add
basic tests for static/dynamic challenges
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: plaisthos
Cc: openvpn-devel
--I9k5TZ4Up7E=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/475?usp=3Demail
to look at the new patch set (#8).
The following approvals got outdated and were removed:
Code-Review+2 by plaisthos
Change subject: test_user_pass: add basic tests for static/dynamic challeng=
es
......................................................................
test_user_pass: add basic tests for static/dynamic challenges
Change-Id: I8b5570f6314e917f92dce072279efe415d79b22a
Signed-off-by: Frank Lichtenheld
---
M tests/unit_tests/openvpn/test_user_pass.c
1 file changed, 61 insertions(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/75/475/8
diff --git a/tests/unit_tests/openvpn/test_user_pass.c b/tests/unit_tests/o=
penvpn/test_user_pass.c
index bd4eb1f..5d3f9b6 100644
--- a/tests/unit_tests/openvpn/test_user_pass.c
+++ b/tests/unit_tests/openvpn/test_user_pass.c
@@ -267,12 +267,73 @@
assert_string_equal(up.password, "fuser");
}
+#ifdef ENABLE_MANAGEMENT
+static void
+test_get_user_pass_dynamic_challenge(void **state)
+{
+ struct user_pass up =3D { 0 };
+ reset_user_pass(&up);
+ const char *challenge =3D "CRV1:R,E:Om01u7Fh4LrGBS7uh0SWmzwabUiGiW6l:Y=
3Ix:Please enter token PIN";
+ unsigned int flags =3D GET_USER_PASS_DYNAMIC_CHALLENGE;
+
+ expect_string(query_user_exec_builtin, query_user[i].prompt, "CHALLENG=
E: Please enter token PIN");
+ will_return(query_user_exec_builtin, "challenge_response");
+ will_return(query_user_exec_builtin, true);
+ assert_true(get_user_pass_cr(&up, NULL, "UT", flags, challenge));
+ assert_true(up.defined);
+ assert_string_equal(up.username, "cr1");
+ assert_string_equal(up.password, "CRV1::Om01u7Fh4LrGBS7uh0SWmzwabUiGiW=
6l::challenge_response");
+}
+
+static void
+test_get_user_pass_static_challenge(void **state)
+{
+ struct user_pass up =3D { 0 };
+ reset_user_pass(&up);
+ const char *challenge =3D "Please enter token PIN";
+ unsigned int flags =3D GET_USER_PASS_STATIC_CHALLENGE;
+
+ expect_string(query_user_exec_builtin, query_user[i].prompt, "Enter UT=
Username:");
+ will_return(query_user_exec_builtin, "cuser");
+ 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);
+ expect_string(query_user_exec_builtin, query_user[i].prompt, "CHALLENG=
E: Please enter token PIN");
+ will_return(query_user_exec_builtin, "challenge_response");
+ will_return(query_user_exec_builtin, true);
+ assert_true(get_user_pass_cr(&up, NULL, "UT", flags, challenge));
+ assert_true(up.defined);
+ assert_string_equal(up.username, "cuser");
+ /* SCRV1:cpassword:challenge_response but base64-encoded */
+ assert_string_equal(up.password, "SCRV1:Y3Bhc3N3b3Jk:Y2hhbGxlbmdlX3Jlc=
3BvbnNl");
+
+ reset_user_pass(&up);
+
+ flags |=3D GET_USER_PASS_INLINE_CREDS;
+
+ /*FIXME: query_user_exec() called even though nothing queued */
+ will_return(query_user_exec_builtin, true);
+ expect_string(query_user_exec_builtin, query_user[i].prompt, "CHALLENG=
E: Please enter token PIN");
+ will_return(query_user_exec_builtin, "challenge_response");
+ will_return(query_user_exec_builtin, true);
+ assert_true(get_user_pass_cr(&up, "iuser\nipassword", "UT", flags, cha=
llenge));
+ assert_true(up.defined);
+ assert_string_equal(up.username, "iuser");
+ /* SCRV1:ipassword:challenge_response but base64-encoded */
+ assert_string_equal(up.password, "SCRV1:aXBhc3N3b3Jk:Y2hhbGxlbmdlX3Jlc=
3BvbnNl");
+}
+#endif /* ENABLE_MANAGEMENT */
+
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),
+#ifdef ENABLE_MANAGEMENT
+ cmocka_unit_test(test_get_user_pass_dynamic_challenge),
+ cmocka_unit_test(test_get_user_pass_static_challenge),
+#endif /* ENABLE_MANAGEMENT */
};
int
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/475?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: I8b5570f6314e917f92dce072279efe415d79b22a
Gerrit-Change-Number: 475
Gerrit-PatchSet: 8
Gerrit-Owner: flichtenheld
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-Attention: plaisthos
Gerrit-Attention: flichtenheld
Gerrit-MessageType: newpatchset
--I9k5TZ4Up7E=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: flichtenheld, plaisthos.
flichtenheld uploaded patch set #8 to this change.
<=
p>View Ch=
ange
The following approvals got outdated and were removed:
Code-Review+2 by plaisthos
test_user_pass: add basic tests for static/dynam=
ic challenges
Change-Id: I8b5570f6314e917f92dce072279efe415d79b22aSigned-off-by: Frank Lichtenheld <frank@...2641...>
---
M tes=
ts/unit_tests/openvpn/test_user_pass.c
1 file changed, 61 insertions(+),=
0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn r=
efs/changes/75/475/8
diff --git a/tests/unit_tests/openvpn/test_use=
r_pass.c b/tests/unit_tests/openvpn/test_user_pass.c
index =
bd4eb1f..5d3f9b6 100644
--- a/tests/unit_tests/openvpn/test=
_user_pass.c
+++ b/tests/unit_tests/openvpn/test_user_pass.=
c
@@ -267,12 +267,73 @@
assert_string_=
equal(up.password, "fuser");
}
=
+#ifdef ENABLE_MANAG=
EMENT
+static void
+test_get_user_pass_dyn=
amic_challenge(void **state)
+{
+ struc=
t user_pass up =3D { 0 };
+ reset_user_pass(&up);
+ const char *challenge =3D "CRV1:R,E:Om01u7Fh4LrGBS=
7uh0SWmzwabUiGiW6l:Y3Ix:Please enter token PIN";
+ unsigned int flags =3D GET_USER_PASS_=
DYNAMIC_CHALLENGE;
+<=
/span>
+ expect_string(qu=
ery_user_exec_builtin, query_user[i].prompt, "CHALLENGE: Please enter =
token PIN");
+ =
will_return(query_user_exec_builtin, "challenge_response");
+ will_return(query_u=
ser_exec_builtin, true);
+ assert_true(get_user_pass_cr(&up, NULL, "UT", flags,=
challenge));
+ as=
sert_true(up.defined);
+ assert_string_equal(up.username, "cr1");
+ assert_string_equal(up.password, =
"CRV1::Om01u7Fh4LrGBS7uh0SWmzwabUiGiW6l::challenge_response");
+}
+
+static void
+test_get_user_pass_static_challenge(void **state)
+{
+ struct user_pass up =3D { 0 };
+ reset_user_pass(&up);
=
+ const char *challenge =3D =
"Please enter token PIN";
+ unsigned int flags =3D GET_USER_PASS_STATIC_CHALLENGE;<=
/span>
+
+ expect_string(query_user_exec_built=
in, query_user[i].prompt, "Enter UT Username:");
+ will_return(query_user_exec_buil=
tin, "cuser");
+ 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);
+ expect_string(query_user_exec_builtin, query_user[i].prompt, &quo=
t;CHALLENGE: Please enter token PIN");
+ will_return(query_user_exec_builtin, "chal=
lenge_response");
+ will_return(query_user_exec_builtin, true);
+ assert_true(get_user_pass_cr(&up, NU=
LL, "UT", flags, challenge));
+ assert_true(up.defined);
+ assert_string_equal(up.username, "cus=
er");
+ /* SC=
RV1:cpassword:challenge_response but base64-encoded */
+ assert_string_equal(up.password, &qu=
ot;SCRV1:Y3Bhc3N3b3Jk:Y2hhbGxlbmdlX3Jlc3BvbnNl");
+
+ reset_user_pass(&up);
+
+ flags |=3D GET_USER_PASS_INLINE_CREDS;
+
+ /*FIXME: query_user_exec() called even though nothing queued=
*/
+ will_return(=
query_user_exec_builtin, true);
+ expect_string(query_user_exec_builtin, query_user[i].prompt=
, "CHALLENGE: Please enter token PIN");
+ will_return(query_user_exec_builtin, &quo=
t;challenge_response");
+ will_return(query_user_exec_builtin, true);
+ assert_true(get_user_pass_cr(&=
up, "iuser\nipassword", "UT", flags, challenge));
+ assert_true(up.define=
d);
+ assert_strin=
g_equal(up.username, "iuser");
+ /* SCRV1:ipassword:challenge_response but base64-e=
ncoded */
+ assert=
_string_equal(up.password, "SCRV1:aXBhc3N3b3Jk:Y2hhbGxlbmdlX3Jlc3BvbnN=
l");
+}+#endif /* ENABLE_MANAGEMENT =
*/
+
=
const struct CMUnitTest user_pass_tests[] =3D {
cmock=
a_unit_test(test_get_user_pass_defined),
cmocka_unit_t=
est(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),
+#ifdef ENABLE_MANAGEMENT
+ cmocka_unit_test(test_get_user_pass_dynamic_challenge),
+ cmocka_unit_test(tes=
t_get_user_pass_static_challenge),
+#endif /* ENABLE_MANAGEMENT */
};
int
To view, =
visit cha=
nge 475. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I8b5570f6314e917f92dce072279=
efe415d79b22a
Gerrit-Change-Number: 475
Gerrit-PatchSet: 8
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-Attention: flichtenheld <frank@...2375...=
41...>
Gerrit-MessageType: newpatchset
--I9k5TZ4Up7E=--