From: "plaisthos (Code Review)" Date: Mon, 24 Mar 2025 11:31:18 +0000 References: Reply-To: 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="s0thGy0n9qk="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Use USER_PASS_LEN instead of TLS_USERNAME_LEN for override-username List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: openvpn-devel --s0thGy0n9qk= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/913?usp=3Demail to review the following change. Change subject: Use USER_PASS_LEN instead of TLS_USERNAME_LEN for override-= username ...................................................................... Use USER_PASS_LEN instead of TLS_USERNAME_LEN for override-username Change-Id: I1c2c050dd160746a0f8d9c234abe1e258bc8e48d --- M src/openvpn/multi.c M src/openvpn/options.c M src/openvpn/ssl_verify.c M src/openvpn/ssl_verify.h 4 files changed, 39 insertions(+), 7 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/13/913/1 diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index a673ec1..a2d3fd1 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -2705,6 +2705,12 @@ if (!multi->locked_original_username && strcmp(multi->locked_username, options->override_username) !=3D= 0) { + /* Check if the username length is acceptable */ + if (!ssl_verify_username_length(session, options->override_usernam= e)) + { + return false; + } + multi->locked_original_username =3D multi->locked_username; multi->locked_username =3D strdup(options->override_username); diff --git a/src/openvpn/options.c b/src/openvpn/options.c index ab56609..f89fc7d 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -7875,10 +7875,10 @@ else if (streq(p[0], "override-username") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_INSTANCE); - if (strlen(p[1]) > TLS_USERNAME_LEN) + if (strlen(p[1]) > USER_PASS_LEN) { msg(msglevel, "override-username exceeds the maximum length of= %d " - "characters", TLS_USERNAME_LEN); + "characters", USER_PASS_LEN); /* disable the connection since ignoring the request to * set another username might cause serious problems */ diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c index 5f8f1d3..dbd2226 100644 --- a/src/openvpn/ssl_verify.c +++ b/src/openvpn/ssl_verify.c @@ -1568,6 +1568,21 @@ } } +bool +ssl_verify_username_length(struct tls_session *session, const char *userna= me) +{ + if ((session->opt->ssl_flags & SSLF_USERNAME_AS_COMMON_NAME) + && strlen(username) > TLS_USERNAME_LEN) + { + msg(D_TLS_ERRORS, + "TLS Auth Error: --username-as-common name specified and " + "username is longer than the maximum permitted Common Name " + "length of %d characters", TLS_USERNAME_LEN); + return false; + } + return true; +} + /** * Main username/password verification entry point * @@ -1689,15 +1704,12 @@ } /* check sizing of username if it will become our common name */ - if ((session->opt->ssl_flags & SSLF_USERNAME_AS_COMMON_NAME) - && strlen(up->username)>TLS_USERNAME_LEN) + if (ssl_verify_username_length(session, up->username)) { - msg(D_TLS_ERRORS, - "TLS Auth Error: --username-as-common name specified and usern= ame is longer than the maximum permitted Common Name length of %d character= s", - TLS_USERNAME_LEN); plugin_status =3D OPENVPN_PLUGIN_FUNC_ERROR; script_status =3D OPENVPN_PLUGIN_FUNC_ERROR; } + /* auth succeeded? */ bool plugin_ok =3D plugin_status =3D=3D OPENVPN_PLUGIN_FUNC_SUCCESS || plugin_status =3D=3D OPENVPN_PLUGIN_FUNC_DEFERRED; diff --git a/src/openvpn/ssl_verify.h b/src/openvpn/ssl_verify.h index eba3832..7a4d44a 100644 --- a/src/openvpn/ssl_verify.h +++ b/src/openvpn/ssl_verify.h @@ -192,6 +192,20 @@ struct tls_session *session); +/** + * Checks if the username length is valid to use. This checks when + * username-as-common-name is active if the username is shorter than + * the maximum TLS common name length (64). + * + * It will also display an error message if the name is too long + * + * @param session current TLS session + * @param username username to check + * @return true if name is under limit or username-as-common-= name + * is not active + */ +bool ssl_verify_username_length(struct tls_session *session, + const char *username); /** * Runs the --client-crresponse script if one is defined. -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/913?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: I1c2c050dd160746a0f8d9c234abe1e258bc8e48d Gerrit-Change-Number: 913 Gerrit-PatchSet: 1 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --s0thGy0n9qk= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld.

plaisthos would like flichtenheld to review this change.

Vi= ew Change

Use USER_PASS_LEN instead of TLS_USERNAME_LEN for override-us=
ername

Change-Id: I1c2c050dd160746a0f8d9c234abe1e258bc8e48d
---M src/openvpn/multi.c
M src/openvpn/options.c
M src/openvpn/ssl_ver= ify.c
M src/openvpn/ssl_verify.h
4 files changed, 39 insertions(+), 7= deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn ref=
s/changes/13/913/1
diff --git a/src/openvpn/multi.c b/src/openvpn/m=
ulti.c
index a673ec1..a2d3fd1 100644
--- a/= src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -2705,6 +2705,12 @@
if (!multi->locked_origin= al_username
&& strcmp(multi->locked_use= rname, options->override_username) !=3D 0)
{=
+ /* Check if the us= ername length is acceptable */
+ if (!ssl_verify_username_length(session, options->ove= rride_username))
+ = {
+ r= eturn false;
+ = }
+
= multi->locked_original_username =3D multi->locked_username;<= /span>
multi->locked_username =3D strdup(options->o= verride_username);

