Re: [PATCH] BUG10806: fix wrong customhostgroupcheck

Re: [PATCH] BUG10806: fix wrong customhostgroupcheck

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1914 bytes --]

Okay, could you please include descriptions like these in the commit
messages? Please resend this patch, too.

-Michael

On Fri, 2015-10-16 at 19:54 +0200, Alexander Marx wrote:
> 
> 
> Am 16.10.2015 um 17:51 schrieb Michael Tremer:
> > What does this patch do?
> I think it should fix a design error. As you can see, the function is
> only executed, if a hostgroup is used as target.
> within the function, we read the hasharray of all defined hostgroups.
> unfortunately it checks not only the TARGET hostgroup but the source
> hostgroup as well if it contains a mac address. This leads to an
> error, if a hostgroup is used as source and contains a mac address.
> so with this patch i adapted the if construct only to raise the
> error, if a mac address is present in the TARGET hostgroup.
> 
> > http://wiki.ipfire.org/devel/git/commit-messages
> > 
> > On Fri, 2015-10-16 at 09:13 +0200, Alexander Marx wrote:
> > >  Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
> > > ---
> > >  html/cgi-bin/firewall.cgi | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/html/cgi-bin/firewall.cgi b/html/cgi
> > > -bin/firewall.cgi
> > > index c207ec7..682c285 100644
> > > --- a/html/cgi-bin/firewall.cgi
> > > +++ b/html/cgi-bin/firewall.cgi
> > > @@ -597,7 +597,7 @@ sub checktarget
> > >  		&General::readhasharray("$confighost",
> > > \%customhost);
> > >  		foreach my $grpkey (sort keys %customgrp){
> > >  			foreach my $hostkey (sort keys
> > > %customhost){
> > > -				if ($customgrp{$grpkey}[2] eq
> > > $customhost{$hostkey}[0] && $customhost{$hostkey}[1] eq 'mac'){
> > > +				if ($customgrp{$grpkey}[2] eq
> > > $customhost{$hostkey}[0] && $customgrp{$grpkey}[2] eq
> > > $fwdfwsettings{$fwdfwsettings{'grp2'}} &&
> > > $customhost{$hostkey}[1] eq
> > > 'mac'){
> > >  					$hint=$Lang::tr{'fwdfw
> > > hint
> > > mac'};
> > >  					return $hint;
> > >  				}

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH] BUG10806: fix wrong customhostgroupcheck

[Alexander Marx]

[-- Attachment #1: Type: text/plain, Size: 1131 bytes --]

The function to check for valid hostgroup entries not only
checked the target hostgroup but also the source hostgroup if any.
This lead to the error.
Now the check only affects target hostgroups because it does not matter if a sourcegroup contains mac addresses.

 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
---
 html/cgi-bin/firewall.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index c207ec7..682c285 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -597,7 +597,7 @@ sub checktarget
 		&General::readhasharray("$confighost", \%customhost);
 		foreach my $grpkey (sort keys %customgrp){
 			foreach my $hostkey (sort keys %customhost){
-				if ($customgrp{$grpkey}[2] eq $customhost{$hostkey}[0] && $customhost{$hostkey}[1] eq 'mac'){
+				if ($customgrp{$grpkey}[2] eq $customhost{$hostkey}[0] && $customgrp{$grpkey}[2] eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $customhost{$hostkey}[1] eq 'mac'){
 					$hint=$Lang::tr{'fwdfw hint mac'};
 					return $hint;
 				}
-- 
1.9.1

[PATCH] BUG10806: fix wrong customhostgroupcheck

[Alexander Marx]

[-- Attachment #1: Type: text/plain, Size: 862 bytes --]

 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
---
 html/cgi-bin/firewall.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index c207ec7..682c285 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -597,7 +597,7 @@ sub checktarget
 		&General::readhasharray("$confighost", \%customhost);
 		foreach my $grpkey (sort keys %customgrp){
 			foreach my $hostkey (sort keys %customhost){
-				if ($customgrp{$grpkey}[2] eq $customhost{$hostkey}[0] && $customhost{$hostkey}[1] eq 'mac'){
+				if ($customgrp{$grpkey}[2] eq $customhost{$hostkey}[0] && $customgrp{$grpkey}[2] eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $customhost{$hostkey}[1] eq 'mac'){
 					$hint=$Lang::tr{'fwdfw hint mac'};
 					return $hint;
 				}
-- 
1.9.1

Re: [PATCH] BUG10806: fix wrong customhostgroupcheck

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1011 bytes --]

What does this patch do?

http://wiki.ipfire.org/devel/git/commit-messages

On Fri, 2015-10-16 at 09:13 +0200, Alexander Marx wrote:
>  Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
> ---
>  html/cgi-bin/firewall.cgi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
> index c207ec7..682c285 100644
> --- a/html/cgi-bin/firewall.cgi
> +++ b/html/cgi-bin/firewall.cgi
> @@ -597,7 +597,7 @@ sub checktarget
>  		&General::readhasharray("$confighost",
> \%customhost);
>  		foreach my $grpkey (sort keys %customgrp){
>  			foreach my $hostkey (sort keys %customhost){
> -				if ($customgrp{$grpkey}[2] eq
> $customhost{$hostkey}[0] && $customhost{$hostkey}[1] eq 'mac'){
> +				if ($customgrp{$grpkey}[2] eq
> $customhost{$hostkey}[0] && $customgrp{$grpkey}[2] eq
> $fwdfwsettings{$fwdfwsettings{'grp2'}} && $customhost{$hostkey}[1] eq
> 'mac'){
>  					$hint=$Lang::tr{'fwdfw hint
> mac'};
>  					return $hint;
>  				}

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]