* [PATCH v2] general-functions.pl: Fix for bug#12937
@ 2022-12-19 9:12 Adolf Belka
2022-12-19 12:37 ` Bernhard Bitsch
0 siblings, 1 reply; 2+ messages in thread
From: Adolf Belka @ 2022-12-19 9:12 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1125 bytes --]
- The check for validwildcarddomainname did not allow wildcards of the form
*.ipfire.org* which is the example given on the proxy.cgi page for excluded 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-wildcard-in-wpad-excluded-url-s/8597
forum user has tested the patch change and confirmed it solves the problem.
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(-)
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.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 = shift;
# Ignore any leading dots
- if ($domainname =~ m/^\*\.(.*)/) {
+ if ($domainname =~ m/^\*\.([^\*]*)\*?/) {
$domainname = $1;
}
--
2.39.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v2] general-functions.pl: Fix for bug#12937
2022-12-19 9:12 [PATCH v2] general-functions.pl: Fix for bug#12937 Adolf Belka
@ 2022-12-19 12:37 ` Bernhard Bitsch
0 siblings, 0 replies; 2+ messages in thread
From: Bernhard Bitsch @ 2022-12-19 12:37 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1276 bytes --]
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 excluded 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-wildcard-in-wpad-excluded-url-s/8597
> forum user has tested the patch change and confirmed it solves the problem.
>
> 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(-)
>
> diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.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 = shift;
>
> # Ignore any leading dots
> - if ($domainname =~ m/^\*\.(.*)/) {
> + if ($domainname =~ m/^\*\.([^\*]*)\*?/) {
> $domainname = $1;
> }
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-19 12:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-19 9:12 [PATCH v2] general-functions.pl: Fix for bug#12937 Adolf Belka
2022-12-19 12:37 ` Bernhard Bitsch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox