From bc31ed0e4647a568a1596cc2e09664675479a70d Mon Sep 17 00:00:00 2001
From: Pim van den Berg
Date: Fri, 1 Jan 2010 19:36:31 +0100
Subject: better validation of possible user input (get)

---
 graph.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'graph.php')

diff --git a/graph.php b/graph.php
index 77bfcb6..effecef 100644
--- a/graph.php
+++ b/graph.php
@@ -1,21 +1,24 @@
 <?php
 
 require_once 'conf/common.inc.php';
+require_once 'inc/functions.inc.php';
 
+$plugin = validate_get($_GET['p'], 'plugin');
 $width = empty($_GET['x']) ? $CONFIG['width'] : $_GET['x'];
 $heigth = empty($_GET['y']) ? $CONFIG['heigth'] : $_GET['y'];
 
-if (!preg_match('/^[a-z]+$/', $_GET['p'])) {
+if (validate_get($_GET['h'], 'host') === NULL) {
 	die_img('Error: plugin contains unknown characters.');
 	exit;
 }
 
-if (!file_exists($CONFIG['webdir'].'/plugin/'.$_GET['p'].'.php')) {
-	die_img(sprintf('Error: plugin not available (%s).', $_GET['p']));
+if (!file_exists($CONFIG['webdir'].'/plugin/'.$plugin.'.php')) {
+	die_img(sprintf('Error: plugin not available (%s).', $plugin));
 	exit;
 }
 
-include $CONFIG['webdir'].'/plugin/'.$_GET['p'].'.php';
+# load plugin
+include $CONFIG['webdir'].'/plugin/'.$plugin.'.php';
 
 
 function die_img($msg) {
-- 
cgit v1.1