From: Erik Kapfer <erik.kapfer@ipfire.org>
Date: Mon, 13 Nov 2017 10:10:34 +0000 (+0100)
Subject: - Added "'TYPE' net" to N2N section since it can only be changed there.
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fopenvpn_valid_til_days;p=people%2Fummeegge%2Fipfire-2.x.git

- Added "'TYPE' net" to N2N section since it can only be changed there.
- Check for N2N sets days valid maximum to '999999' days.
- Check for Roadwarrior sets days valid maximum to '999999' days.
- If '999999' days will be exceeded, a warning will be displayed.
---

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 8f45f04e04..9c383f7100 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -4040,11 +4040,13 @@ if ($cgiparams{'TYPE'} eq 'net') {
 	}
 
 	# Check that OpenSSL maximum of valid days won´t be exceeded
-	if (length($cgiparams{'DAYS_VALID'}) > 6) {
-		$errormessage = $Lang::tr{'invalid input for valid till days'};
-		unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!";
-		rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
-		goto VPNCONF_ERROR;
+	if ($cgiparams{'TYPE'} eq 'net') {
+		if ($cgiparams{'DAYS_VALID'} > '999999') {
+			$errormessage = $Lang::tr{'invalid input for valid till days'};
+			unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!";
+			rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
+			goto VPNCONF_ERROR;
+		}
 	}
 
 	if ($cgiparams{'ENABLED'} !~ /^(on|off)$/) {
@@ -4230,7 +4232,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
 	    }
 
 		# Check that OpenSSL maximum of valid days won´t be exceeded
-		if (length($cgiparams{'DAYS_VALID'}) > 6) {
+		if ($cgiparams{'DAYS_VALID'} > '999999') {
 			$errormessage = $Lang::tr{'invalid input for valid till days'};
 			goto VPNCONF_ERROR;
 		}