From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/6] ovpnmain.cgi: Fix for bug#11048 - insecure download icon shown for connections with a password Date: Mon, 25 Sep 2023 18:41:51 +0200 Message-ID: <20230925164204.3500045-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0023357112437701003==" List-Id: --===============0023357112437701003== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - At long last I have re-visited the patch submission for bug #11048 and fixe= d the issues that caused the problems last time I evaluated it in Testing. - The insecure package download icon is shown if entry 41 in /var/ipfire/ovpn= /ovpnconfig is set to no-pass. The code block on ovpnmain.cgi that deals with this che= cks if the connection is a host and if the first password entry is a null. Then it ad= ds no-pass to ovpnconfig. - The same block of code is also used for when he connection is edited. Howev= er at this stage the password entry is back to null because the password value is onl= y kept until the connection has been saved. Therefore doing an edit results in the pass= word value being taken as null even for connections with a password. - This fix enters no-pass if the connection type is host and the password is = null, pass if the connection type is host and the password has characters. If the connec= tion type is net then no-pass is used as net2net connections dop not have encrypted cer= tificates. - The code has been changed to show a different icon for unencrypted and encr= ypted certificates. - Separate patches are provided for the language file change, the provision o= f a new icon and the code for the update.sh script for the Core Update to update all ex= isting connections, if any exist, to have either pass or no-pass in index 41. - This patch set was a joint collaboration between Erik Kapfer and Adolf Belka - Patch set, including the code for the Core Update 180 update.sh script has = been tested on a vm testbed Fixes: Bug#11048 Tested-by: Adolf Belka Suggested-by: Adolf Belka Suggested-by: Erik Kapfer Signed-off-by: Adolf Belka --- html/cgi-bin/ovpnmain.cgi | 75 +++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 5afe54f55..eb89c5095 100755 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4370,9 +4370,15 @@ if ($cgiparams{'TYPE'} eq 'net') { $confighash{$key}[39] =3D $cgiparams{'DAUTH'}; $confighash{$key}[40] =3D $cgiparams{'DCIPHER'}; =20 - if (($cgiparams{'TYPE'} eq 'host') && ($cgiparams{'CERT_PASS1'} eq "")) { - $confighash{$key}[41] =3D "no-pass"; - } + if ($confighash{$key}[41] eq "") { + if (($cgiparams{'TYPE'} eq 'host') && ($cgiparams{'CERT_PASS1= '} eq "")) { + $confighash{$key}[41] =3D "no-pass"; + } elsif (($cgiparams{'TYPE'} eq 'host') && ($cgiparams{'CERT_= PASS1'} ne "")) { + $confighash{$key}[41] =3D "pass"; + } elsif ($cgiparams{'TYPE'} eq 'net') { + $confighash{$key}[41] =3D "no-pass"; + } + } =20 $confighash{$key}[42] =3D 'HOTP/T30/6'; $confighash{$key}[43] =3D $cgiparams{'OTP_STATE'}; @@ -5512,20 +5518,24 @@ END } =20 =20 - print <$active + if ($confighash{$key}[41] eq "pass") { + print <$active =20 -
- - - -
+
+ + + + +
END - ; =20 - if ($confighash{$key}[41] eq "no-pass") { + ; } elsif ($confighash{$key}[41] eq "no-pass") { print < + $active + +
@@ -5533,7 +5543,7 @@ END
END - } else { + ; } else { print " "; } =20 @@ -5609,30 +5619,33 @@ END # If the config file contains entries, print Key to action icons if ( $id ) { print < - + + - - + + + + + + + + + + + + + + + =09 + - - - - - - - - - - - - -
  $Lang::tr{'legend'}:  3D'$Lang::tr{'click$Lang::tr{'click to disable'}    3D'?REL=$Lang::tr{'dl client arch insecure'}    $Lang::tr{'dl client arch'}     3D'$Lang::tr{'show $Lang::tr{'show certificate'}    3D'$Lan=$Lang::tr{'show otp qrcode'}
      3D=$Lang::tr{'download certificate'}  3D'?OFF'$Lang::tr{'click to enable'}  3D'$Lang::tr{'click=$Lang::tr{'click to disable'}    3D'$Lang::tr{'edit'}' $Lang::tr{'edit'}     3D'$Lang::tr{'remove= $Lang::tr{'remove'}
    3D'?OFF'$Lang::tr{'click to enable'}    3D'?FLOPPY'= $Lang::tr{'download certificate'}    3D'?RELOAD'/$Lang::tr{'dl client arch'}    3D'$Lang::tr{'show$Lang::tr{'show otp qrcode'}

+ +
END ; } --=20 2.42.0 --===============0023357112437701003==--