Firewall: when DNAT external port is given and dest port is empty, theres now an errormessage displayed

This commit is contained in:
Alexander Marx
2013-12-20 12:53:46 +01:00
committed by Michael Tremer
parent a8b113e73d
commit 3c037075d0
10 changed files with 16 additions and 1 deletions

View File

@@ -643,6 +643,7 @@ WARNING: untranslated string: fwdfw delete
WARNING: untranslated string: fwdfw dnat
WARNING: untranslated string: fwdfw dnat error
WARNING: untranslated string: fwdfw dnat porterr
WARNING: untranslated string: fwdfw dnat porterr2
WARNING: untranslated string: fwdfw edit
WARNING: untranslated string: fwdfw err nosrc
WARNING: untranslated string: fwdfw err nosrcip

View File

@@ -646,6 +646,7 @@ WARNING: untranslated string: fwdfw delete
WARNING: untranslated string: fwdfw dnat
WARNING: untranslated string: fwdfw dnat error
WARNING: untranslated string: fwdfw dnat porterr
WARNING: untranslated string: fwdfw dnat porterr2
WARNING: untranslated string: fwdfw edit
WARNING: untranslated string: fwdfw err nosrc
WARNING: untranslated string: fwdfw err nosrcip

View File

@@ -592,6 +592,7 @@ WARNING: untranslated string: fwdfw delete
WARNING: untranslated string: fwdfw dnat
WARNING: untranslated string: fwdfw dnat error
WARNING: untranslated string: fwdfw dnat porterr
WARNING: untranslated string: fwdfw dnat porterr2
WARNING: untranslated string: fwdfw edit
WARNING: untranslated string: fwdfw err nosrc
WARNING: untranslated string: fwdfw err nosrcip

View File

@@ -643,6 +643,7 @@ WARNING: untranslated string: fwdfw delete
WARNING: untranslated string: fwdfw dnat
WARNING: untranslated string: fwdfw dnat error
WARNING: untranslated string: fwdfw dnat porterr
WARNING: untranslated string: fwdfw dnat porterr2
WARNING: untranslated string: fwdfw edit
WARNING: untranslated string: fwdfw err nosrc
WARNING: untranslated string: fwdfw err nosrcip

View File

@@ -629,6 +629,7 @@ WARNING: untranslated string: fwdfw delete
WARNING: untranslated string: fwdfw dnat
WARNING: untranslated string: fwdfw dnat error
WARNING: untranslated string: fwdfw dnat porterr
WARNING: untranslated string: fwdfw dnat porterr2
WARNING: untranslated string: fwdfw edit
WARNING: untranslated string: fwdfw err nosrc
WARNING: untranslated string: fwdfw err nosrcip

View File

@@ -588,6 +588,7 @@ WARNING: untranslated string: fwdfw delete
WARNING: untranslated string: fwdfw dnat
WARNING: untranslated string: fwdfw dnat error
WARNING: untranslated string: fwdfw dnat porterr
WARNING: untranslated string: fwdfw dnat porterr2
WARNING: untranslated string: fwdfw edit
WARNING: untranslated string: fwdfw err nosrc
WARNING: untranslated string: fwdfw err nosrcip

View File

@@ -106,6 +106,7 @@
< fwdfw dnat
< fwdfw dnat error
< fwdfw dnat porterr
< fwdfw dnat porterr2
< fwdfw DROP
< fwdfw edit
< fwdfw err nosrc
@@ -518,6 +519,7 @@
< fwdfw dnat
< fwdfw dnat error
< fwdfw dnat porterr
< fwdfw dnat porterr2
< fwdfw DROP
< fwdfw edit
< fwdfw err nosrc
@@ -914,6 +916,7 @@
< fwdfw dnat
< fwdfw dnat error
< fwdfw dnat porterr
< fwdfw dnat porterr2
< fwdfw DROP
< fwdfw edit
< fwdfw err nosrc
@@ -1299,6 +1302,7 @@
< fwdfw dnat
< fwdfw dnat error
< fwdfw dnat porterr
< fwdfw dnat porterr2
< fwdfw DROP
< fwdfw edit
< fwdfw err nosrc

View File

@@ -729,8 +729,11 @@ sub checkrule
{
#check valid port for NAT
if($fwdfwsettings{'USE_NAT'} eq 'ON'){
#if no port is given in nat area, take target host port
#if no dest port is given in nat area, take target host port
if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'TGT_PORT' && $fwdfwsettings{'dnatport'} eq ''){$fwdfwsettings{'dnatport'}=$fwdfwsettings{'TGT_PORT'};}
if($fwdfwsettings{'TGT_PORT'} eq ''){
$errormessage=$Lang::tr{'fwdfw dnat porterr2'};
}
#check if port given in nat area is a single valid port or portrange
if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'TGT_PORT'} ne '' && !&check_natport($fwdfwsettings{'dnatport'})){
$errormessage=$Lang::tr{'fwdfw target'}.": ".$Lang::tr{'fwdfw dnat porterr'}."<br>";

View File

@@ -930,6 +930,7 @@
'fwdfw dnat' => 'Destination-NAT (Port-Weiterleitung)',
'fwdfw dnat error' => 'Für Destination-NAT muss ein einzelner Host als Ziel ausgewählt werden. Gruppen oder Netzwerke sind nicht erlaubt',
'fwdfw dnat porterr' => 'Für NAT-Regeln muss ein einzelner Port oder Portbereich angegeben werden',
'fwdfw dnat porterr2' => 'Externer Port (NAT) darf nur angegeben werden, wenn ein Ziel-Port definiert ist.',
'fwdfw edit' => 'Bearbeiten',
'fwdfw err nosrc' => 'Keine Quelle ausgewählt',
'fwdfw err nosrcip' => 'Bitte Quell-IP-Adresse angeben',

View File

@@ -955,6 +955,7 @@
'fwdfw dnat' => 'Destination NAT (Port forwarding)',
'fwdfw dnat error' => 'You have to select a single host for DNAT. Groups or networks are not allowed.',
'fwdfw dnat porterr' => 'You have to select a single port or portrange (tcp/udp) for NAT',
'fwdfw dnat porterr2' => 'Cannot use external port (NAT) when no destination port is defined.',
'fwdfw edit' => 'Edit',
'fwdfw err nosrc' => 'No source selected.',
'fwdfw err nosrcip' => 'Please provide a source IP address.',