From: "plaisthos (Code Review)" Date: Mon, 24 Mar 2025 13:43:40 +0000 In-Reply-To: References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <5c2710e400608c963958fbf6aab1ca93205bae21-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="AZa/J4bAV+I="; 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 --AZa/J4bAV+I= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld. Hello flichtenheld,=20 I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/913?usp=3Demail to look at the new patch set (#3). 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 Currently override-username is artificially restricted to the length of TLS common-name (64) for the corner case of using username-as-common-name, which we explicitly do not recommend to use. Do away with that limitation and only error out on longer usernames when username-as-common-name is actually in effect. Change-Id: I1c2c050dd160746a0f8d9c234abe1e258bc8e48d Signed-off-by: Arne Schwabe --- 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, 42 insertions(+), 7 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/13/913/3 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..d2cc3d1 100644 --- a/src/openvpn/ssl_verify.c +++ b/src/openvpn/ssl_verify.c @@ -1568,6 +1568,24 @@ } } +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; + } + else + { + return true; + } +} + /** * Main username/password verification entry point * @@ -1689,15 +1707,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: 3 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --AZa/J4bAV+I= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld.

plaisthos uploaded patch set #3 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/913?usp=3Demail">View Chang= e

Use USER_PASS_LEN instead of TLS_USERNAME_LEN for override-username
Currently override-username is artificially restricted to the length = of
TLS common-name (64) for the corner case of using username-as-common-= name,
which we explicitly do not recommend to use.

Do away with t= hat limitation and only error out on longer usernames when
username-as-c= ommon-name is actually in effect.

Change-Id: I1c2c050dd160746a0f8d9c= 234abe1e258bc8e48d
Signed-off-by: Arne Schwabe <arne@...1227...>---
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, 42 insertion= s(+), 7 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/open=
vpn refs/changes/13/913/3
diff --git a/src/openvpn/multi.c b/src/op=
envpn/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->loc= ked_username, options->override_username) !=3D 0)
{=
+ /* Check if= the username length is acceptable */
+ if (!ssl_verify_username_length(session, options-= >override_username))
+ {
+ = return false;
+= }
+ multi->locked_original_username =3D multi->locked_use= rname;
multi->locked_username =3D strdup(option= s->override_username);

diff --git a/sr= c/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 @@<= br> else if (streq(p[0], "override-username") &&= ; p[1] && !p[2])
{
VE= RIFY_PERMISSION(OPT_P_INSTANCE);
- if (strlen(p[1]) > TLS_USERNAME_LEN)
+ if (strlen(p[1]) > USER_P= ASS_LEN)
{
msg(msglev= el, "override-username exceeds the maximum length of %d "<= br>- "charact= ers", TLS_USERNAME_LEN);
+ "characters", USER_PASS_LEN);
/* disable the connection since ignor= ing the request to
* set another username mig= ht cause serious problems */
diff --git a/src/openvpn/ssl_v= erify.c b/src/openvpn/ssl_verify.c
index 5f8f1d3..d2cc3d1 1= 00644
--- a/src/openvpn/ssl_verify.c
+++ b/= src/openvpn/ssl_verify.c
@@ -1568,6 +1568,24 @@
<= span> }
}

+bool
+ssl_verify_username_length(struct tls_session *session, const= char *username)
+{
+ if ((session->= opt->ssl_flags & SSLF_USERNAME_AS_COMMON_NAME)
+ && strlen(username) > = TLS_USERNAME_LEN)
+ = {
+ msg(D_TL= S_ERRORS,
+ = "TLS Auth Error: --username-as-common name specified and "
+ "userna= me is longer than the maximum permitted Common Name "
+ "length of %d chara= cters", TLS_USERNAME_LEN);
+ return false;
+ }
+= else
+ {

+ return true;
+ }
+}
+
/**
* Main username/= password verification entry point
*
@@ -1= 689,15 +1707,12 @@
}

/* check sizing of username if it will become our common name */
- if ((session->opt-&= gt;ssl_flags & SSLF_USERNAME_AS_COMMON_NAME)
- && strlen(up->username)>TL= S_USERNAME_LEN)
+ = if (!ssl_verify_username_length(session, up->username))
= {
- msg(D_T= LS_ERRORS,
- = "TLS Auth Error: --username-as-common name specified and username is = longer than the maximum permitted Common Name length of %d characters"= ,
- TLS_USER= NAME_LEN);
plugin_status =3D OPENVPN_PLUGIN_FUNC_E= RROR;
script_status =3D OPENVPN_PLUGIN_FUNC_ERROR;=
}
+
/* auth succeeded? */
bool p= lugin_ok =3D plugin_status =3D=3D OPENVPN_PLUGIN_FUNC_SUCCESS
|| plugin_status =3D=3D OPENVPN_PLUGIN_FUNC_DEFERR= ED;

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<= /span>
@@ -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 com= mon 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 ch= eck
+ * @return = true if name is under limit or username-as-common-name
+ * is not a= ctive

+ */
= +bool ssl_verify_username_lengt= h(struct tls_session *session,
+ const char *username);
/**
* Runs the --client-crrespo= nse script if one is defined.

To view, = visit cha= nge 913. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1c2c050dd160746a0f8d9c234ab= e1e258bc8e48d
Gerrit-Change-Number: 913
Gerrit-PatchSet: 3
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: newpatchset
--AZa/J4bAV+I=--