- Added validation code for the location group name. This is only validated when edited and not when created. - The code was copied from the section for creating the Services Group Name or the Network/Host Group Name.
Fixes: Bug#13206 Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- html/cgi-bin/fwhosts.cgi | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index baf745a0a..d6be6c40e 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -693,6 +693,9 @@ if ($fwhostsettings{'ACTION'} eq 'savelocationgrp') &General::readhasharray("$fwconfiginp", %fwinp); &General::readhasharray("$fwconfigout", %fwout);
+ # Check name + if (!&validhostname($grp)){$errormessage.=$Lang::tr{'fwhost err name'};} + # Check for existing group name. if (!&checkgroup($grp) && $fwhostsettings{'update'} ne 'on'){ $errormessage = $Lang::tr{'fwhost err grpexist'};
Great patch.
Reviewed-by: Stefan Schantl stefan.schantl@ipfire.org Am 2. August 2023 22:10:11 schrieb Adolf Belka adolf.belka@ipfire.org:
- Added validation code for the location group name. This is only validated
when edited and not when created.
- The code was copied from the section for creating the Services Group Name
or the Network/Host Group Name.
Fixes: Bug#13206 Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org
html/cgi-bin/fwhosts.cgi | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index baf745a0a..d6be6c40e 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -693,6 +693,9 @@ if ($fwhostsettings{'ACTION'} eq 'savelocationgrp') &General::readhasharray("$fwconfiginp", %fwinp); &General::readhasharray("$fwconfigout", %fwout);
- # Check name
- if (!&validhostname($grp)){$errormessage.=$Lang::tr{'fwhost err name'};}
- # Check for existing group name. if (!&checkgroup($grp) && $fwhostsettings{'update'} ne 'on'){ $errormessage = $Lang::tr{'fwhost err grpexist'};
-- 2.41.0
-
Adolf Belka -
Stefan Schantl