tinc - pfSense 2.2.x fixes, code style and improvements

- Fix copyright header
- Nuke unused tags
- Add input validation

1 files changed, 64 insertions, 57 deletions

diff --git a/config/tinc/tinc_hosts.xml b/config/tinc/tinc_hosts.xml
index 7741b7be..f210f23a 100644
--- a/config/tinc/tinc_hosts.xml
+++ b/config/tinc/tinc_hosts.xml
@@ -1,57 +1,54 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE packagegui SYSTEM "./schema/packages.dtd">
-<?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-        <copyright>
-        <![CDATA[
+	<copyright>
+<![CDATA[
 /* $Id$ */
-/* ========================================================================== */
+/* ====================================================================================== */
 /*
-    tinc_hosts.xml
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2007-2009 Scott Ullrich
-    All rights reserved.
-                                                                              */
-/* ========================================================================== */
+	tinc_hosts.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2012-2015 ESF, LLC
+	All rights reserved.
+*/
+/* ====================================================================================== */
 /*
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
+	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.
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
 
-    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.
-                                                                              */
-/* ========================================================================== */
-        ]]>
-        </copyright>
-    <description>tinc Hosts</description>
-    <requirements></requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
+	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.
+*/
+/* ====================================================================================== */
+	]]>
+	</copyright>
 	<name>tinchosts</name>
-	<version>1.0.19</version>
+	<version>1.2.2</version>
 	<title>VPN: tinc - Hosts</title>
-	<!-- configpath gets expanded out automatically and config items will be
-         stored in that location -->
+	<include_file>/usr/local/pkg/tinc.inc</include_file>
 	<configpath>['installedpackages']['package']['$packagename']['config']</configpath>
-
 	<tabs>
 		<tab>
 			<text>Config</text>
-			<url>/pkg_edit.php?xml=tinc_config.xml</url>
+			<url>/pkg_edit.php?xml=tinc.xml</url>
 		</tab>
 		<tab>
 			<text>Hosts</text>
@@ -60,9 +57,6 @@
 		</tab>
 	</tabs>
 	<advanced_options>enabled</advanced_options>
-
-	<!-- adddeleteeditpagefields items will appear on the first page where you can add / delete or edit
-         items.  An example of this would be the nat page where you add new nat redirects -->
 	<adddeleteeditpagefields>
 		<columnitem>
 			<fielddescr>Name</fielddescr>
@@ -83,20 +77,20 @@
 		</columnitem>
 
 	</adddeleteeditpagefields>
-	<!-- fields gets invoked when the user adds or edits a item.   the following items
-         will be parsed and rendered for the user as a gui with input, and selectboxes. -->
 	<fields>
 		<field>
 			<fielddescr>Name</fielddescr>
 			<fieldname>name</fieldname>
 			<description>Name of this host.</description>
 			<type>input</type>
+			<required/>
 		</field>
 		<field>
 			<fielddescr>Address</fielddescr>
 			<fieldname>address</fieldname>
 			<description>IP address or hostname of server.</description>
 			<type>input</type>
+			<required/>
 		</field>
 		<field>
 			<fielddescr>Subnet</fielddescr>
@@ -104,6 +98,7 @@
 			<description>Subnet behind host (like 192.168.254.0/24)</description>
 			<type>input</type>
 			<size>50</size>
+			<required/>
 		</field>
 		<field>
 			<fielddescr>Connect at Startup</fielddescr>
@@ -114,7 +109,11 @@
 		<field>
 			<fielddescr>RSA public key</fielddescr>
 			<fieldname>cert_pub</fieldname>
-			<description>RSA public key used for this host. Include the BEGIN and END lines.&lt;br&gt;</description>
+			<description>
+				<![CDATA[
+				RSA public key used for this host. <strong>Include the BEGIN and END lines.</strong><br />
+				]]>
+			</description>
 			<type>textarea</type>
 			<encoding>base64</encoding>
 			<rows>7</rows>
@@ -123,7 +122,11 @@
 		<field>
 			<fielddescr>Extra Parameters</fielddescr>
 			<fieldname>extra</fieldname>
-			<description>Anything entered here will be added just prior to the public certiciate in the host configuration file. &lt;br&gt;</description>
+			<description>
+				<![CDATA[
+				Anything entered here will be added just prior to the public certiciate in the host configuration file.<br />
+				]]>
+			</description>
 			<type>textarea</type>
 			<encoding>base64</encoding>
 			<rows>8</rows>
@@ -133,7 +136,11 @@
 		<field>
 			<fielddescr>Host Up Script</fielddescr>
 			<fieldname>host_up</fieldname>
-			<description>This script will be run when this host becomes reachable. &lt;br&gt;</description>
+			<description>
+				<![CDATA[
+				This script will be run when this host becomes reachable.<br />
+				]]>
+			</description>
 			<type>textarea</type>
 			<encoding>base64</encoding>
 			<rows>8</rows>
@@ -143,25 +150,25 @@
 		<field>
 			<fielddescr>Host Down Script</fielddescr>
 			<fieldname>host_down</fieldname>
-			<description>This script will be run when this host becomes unreachable. &lt;br&gt;</description>
+			<description>
+				<![CDATA[
+				This script will be run when this host becomes unreachable.<br />
+				]]>
+			</description>
 			<type>textarea</type>
 			<encoding>base64</encoding>
 			<rows>8</rows>
 			<cols>65</cols>
 			<advancedfield/>
 		</field>
-	</fields>	
-	<include_file>/usr/local/pkg/tinc.inc</include_file>
-	<custom_add_php_command>
-	</custom_add_php_command>
+	</fields>
 	<custom_php_resync_config_command>
 		tinc_save();
 	</custom_php_resync_config_command>
-	<custom_php_command_before_form>
-	</custom_php_command_before_form>
-	<custom_php_after_form_command>
-	</custom_php_after_form_command>
 	<custom_delete_php_command>
 		tinc_save();
 	</custom_delete_php_command>
+	<custom_php_validation_command>
+		tinc_validate_input($_POST, $input_errors);
+	</custom_php_validation_command>
 </packagegui>