- add a max setting for cgi image size. (D: Closes #670811)

munin-monitoring · Apr 30, 2012 · 26fbc97 · 26fbc97
1 parent ce3b8c6
commit 26fbc97
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/common/lib/Munin/Common/Config.pm b/common/lib/Munin/Common/Config.pm
@@ -39,6 +39,7 @@ my %legal = map { $_ => 1 } (
 	"unknown_limit", "num_unknowns", "dropdownlimit",
 	"max_graph_jobs", "max_cgi_graph_jobs", "munin_cgi_graph_jobs",
 	"max_html_jobs", "cgitmpdir", "update_rate",
+	"max_size_x", "max_size_y", 
 	"staticdir", "html_strategy",
 	"rrdcached_socket", "graph_args_after",
     "graph_future", "trend", "predict",

diff --git a/master/_bin/munin-cgi-graph.in b/master/_bin/munin-cgi-graph.in
@@ -355,6 +355,23 @@ sub verify_parameters {
 	    return 0;
 	}
     }
+
+    # Checks the image size requested.
+    if (( CGI::param("size_x") || "") =~ m/^(\d+)/) {
+	my $max_size_x = ( $config->{max_size_x} || 4000);
+	if ($1 > $max_size_x) {
+		WARN "[WARNING] Asked image size x too large : $1 > $max_size_x. Bailing out.";
+		return 0;
+	}
+    }
+    if (( CGI::param("size_y") || "") =~ m/^(\d+)/) {
+	my $max_size_y = ($config->{max_size_y} || 4000);
+	if ($1 > $max_size_y) {
+		WARN "[WARNING] Asked image size y too large : $1 > $max_size_y. Bailing out.";
+		return 0;
+	}
+    }
+
     return 1;
 }