From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernhard Bitsch <bbitsch@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH v2] general-functions.pl: Fix for bug#12937
Date: Mon, 19 Dec 2022 13:37:08 +0100
Message-ID: <51c63013-19e3-80c6-c372-15630ebf2c80@ipfire.org>
In-Reply-To: <20221219091236.3427-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7039603048896816587=="
List-Id: <development.lists.ipfire.org>

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

Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>

Am 19.12.2022 um 10:12 schrieb Adolf Belka:
> - The check for validwildcarddomainname did not allow wildcards of the form
>     *.ipfire.org* which is the example given on the proxy.cgi page for excl=
uded url's
>     for the wpad file.
> - A forum user sufferred from this problem and the bug was raised for it.
>     https://community.ipfire.org/t/proxy-cgi-error-message-when-use-wildcar=
d-in-wpad-excluded-url-s/8597
>     forum user has tested the patch change and confirmed it solves the prob=
lem.
>=20
> Fixes: Bug#12937
> Suggested-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
>   config/cfgroot/general-functions.pl | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-f=
unctions.pl
> index 98bedb4b9..d871025eb 100644
> --- a/config/cfgroot/general-functions.pl
> +++ b/config/cfgroot/general-functions.pl
> @@ -760,7 +760,7 @@ sub validwildcarddomainname($) {
>   	my $domainname =3D shift;
>  =20
>   	# Ignore any leading dots
> -	if ($domainname =3D~ m/^\*\.(.*)/) {
> +	if ($domainname =3D~ m/^\*\.([^\*]*)\*?/) {
>   		$domainname =3D $1;
>   	}
>  =20

--===============7039603048896816587==--