From 0cdd14a9e0faaa914f3757f461be3471599c5371 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 20 Mar 2024 14:56:20 +0100 Subject: [PATCH] ovpnmain.cgi: Drop validdotmask() This is a totally braindead function that prevented some basic usability by using the more modern prefix notation. It simply checks if there is a freaking dot. Great! Signed-off-by: Michael Tremer --- html/cgi-bin/ovpnmain.cgi | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 3cb62b6de..4a80927b5 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -683,16 +683,6 @@ sub check_ccdconf return 1; } -sub validdotmask -{ - my $ipdotmask = $_[0]; - if (&General::validip($ipdotmask)) { return 0; } - if (!($ipdotmask =~ /^(.*?)\/(.*?)$/)) { } - my $mask = $2; - if (($mask =~ /\./ )) { return 0; } - return 1; -} - # ------------------------------------------------------------------- sub write_routepushfile @@ -3870,21 +3860,21 @@ if ($cgiparams{'TYPE'} eq 'net') { goto VPNCONF_ERROR; } - if ( &validdotmask ($cgiparams{'LOCAL_SUBNET'})) { + if (!&Network::check_subnet($cgiparams{'LOCAL_SUBNET'})) { $errormessage = $Lang::tr{'openvpn prefix local subnet'}; 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 ( &validdotmask ($cgiparams{'OVPN_SUBNET'})) { + if (!&Network::check_subnet($cgiparams{'OVPN_SUBNET'})) { $errormessage = $Lang::tr{'openvpn prefix openvpn subnet'}; 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 ( &validdotmask ($cgiparams{'REMOTE_SUBNET'})) { + if (!&Network::check_subnet($cgiparams{'REMOTE_SUBNET'})) { $errormessage = $Lang::tr{'openvpn prefix remote subnet'}; 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: $!"; -- 2.39.5