From: "flichtenheld (Code Review)"
Date: Fri, 8 Dec 2023 17:30:49 +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="pgXbVI+Adnw="; 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
--pgXbVI+Adnw=
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/+/475?usp=3Demail
to look at the new patch set (#2).
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/2
diff --git a/tests/unit_tests/openvpn/test_user_pass.c b/tests/unit_tests/o=
penvpn/test_user_pass.c
index ed65fdb..e99bfd4 100644
--- a/tests/unit_tests/openvpn/test_user_pass.c
+++ b/tests/unit_tests/openvpn/test_user_pass.c
@@ -360,6 +360,63 @@
expect_assert_failure(get_user_pass_cr(&up, authfile, "UT", flags, NUL=
L));
}
+#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),
@@ -369,6 +426,10 @@
cmocka_unit_test(test_get_user_pass_authfile_stdin_assertions),
cmocka_unit_test(test_get_user_pass_authfile_file),
cmocka_unit_test(test_get_user_pass_authfile_file_assertions),
+#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: 2
Gerrit-Owner: flichtenheld
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-Attention: plaisthos
Gerrit-MessageType: newpatchset
--pgXbVI+Adnw=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: plaisthos.
flichtenheld uploaded patch set #2 to this change.
<=
p>View Ch=
ange
test_user_pass: add basic tests for static/dynamic challenges
<=
br>Change-Id: I8b5570f6314e917f92dce072279efe415d79b22a
Signed-off-by: F=
rank Lichtenheld <frank@...2641...>
---
M tests/unit_tests/open=
vpn/test_user_pass.c
1 file changed, 61 insertions(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/75/475=
/2
diff --git a/tests/unit_tests/openvpn/test_user_pass.c b/tests/u=
nit_tests/openvpn/test_user_pass.c
index ed65fdb..e99bfd4 1=
00644
--- a/tests/unit_tests/openvpn/test_user_pass.c
+++ b/tests/unit_tests/openvpn/test_user_pass.c
=
@@ -360,6 +360,63 @@
expect_assert_failure(get_user_pa=
ss_cr(&up, authfile, "UT", flags, NULL));
}<=
/span>
+#i=
fdef 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:Y3Ix:Please enter token PIN";
+ unsigned int flags =
=3D GET_USER_PASS_DYNAMIC_CHALLENGE;
+
+ =
expect_string(query_user_exec_builtin, query_user[i].prompt, "CHALLE=
NGE: Please enter token PIN");
+ will_return(query_user_exec_builtin, "challenge_re=
sponse");
+ w=
ill_return(query_user_exec_builtin, true);
+ assert_true(get_user_pass_cr(&up, NULL, &quo=
t;UT", flags, challenge));
+ assert_true(up.defined);
+ assert_string_equal(up.username, "cr1");=
+ assert_string_e=
qual(up.password, "CRV1::Om01u7Fh4LrGBS7uh0SWmzwabUiGiW6l::challenge_r=
esponse");
+}
+
+static void
+test_get_user_pass_static_challenge(void **state)=
+{
+ struct user_pass up =3D { 0 };
+ reset_user_pass(&a=
mp;up);
+ const ch=
ar *challenge =3D "Please enter token PIN";
+ unsigned int flags =3D GET_USER_PASS_=
STATIC_CHALLENGE;
+=
span>
+ expect_string(que=
ry_user_exec_builtin, query_user[i].prompt, "Enter UT Username:")=
;
+ will_return(qu=
ery_user_exec_builtin, "cuser");
+ expect_string(query_user_exec_builtin, query_use=
r[i].prompt, "Enter UT Password:");
+ will_return(query_user_exec_builtin, "cp=
assword");
+ =
will_return(query_user_exec_builtin, true);
+ expect_string(query_user_exec_builtin, query_us=
er[i].prompt, "CHALLENGE: Please enter token PIN");
+ will_return(query_user_exec_b=
uiltin, "challenge_response");
+ will_return(query_user_exec_builtin, true);=
+ assert_true(get_user_p=
ass_cr(&up, NULL, "UT", flags, challenge));
+ assert_true(up.defined);+ assert_string_equal(up.u=
sername, "cuser");
+ /* SCRV1:cpassword:challenge_response but base64-encoded */
+ assert_string_equa=
l(up.password, "SCRV1:Y3Bhc3N3b3Jk:Y2hhbGxlbmdlX3Jlc3BvbnNl");
+
+ reset_user_pass(&up);
<=
span style=3D"color: hsl(120, 100%, 40%);">+
+ flags |=3D GET_USER_PASS_INLINE_CREDS;<=
br>+
+ /*FIXME: query_user_exec() called even tho=
ugh nothing queued */
+ will_return(query_user_exec_builtin, true);
+ expect_string(query_user_exec_builtin, qu=
ery_user[i].prompt, "CHALLENGE: Please enter token PIN");<=
br>+ will_return(query_user_=
exec_builtin, "challenge_response");
+ will_return(query_user_exec_builtin, true);<=
/span>
+ assert_true(get_=
user_pass_cr(&up, "iuser\nipassword", "UT", flags, =
challenge));
+ ass=
ert_true(up.defined);
+ assert_string_equal(up.username, "iuser");
+ /* SCRV1:ipassword:challenge_res=
ponse but base64-encoded */
+ assert_string_equal(up.password, "SCRV1:aXBhc3N3b3Jk:Y2hhb=
GxlbmdlX3Jlc3BvbnNl");
+}
+#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),
@@ -369,6=
+426,10 @@
cmocka_unit_test(test_get_user_pass_authfi=
le_stdin_assertions),
cmocka_unit_test(test_get_user_p=
ass_authfile_file),
cmocka_unit_test(test_get_user_pas=
s_authfile_file_assertions),
+#ifdef ENABLE_MANAGEMENT
+ cmocka_unit_test(test_get_user_pass_dynamic_challenge),=
span>
+ cmocka_unit_test(=
test_get_user_pass_static_challenge),
+#endif /* ENABLE_MANAGEMENT */
};=
int
To vie=
w, visit =
change 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: 2
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: newpatchset
--pgXbVI+Adnw=--