From mboxrd@z Thu Jan  1 00:00:00 1970
From: Erik Kapfer <ummeegge@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/2] ovpn: Add ta.key check to main settings
Date: Wed, 18 Sep 2019 07:03:34 +0200
Message-ID: <20190918050334.10792-2-ummeegge@ipfire.org>
In-Reply-To: <20190918050334.10792-1-ummeegge@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5614253108019732777=="
List-Id: <development.lists.ipfire.org>

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

Since Core 132 the 'TLS Channel Protection' is part of the global settings,
the ta.key generation check should also be in the main section otherwise it
won=C2=B4t be created if not present.

Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
---
 html/cgi-bin/ovpnmain.cgi | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 5de80b269..5b8ca9731 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -898,17 +898,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'=
}) {
         $errormessage =3D $Lang::tr{'invalid input for keepalive 1:2'};
         goto ADV_ERROR;=09
     }
-    # Create ta.key for tls-auth if not presant
-    if ($cgiparams{'TLSAUTH'} eq 'on') {
-	if ( ! -e "${General::swroot}/ovpn/certs/ta.key") {
-		system('/usr/sbin/openvpn', '--genkey', '--secret', "${General::swroot}/ov=
pn/certs/ta.key");
-		if ($?) {
-		$errormessage =3D "$Lang::tr{'openssl produced an error'}: $?";
-        goto ADV_ERROR;
-		}
-	}
-    }
-   =20
     &General::writehash("${General::swroot}/ovpn/settings", \%vpnsettings);
     &writeserverconf();#hier ok
 }
@@ -1189,6 +1178,17 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgip=
arams{'TYPE'} eq '' && $cg
 	goto SETTINGS_ERROR;
     }
=20
+	# Create ta.key for tls-auth if not presant
+	if ($cgiparams{'TLSAUTH'} eq 'on') {
+		if ( ! -e "${General::swroot}/ovpn/certs/ta.key") {
+			system('/usr/sbin/openvpn', '--genkey', '--secret', "${General::swroot}/o=
vpn/certs/ta.key");
+			if ($?) {
+				$errormessage =3D "$Lang::tr{'openssl produced an error'}: $?";
+				goto SETTINGS_ERROR;
+			}
+		}
+	}
+
     $vpnsettings{'ENABLED_BLUE'} =3D $cgiparams{'ENABLED_BLUE'};
     $vpnsettings{'ENABLED_ORANGE'} =3D$cgiparams{'ENABLED_ORANGE'};
     $vpnsettings{'ENABLED'} =3D $cgiparams{'ENABLED'};
--=20
2.12.2


--===============5614253108019732777==--