getrrdimage.cgi: Allow more non-word characters in the URL

Message ID 20210513092705.1043-1-hofmann@leo-andres.de
State Accepted
Commit a276dfba7a4228aef22af1c669bec8012715f4a4
Headers
Series getrrdimage.cgi: Allow more non-word characters in the URL |

Commit Message

Leo-Andres Hofmann May 13, 2021, 9:27 a.m. UTC
  As discussed in bug #12615

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
---
 html/cgi-bin/getrrdimage.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Adolf Belka May 13, 2021, 12:26 p.m. UTC | #1
Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>

On 13/05/2021 11:27, Leo-Andres Hofmann wrote:
> As discussed in bug #12615
>
> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
> ---
>   html/cgi-bin/getrrdimage.cgi | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/html/cgi-bin/getrrdimage.cgi b/html/cgi-bin/getrrdimage.cgi
> index 34ee4bf7a..c08247c57 100644
> --- a/html/cgi-bin/getrrdimage.cgi
> +++ b/html/cgi-bin/getrrdimage.cgi
> @@ -50,7 +50,7 @@ my $graph = $query{'graph'};
>   my $range = lc $query{'range'}; # lower case
>   
>   # Check parameters
> -unless(($origin =~ /^\w+?\.cgi$/) && ($graph =~ /^[\w-]+?$/) && ($range ~~ @Graphs::time_ranges)) {
> +unless(($origin =~ /^\w+?\.cgi$/) && ($graph =~ /^[\w\-.,; ]+?$/) && ($range ~~ @Graphs::time_ranges)) {
>   	# Send HTTP headers
>   	_start_png_output();
>
  
Peter Müller May 14, 2021, 7:14 a.m. UTC | #2
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

> As discussed in bug #12615
> 
> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
> ---
>  html/cgi-bin/getrrdimage.cgi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/html/cgi-bin/getrrdimage.cgi b/html/cgi-bin/getrrdimage.cgi
> index 34ee4bf7a..c08247c57 100644
> --- a/html/cgi-bin/getrrdimage.cgi
> +++ b/html/cgi-bin/getrrdimage.cgi
> @@ -50,7 +50,7 @@ my $graph = $query{'graph'};
>  my $range = lc $query{'range'}; # lower case
>  
>  # Check parameters
> -unless(($origin =~ /^\w+?\.cgi$/) && ($graph =~ /^[\w-]+?$/) && ($range ~~ @Graphs::time_ranges)) {
> +unless(($origin =~ /^\w+?\.cgi$/) && ($graph =~ /^[\w\-.,; ]+?$/) && ($range ~~ @Graphs::time_ranges)) {
>  	# Send HTTP headers
>  	_start_png_output();
>  	
>
  

Patch

diff --git a/html/cgi-bin/getrrdimage.cgi b/html/cgi-bin/getrrdimage.cgi
index 34ee4bf7a..c08247c57 100644
--- a/html/cgi-bin/getrrdimage.cgi
+++ b/html/cgi-bin/getrrdimage.cgi
@@ -50,7 +50,7 @@  my $graph = $query{'graph'};
 my $range = lc $query{'range'}; # lower case
 
 # Check parameters
-unless(($origin =~ /^\w+?\.cgi$/) && ($graph =~ /^[\w-]+?$/) && ($range ~~ @Graphs::time_ranges)) {
+unless(($origin =~ /^\w+?\.cgi$/) && ($graph =~ /^[\w\-.,; ]+?$/) && ($range ~~ @Graphs::time_ranges)) {
 	# Send HTTP headers
 	_start_png_output();