Add input validation routines

3 files changed, 57 insertions, 13 deletions

diff --git a/packages/autoconfigbackup/autoconfigbackup.inc b/packages/autoconfigbackup/autoconfigbackup.inc
new file mode 100644
index 00000000..c1fd11c4
--- /dev/null
+++ b/packages/autoconfigbackup/autoconfigbackup.inc
@@ -0,0 +1,36 @@
+<?php
+/* $Id$ */
+/*
+    autoconfigbackup.inc
+    Copyright (C) 2008 Scott Ullrich
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/* ensures patches match */
+function custom_php_validation_command($post, $input_errors) {
+	global $_POST;
+	if($post['password'] <> $post['passwordagain']) 
+		$input_errors[] = "Sorry, the entered passwords do not match.";
+}
+
+?>
\ No newline at end of file
diff --git a/packages/autoconfigbackup/autoconfigbackup.xml b/packages/autoconfigbackup/autoconfigbackup.xml
index 57d24f5d..1f3a8231 100644
--- a/packages/autoconfigbackup/autoconfigbackup.xml
+++ b/packages/autoconfigbackup/autoconfigbackup.xml
@@ -39,10 +39,11 @@
 	<name>autoconfigbackup</name>
 	<version>1.0</version>
 	<title>Diagnostics: Auto Configuration Backup</title>
-        <savetext>Change</savetext>
+	<savetext>Change</savetext>
+	<includefile>/usr/local/pkg/autoconfigbackup.inc</includefile>
 	<aftersaveredirect>pkg_edit.php?xml=autoconfigbackup.xml&amp;id=0</aftersaveredirect>
 	<menu>
-		<name>autoconfigbackup Settings</name>
+		<name>AutoConfigBackup</name>
 		<tooltiptext>Set autoconfigbackup settings such as password and port.</tooltiptext>
 		<section>Diagnostics</section>
 		<url>/pkg_edit.php?xml=autoconfigbackup.xml&amp;id=0</url>
@@ -57,9 +58,14 @@
 	    <chmod>0755</chmod>
 		<item>http://www.pfsense.com/packages/config/autoconfigbackup/autoconfigbackup.php</item>
 	</additional_files_needed>
+	<additional_files_needed>
+	    <prefix>/usr/local/pkg/</prefix>
+	    <chmod>0755</chmod>
+		<item>http://www.pfsense.com/packages/config/autoconfigbackup/autoconfigbackup.inc</item>
+	</additional_files_needed>
 	<tabs>
 		<tab>
-			<text>autoconfigbackup Settings</text>
+			<text>Settings</text>
 			<url>/pkg_edit.php?xml=autoconfigbackup.xml&amp;id=0</url>
 			<active/>
 		</tab>
@@ -70,28 +76,31 @@
 	</tabs>
 	<fields>
 		<field>
-			<fielddescr>autoconfigbackup Subscription Username</fielddescr>
-			<fieldname>input</fieldname>
-			<description>Enter the username for the Automatic Configuration Backup Web GUI.  Minimum 5 characters.</description>
-			<type>password</type>
+			<fielddescr>Subscription Username</fielddescr>
+			<fieldname>username</fieldname>
+			<description>Enter the username for the Automatic Configuration Backup Web GUI.  Minimum 6 characters.</description>
+			<type>intput</type>
 		</field>
 		<field>
-			<fielddescr>autoconfigbackup Subscription Password</fielddescr>
+			<fielddescr>Subscription Password</fielddescr>
 			<fieldname>password</fieldname>
-			<description>Enter the password for the Automatic Configuration Backup Web GUI.  Minimum 5 characters.</description>
+			<description>Enter the password for the Automatic Configuration Backup Web GUI.  Minimum 6 characters.</description>
 			<type>password</type>
 		</field>
 		<field>
-			<fielddescr>autoconfigbackup Password AGAIN</fielddescr>
+			<fielddescr>Enter Password again</fielddescr>
 			<fieldname>passwordagain</fieldname>
 			<type>password</type>
 		</field>
 		<field>
-			<fielddescr>Encryption password</fielddescr>
+			<fielddescr>Encryption Password</fielddescr>
 			<fieldname>crypto_password</fieldname>
 			<type>password</type>
 		</field>
     </fields>
+	<custom_php_validation_command>
+		custom_php_validation_command($_POST, &amp;$input_errors);
+	</custom_php_validation_command>
 	<custom_php_global_functions>
 	</custom_php_global_functions>
 	<custom_add_php_command>
@@ -102,4 +111,4 @@
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
 	</custom_php_deinstall_command>
-</packagegui>
+</packagegui>
\ No newline at end of file
diff --git a/packages/autoconfigbackup/upload_config_filter.php b/packages/autoconfigbackup/upload_config_filter.php
index 876bc51f..2362d314 100644
--- a/packages/autoconfigbackup/upload_config_filter.php
+++ b/packages/autoconfigbackup/upload_config_filter.php
@@ -10,7 +10,6 @@
  *
  */
 
-
 $last_backup_date 	= $config['system']['lastpfSbackup'];
 $last_config_change = $config['revision']['time'];