From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tom Rymes <trymes@rymes.com>
To: development@lists.ipfire.org
Subject: Re: [PATCH 2/2] proxy.cgi: fix subnet comparison
Date: Sun, 11 Feb 2018 15:47:31 -0500
Message-ID: <A8DB05C9-B46B-4894-900B-46202E23423F@rymes.com>
In-Reply-To: <20180211185122.9243-3-berny156@gmx.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0764947134342196318=="
List-Id: <development.lists.ipfire.org>

--===============0764947134342196318==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Bernhard,

Does any of this also apply to the subnet comparisons made when adding subnet=
s in the "Firewall Groups" portion of the WUI?

Tom

> On Feb 11, 2018, at 1:52 PM, Bernhard Held <berny156(a)gmx.de> wrote:
>=20
> The logic of subnet comparison is broken. E.g. if the blue netmask is
> 255.255.255.0, it's impossible to add a VPN subnet with the same netmask.
> The proposed patch compares the subnets individually.
> ---
> html/cgi-bin/proxy.cgi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>=20
> diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
> index ea3b41126..4993dde86 100644
> --- a/html/cgi-bin/proxy.cgi
> +++ b/html/cgi-bin/proxy.cgi
> @@ -3066,8 +3066,8 @@ END
>                @temp =3D split(/\//);
>                chomp $temp[1];
>                if (
> -                    ($temp[0] ne $netsettings{'GREEN_NETADDRESS'}) && ($te=
mp[1] ne $netsettings{'GREEN_NETMASK'}) &&
> -                    ($temp[0] ne $netsettings{'BLUE_NETADDRESS'}) && ($tem=
p[1] ne $netsettings{'BLUE_NETMASK'})
> +                    (($temp[0] ne $netsettings{'GREEN_NETADDRESS'}) || ($t=
emp[1] ne $netsettings{'GREEN_NETMASK'})) &&
> +                    (($temp[0] ne $netsettings{'BLUE_NETADDRESS'}) || ($te=
mp[1] ne $netsettings{'BLUE_NETMASK'}))
>                    )
>                {
>                    print FILE " ||\n     (isInNet(myIpAddress(), \"$temp[0]=
\", \"$temp[1]\"))";
> --=20
> 2.16.1
>=20

--===============0764947134342196318==--