From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/2] ovpnmain.cgi: Fix for bug in WUI menu on CU172 Testing
Date: Mon, 05 Dec 2022 09:40:14 +0100
Message-ID: <20221205084015.3563799-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3617927803166473448=="
List-Id: <development.lists.ipfire.org>

--===============3617927803166473448==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- On CU172 Testing Build: master/eb9e29f9 when selecting the OpenVPN menu it =
showed the
   Diffie-Hellman info and pressing back took you to the same DH page.
- Tested patch suggestion from Erik on vm testbed and confirmed that it worke=
d.

Suggested-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 html/cgi-bin/ovpnmain.cgi | 4 ++--
 langs/de/cgi-bin/de.pl    | 2 ++
 langs/en/cgi-bin/en.pl    | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index dc429d90c..ecfd4fdaf 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -977,7 +977,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NA=
ME'}"){mkdir "${General
   print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n";
   print SERVERCONF "cert ${General::swroot}/ovpn/certs/servercert.pem\n";
   print SERVERCONF "key ${General::swroot}/ovpn/certs/serverkey.pem\n";
-  print SERVERCONF "dh ${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}\n";
+  print SERVERCONF "dh $dhparameter\n";
   print SERVERCONF "# Cipher\n";
   print SERVERCONF "cipher $cgiparams{'DCIPHER'}\n";
=20
@@ -5700,7 +5700,7 @@ END
=20
 	print <<END;
 		<tr>
-			<td class=3D'base' $col3>$Lang::tr{'dh parameter'}</td>
+			<td class=3D'base' $col3>$Lang::tr{'dh'}</td>
 			<td class=3D'base' $col3>$dhsubject</td>
 			<form method=3D'post' name=3D'frmdhparam'><td width=3D'3%' align=3D'cente=
r' $col3>
 			<input type=3D'hidden' name=3D'ACTION' value=3D'$Lang::tr{'show dh'}' />
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index a52d41531..457a7108c 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -760,6 +760,7 @@
 'details' =3D> 'Mehr',
 'device' =3D> 'Ger=C3=A4t',
 'devices on blue' =3D> 'Ger=C3=A4te auf BLAU',
+'dh' =3D> 'Diffie-Hellman-Parameter',
 'dhcp advopt add' =3D> 'DHCP Option hinzuf=C3=BCgen',
 'dhcp advopt added' =3D> 'DHCP Option hinzugef=C3=BCgt',
 'dhcp advopt blank value' =3D> 'Wert f=C3=BCr DHCP Option darf nicht leer se=
in',
@@ -2256,6 +2257,7 @@
 'show ca certificate' =3D> 'CA Zertifikat anzeigen',
 'show certificate' =3D> 'Datei anzeigen',
 'show crl' =3D> 'Certificate Revocation List anzeigen',
+'show dh' =3D> 'Diffie-Hellman-Parameter anzeigen',
 'show host certificate' =3D> 'Host-Zertifikat anzeigen',
 'show last x lines' =3D> 'die letzten x Zeilen anzeigen',
 'show otp qrcode' =3D> 'Zeige OTP QRCode',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index bcba77aa4..72cef9a11 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -795,6 +795,7 @@
 'details' =3D> 'Details',
 'device' =3D> 'Device',
 'devices on blue' =3D> 'Devices on BLUE',
+'dh' =3D> 'Diffie-Hellman-Parameter',
 'dhcp advopt add' =3D> 'Add a DHCP option',
 'dhcp advopt added' =3D> 'DHCP option added',
 'dhcp advopt blank value' =3D> 'DHCP Option value cannot be empty.',
@@ -2313,6 +2314,7 @@
 'show ca certificate' =3D> 'Show CA certificate',
 'show certificate' =3D> 'Show file',
 'show crl' =3D> 'Show certificate revocation list',
+'show dh' =3D> 'Show Diffie-Hellman parameters',
 'show host certificate' =3D> 'Show host certificate',
 'show last x lines' =3D> 'Show last x lines',
 'show lines' =3D> 'Show lines',
--=20
2.38.1


--===============3617927803166473448==--