From d998c5cf12d1bfa4da7b3e0c21555b230d989bca Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 27 Apr 2010 21:48:44 -0400
Subject: Add input validation for the Backends form

---
 config/varnish64/varnish_backends.xml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'config/varnish64/varnish_backends.xml')

diff --git a/config/varnish64/varnish_backends.xml b/config/varnish64/varnish_backends.xml
index 65a03499..68736c44 100644
--- a/config/varnish64/varnish_backends.xml
+++ b/config/varnish64/varnish_backends.xml
@@ -108,23 +108,25 @@
 		</columnitem>		
 	</adddeleteeditpagefields>
 	<fields>
-		<field>
-			<fielddescr>IPAddress</fielddescr>
-			<fieldname>ipaddress</fieldname>
-			<description>Enter the IP Address of the backend web server.</description>
-			<type>input</type>
-		</field>
 		<field>
 			<fielddescr>Backend name</fielddescr>
 			<fieldname>backendname</fieldname>
 			<description>Enter the name of this backend web server.</description>
 			<type>input</type>
+			<validate>^[a-z0-9.|-]+$</validate>
+		</field>
+		<field>
+			<fielddescr>IPAddress</fielddescr>
+			<fieldname>ipaddress</fieldname>
+			<description>Enter the IP Address of the backend web server.</description>
+			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>Port</fielddescr>
 			<fieldname>port</fieldname>
 			<description>Enter the TCP/IP port of the webserver.</description>
 			<type>input</type>
+			<validate>^[0-9]+$</validate>
 		</field>
 		<field>
 			<fielddescr>First byte timeout</fielddescr>
@@ -140,7 +142,7 @@
 		</field>
 		<field>
 			<fielddescr>Probe URL</fielddescr>
-			<fieldname>probe_url</fieldname>
+			<fieldname>probe_interval</fieldname>
 			<description>Enter the URL that varnish will use to ensure that this backend is healthy.</description>
 			<type>input</type>
 		</field>
@@ -196,4 +198,7 @@
 		sync_package_varnish();
 		varnish_start();
 	</custom_php_resync_config_command>
+	<custom_php_validation_command>
+		varnish_backends_post_validate($_POST, &amp;$input_errors);
+	</custom_php_validation_command>
 </packagegui>
\ No newline at end of file
-- 
cgit v1.2.3