From 46416258bf85d6adac5b31da9af01f43eb3ca35d Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Mon, 2 Jul 2012 19:30:12 -0400
Subject: Reject a password containing a single quote (it does weird things in
 the pkg code), also do not try to query the zebra or ospfd daemon if they are
 not running.

---
 config/quagga_ospfd/quagga_ospfd.inc |  2 ++
 config/quagga_ospfd/quaggactl        | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'config/quagga_ospfd')

diff --git a/config/quagga_ospfd/quagga_ospfd.inc b/config/quagga_ospfd/quagga_ospfd.inc
index 71dfc886..b5a63bd0 100644
--- a/config/quagga_ospfd/quagga_ospfd.inc
+++ b/config/quagga_ospfd/quagga_ospfd.inc
@@ -299,6 +299,8 @@ function quagga_ospfd_validate_interface() {
 function quagga_ospfd_validate_input() {
 	global $config, $g, $input_errors;
 
+	if ($_POST['password'] <> "" && (strpos($_POST['password'], "'") !== false))
+		$input_errors[] = "Password cannot contain a single quote (')";
 	if (!empty($_POST['routerid']) && !is_ipaddr($_POST['routerid']))
 		$input_errors[] = "Router ID must be an address.";
 	if (!is_ipaddr($_POST['area']))
diff --git a/config/quagga_ospfd/quaggactl b/config/quagga_ospfd/quaggactl
index f370b425..6db7232e 100644
--- a/config/quagga_ospfd/quaggactl
+++ b/config/quagga_ospfd/quaggactl
@@ -28,6 +28,10 @@ restart)
 	$RC_SCRIPT restart
 	;;
 zebra)
+	if [ "`pgrep zebra`" = "" ]; then
+		echo "zebra does not appear to be running"
+		exit 1
+	fi
 	case $2 in
 	cpu*)
 		daemon_command ${ZEBRA_PORT} ${ZEBRA_PASSWORD} "show thread cpu"
@@ -43,7 +47,11 @@ zebra)
 		daemon_command ${ZEBRA_PORT} ${ZEBRA_PASSWORD} "show ip route"
 		;;
 	esac ;;
-ospf)
+ospf*)
+	if [ "`pgrep ospfd`" = "" ]; then
+		echo "ospfd does not appear to be running"
+		exit 1
+	fi
 	case $2 in
 	cpu*)
 		daemon_command ${OSPF_PORT} ${OSPF_PASSWORD} "show thread cpu"
-- 
cgit v1.2.3