From: "cron2 (Code Review)" Date: Wed, 9 Apr 2025 09:34:26 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <5beeb503aac8dccde4b1c1b172fcf19663a6e0d3-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="LnBsudpnwQQ="; 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: plaisthos , flichtenheld Cc: openvpn-devel --LnBsudpnwQQ= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has uploaded a new patch set (#4) to the change originally created by= plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/913?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 by cron2 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 Acked-by: Gert Doering Message-Id: <20250402134546.3504-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg31= 323.html Signed-off-by: Gert Doering --- 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/4 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 6605a42..96119c4 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -7880,10 +7880,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: 4 Gerrit-Owner: plaisthos Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-MessageType: newpatchset --LnBsudpnwQQ= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 uploaded patch set #4 to the change originally cr= eated by plaisthos.

View Change

The following approvals got outdated= and were removed: Code-Review+2 by cron2

Use USER_PASS_LEN instead of TLS_USERNAME_LEN for ov=
erride-username

Currently override-username is artificially restrict= ed to the length of
TLS common-name (64) for the corner case of using us= ername-as-common-name,
which we explicitly do not recommend to use.
<= br>Do away with that limitation and only error out on longer usernames when=
username-as-common-name is actually in effect.

Change-Id: I1c2c0= 50dd160746a0f8d9c234abe1e258bc8e48d
Signed-off-by: Arne Schwabe <arne= @...1227...>
Acked-by: Gert Doering <gert@...1296...>
Messag= e-Id: <20250402134546.3504-1-gert@...1296...>
URL: https://www.mai= l-archive.com/openvpn-devel@lists.sourceforge.net/msg31323.html
Signed-o= ff-by: Gert Doering <gert@...1296...>
---
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/4
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
<= span> && strcmp(multi->locked_username, options->over= ride_username) !=3D 0)

{
+ /* Check if the username length is accept= able */
+ if (= !ssl_verify_username_length(session, options->override_username))=
+ {
+ return false;
= + }
+
multi->lock= ed_original_username =3D multi->locked_username;
= multi->locked_username =3D strdup(options->override_username);

diff --git a/src/openvpn/options.c b/src/open= vpn/options.c
index 6605a42..96119c4 100644
--- a/src/openvpn/options.c

+++ b/src/openvpn/options.c

@@ -7880,10 +7880,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 ex= ceeds the maximum length of %d "
- "characters", TLS_USERNAME_LEN);<= /span>
+ &quo= t;characters", USER_PASS_LEN);

= /* disable the connection since ignoring the request to
<= span> * set another username might cause serious problems */
diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_veri= fy.c
index 5f8f1d3..d2cc3d1 100644
--- a/sr= c/openvpn/ssl_verify.c
+++ b/src/openvpn/ssl_verify.c
@@ -1568,6 +1568,24 @@
}
}=

+b= ool
+ssl_verify_usern= ame_length(struct tls_session *session, const char *username)
+{

+ if ((session->opt->ssl_flags & SSLF_U= SERNAME_AS_COMMON_NAME)
+ && strlen(username) > TLS_USERNAME_LEN)
+ {

+ msg(D_TLS_ERRORS,
+ "TLS Auth Error: --user= name-as-common name specified and "
+ "username is longer than the maximum = permitted Common Name "
+ "length of %d characters", TLS_USERNAME_LEN)= ;
+ return fal= se;
+ }
= + else
+ {
+ return true;
+ }
+}
+
= /**
* Main username/password verification entry po= int
*
@@ -1689,15 +1707,12 @@
<= span> }


/* check sizing of usern= ame if it will become our common name */
- if ((session->opt->ssl_flags & SSLF_USERNA= ME_AS_COMMON_NAME)
- = && strlen(up->username)>TLS_USERNAME_LEN)
+ if (!ssl_verify_username_lengt= h(session, up->username))
{
- msg(D_TLS_ERRORS,
- "TLS Auth Error: --use= rname-as-common name specified and username is longer than the maximum perm= itted Common Name length of %d characters",
- 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
i= ndex eba3832..7a4d44a 100644
--- a/src/openvpn/ssl_verify.h=
+++ b/src/openvpn/ssl_verify.h
@@ -192,6 += 192,20 @@
struct tls_session *sessio= n);


+/**
+ * Checks if the username length is valid to use. This checks when
+ * username-as-common-n= ame 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 ses= sion current TLS session
+ * @param username username to check
+ * @return true if name is u= nder limit or username-as-common-name
+ * is not active
+ */
+bool ssl_verify_username_length(struct tls_session *ses= sion,
+ = const char *username);

= /**
* Runs the --client-crresponse script if one is defi= ned.

To view, visit change 913. To unsubscri= be, 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: 4
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: newpatchset
--LnBsudpnwQQ=--