webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 03:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

openvpn ccd: Fix subnet mask validation.

Browse Source
This commit is contained in:
Alexander Marx
2012-11-21 11:49:53 +01:00
committed by Michael Tremer
parent 52d08bcbd2
commit 290007b3b0
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
html/cgi-bin/ovpnmain.cgi
View File

@@ -494,21 +494,36 @@ sub addccdnet
my $checkup;
my $ccdip;
my $baseaddress;
if(!&General::validhostname($ccdname)){
#check name
if ($ccdname eq '')
{
$errormessage=$errormessage.$Lang::tr{'ccd err name'}."<br>";
return
}
if(!&General::validhostname($ccdname))
{
$errormessage=$Lang::tr{'ccd err invalidname'};
return;
}
#check ip
if (&General::validipandmask($ccdnet)){
$ccdnet=&General::iporsubtocidr($ccdnet);
}else{
($ccdip,$subcidr) = split (/\//,$ccdnet);
$subcidr=&General::iporsubtocidr($subcidr);
#check subnet
if ($subcidr > 30)
{
$errormessage=$Lang::tr{'ccd err invalidnet'};
return;
}
($ccdip,$subcidr) = split (/\//,$ccdnet);
if ($ccdname eq '') {
$errormessage=$errormessage.$Lang::tr{'ccd err name'}."<br>";
#check ip
if (!&General::validipandmask($ccdnet)){
$errormessage=$Lang::tr{'ccd err invalidnet'};
return;
}
#check if we try to use same network as ovpn server
if (&General::iporsubtocidr($ccdnet) eq &General::iporsubtocidr($ovpnsubnet)) {
$errormessage=$errormessage.$Lang::tr{'ccd err isovpnnet'}."<br>";