diff --git a/src/openv= pn/options.c b/src/openvpn/options.c
index ab56609..f89fc7d= 100644
--- a/src/openvpn/options.c
+++ b/s= rc/openvpn/options.c
@@ -7875,10 +7875,10 @@
else if (streq(p[0], "override-username") && p[1] = && !p[2])

{
VERIFY_PE= RMISSION(OPT_P_INSTANCE);
- if (strlen(p[1]) > TLS_USERNAME_LEN)
+ if (strlen(p[1]) > USER_PASS_L= EN)
{
msg(msglevel, &= quot;override-username exceeds the maximum length of %d "
- "characters&q= uot;, TLS_USERNAME_LEN);
+ "characters", USER_PASS_LEN);

/* disable the connection since ignoring t= he request to
* set another username might ca= use serious problems */
diff --git a/src/openvpn/ssl_verify= .c b/src/openvpn/ssl_verify.c
index 5f8f1d3..dbd2226 100644=
--- a/src/openvpn/ssl_verify.c
+++ b/src/o= penvpn/ssl_verify.c
@@ -1568,6 +1568,21 @@
= }
}

+bool
+ssl_verify_username_length(struct tls_session *session, const char= *username)
+{=
+ if ((session->opt-&= gt;ssl_flags & SSLF_USERNAME_AS_COMMON_NAME)
+ && strlen(username) > TLS_U= SERNAME_LEN)
+ {
+ msg(D_TLS_ERR= ORS,
+ &qu= ot;TLS Auth Error: --username-as-common name specified and "+ "username is= longer than the maximum permitted Common Name "
+ "length of %d characters= ", TLS_USERNAME_LEN);
+ return false;
+ }
+ r= eturn true;
+}=
+
/**

* Main username/password verification entry point
<= span> *
@@ -1689,15 +1704,12 @@
}


/* check sizing of username if it will = become our common name */
- if ((session->opt->ssl_flags & SSLF_USERNAME_AS_COMMON_NA= ME)
- &&= strlen(up->username)>TLS_USERNAME_LEN)
+ if (ssl_verify_username_length(session, up-&g= t;username))
{
- msg(D_TLS_ERRORS,
- "TLS Auth Error: --username-as-common na= me specified and username is longer than the maximum permitted Common Name = length of %d characters",
- TLS_USERNAME_LEN);
plugin_sta= tus =3D OPENVPN_PLUGIN_FUNC_ERROR;
script_status = =3D OPENVPN_PLUGIN_FUNC_ERROR;
}
+
/* auth succeeded? = */
bool plugin_ok =3D plugin_status =3D=3D OPENVPN_PLU= GIN_FUNC_SUCCESS
|| plugin_status =3D= =3D OPENVPN_PLUGIN_FUNC_DEFERRED;
diff --git a/src/openvpn/= ssl_verify.h b/src/openvpn/ssl_verify.h
index eba3832..7a4d= 44a 100644
--- a/src/openvpn/ssl_verify.h
+= ++ b/src/openvpn/ssl_verify.h
@@ -192,6 +192,20 @@ struct tls_session *session);


+/**
+ * Checks if t= he username length is valid to use. This checks when
+ * username-as-common-name is active if t= he username is shorter than
+ * the maximum TLS common name length (64).
+ *
+ * It will also display an error message if the name is to= o long
+ *
= + * @param session curren= t TLS session
+ * @pa= ram username username to check
+ * @return true if name is under limit or user= name-as-common-name
+= * is not active
+ */
+bool ssl_verify_username_length(struct tls_session *session,
+ = const char *username);

/**
* Runs the --client-crresponse script if one is defined.

To view, visit change 913. To unsubscribe, or for help wr= iting mail filters, visit se= ttings.

<= div itemscope itemprop=3D"action" itemtype=3D"http://schema.org/ViewAction"= >
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1c2c050dd160746a0f8d9c234ab= e1e258bc8e48d
Gerrit-Change-Number: 913
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--s0thGy0n9qk=--