From: "plaisthos (Code Review)" Date: Mon, 20 Jan 2025 12:12:36 +0000 References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <7d0f973d08473c99b498bb8467de800cd950a154-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="ZmTJJLrJv4k="; charset=UTF-8 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: Remove comparing username to NULL in tls_lock_username List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: openvpn-devel --ZmTJJLrJv4k= 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/+/871?usp=3Demail to review the following change. Change subject: Remove comparing username to NULL in tls_lock_username ...................................................................... Remove comparing username to NULL in tls_lock_username tls_lock_username is only called in a single place and that place calls this is function with up->username, which is always defined. Change-Id: Ib8adf7b31cae02e2de3d45da23b76a2d79f13e20 Signed-off-by: Arne Schwabe --- M src/openvpn/ssl_verify.c 1 file changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/71/871/1 diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c index 4c4b58d..e7d7ed6 100644 --- a/src/openvpn/ssl_verify.c +++ b/src/openvpn/ssl_verify.c @@ -153,11 +153,11 @@ { if (multi->locked_username) { - if (!username || strcmp(username, multi->locked_username)) + if (strcmp(username, multi->locked_username) !=3D 0) { msg(D_TLS_ERRORS, "TLS Auth Error: username attempted to chang= e from '%s' to '%s' -- tunnel disabled", multi->locked_username, - np(username)); + username); /* disable the tunnel */ tls_deauthenticate(multi); @@ -166,10 +166,7 @@ } else { - if (username) - { - multi->locked_username =3D string_alloc(username, NULL); - } + multi->locked_username =3D string_alloc(username, NULL); } return true; } -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/871?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: Ib8adf7b31cae02e2de3d45da23b76a2d79f13e20 Gerrit-Change-Number: 871 Gerrit-PatchSet: 1 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --ZmTJJLrJv4k= 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

Remove comparing username to NULL in tls_lock_username
tls_lock_username is only called in a single place and that place
calls= this is function with up->username, which is always defined.

Cha= nge-Id: Ib8adf7b31cae02e2de3d45da23b76a2d79f13e20
Signed-off-by: Arne Sc= hwabe <arne@...1227...>
---
M src/openvpn/ssl_verify.c
1 fil= e changed, 3 insertions(+), 6 deletions(-)

git pull ssh://gerrit.=
openvpn.net:29418/openvpn refs/changes/71/871/1
diff --git a/src/op=
envpn/ssl_verify.c b/src/openvpn/ssl_verify.c
index 4c4b58d= ..e7d7ed6 100644
--- a/src/openvpn/ssl_verify.c
<= span>+++ b/src/openvpn/ssl_verify.c
@@ -153,11 +153,11 @@
{
if (multi->locked_username)
{
- = if (!username || strcmp(username, multi->locked_username))+ if (strcmp(username, = multi->locked_username) !=3D 0)
{
msg(D_TLS_ERRORS, "TLS Auth Error: username attempted = to change from '%s' to '%s' -- tunnel disabled",
multi->locked_username,
- np(username));
<= span style=3D"color: hsl(120, 100%, 40%);">+ username);

/* disable the tunnel */<= br> tls_deauthenticate(multi);
@@ -166,10= +166,7 @@
}
else
{

- if (us= ername)
- {
- multi->lock= ed_username =3D string_alloc(username, NULL);
- }
+ multi->locked_username =3D string_alloc(username, = NULL);
}
return true;
<= span> }


To view, visit change 871. To unsubs= cribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ib8adf7b31cae02e2de3d45da23b= 76a2d79f13e20
Gerrit-Change-Number: 871
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
--ZmTJJLrJv4k=--