From a2f7948e8f4baacb7a631ade67c1a9a83b38ed5b Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Thu, 12 Nov 2015 15:18:57 +0100
Subject: Add privileges configuration to netio package; sanitize input

---
 config/netio/netio.xml | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/config/netio/netio.xml b/config/netio/netio.xml
index 34f188c2..0c66f5e2 100644
--- a/config/netio/netio.xml
+++ b/config/netio/netio.xml
@@ -42,16 +42,21 @@
 	]]>
         </copyright>
 	<name>netio</name>
-	<version>1.27</version>
-	<title>netio: Client</title>
+	<version>1.28</version>
+	<title>Diagnostics: netio: Client</title>
+	<savetext>Run netio client</savetext>
 	<preoutput>yes</preoutput>
 	<donotsave>true</donotsave>
 	<menu>
 		<name>netio</name>
-		<tooltiptext>Run netio in client or server mode.</tooltiptext>
 		<section>Diagnostics</section>
-		<configfile>netio.xml</configfile>
+		<url>/pkg_edit.php?xml=netio.xml</url>
 	</menu>
+	<service>
+		<name>netio</name>
+		<executable>netio</executable>
+		<description>netio Network Throughput Benchmark Server/Client</description>
+	</service>
 	<tabs>
 		<tab>
 			<text>Client</text>
@@ -64,6 +69,11 @@
 		</tab>
 	</tabs>
 	<additional_files_needed>
+		<prefix>/etc/inc/priv/</prefix>
+		<item>https://packages.pfsense.org/packages/config/netio/netio.priv.inc</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/</prefix>
 		<item>https://packages.pfsense.org/packages/config/netio/netioserver.xml</item>
 	</additional_files_needed>
 	<fields>
@@ -83,11 +93,11 @@
 	<custom_add_php_command>
 		<![CDATA[
 		mwexec("/usr/bin/killall netio");
-		$netio_options = "";
-		if ($_POST['port'] != "") {
-			$netio_options .= " -p {$_POST['port']}";
-			$netio_options .= $_POST['hostname'];
-			system("/usr/local/bin/netio " . $netio_options);
+		if ($_POST['port'] != "" && $_POST['hostname'] != "") {
+			$port = escapeshellarg($_POST['port']);
+			$hostname = escapeshellarg($_POST['hostname']);
+			$netio_options = "-p {$port} {$hostname}";
+			system("/usr/local/bin/netio {$netio_options}");
 		}
 		]]>
 	</custom_add_php_command>
-- 
cgit v1.2.3


From 07093f7775a117b989fea168ae25d329b7c3738a Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Thu, 12 Nov 2015 15:20:29 +0100
Subject: Add privileges configuration to netio package

---
 config/netio/netio.priv.inc | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 config/netio/netio.priv.inc

diff --git a/config/netio/netio.priv.inc b/config/netio/netio.priv.inc
new file mode 100644
index 00000000..f07d33dc
--- /dev/null
+++ b/config/netio/netio.priv.inc
@@ -0,0 +1,43 @@
+<?php
+/*
+	netio.priv.inc
+	part of pfSense (http://www.pfSense.org/)
+	Copyright (C) 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:
+
+	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.
+*/
+global $priv_list;
+
+$priv_list['page-diagnostics-netio-client'] = array();
+$priv_list['page-diagnostics-netio-client']['name'] = "WebCfg - Diagnostics: netio client";
+$priv_list['page-diagnostics-netio-client']['descr'] = "Allow access to netio client GUI";
+$priv_list['page-diagnostics-netio-client']['match'] = array();
+$priv_list['page-diagnostics-netio-client']['match'][] = "pkg_edit.php?xml=netio.xml*";
+
+$priv_list['page-diagnostics-netio-server'] = array();
+$priv_list['page-diagnostics-netio-server']['name'] = "WebCfg - Diagnostics: netio server";
+$priv_list['page-diagnostics-netio-server']['descr'] = "Allow access to netio server GUI";
+$priv_list['page-diagnostics-netio-server']['match'] = array();
+$priv_list['page-diagnostics-netio-server']['match'][] = "pkg_edit.php?xml=netioserver.xml*";
+
+?>
-- 
cgit v1.2.3


From 6819b9709afc654eaf2bad09ceaf3ddf510ee019 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Thu, 12 Nov 2015 15:21:47 +0100
Subject: Sanitize input and cleanups

---
 config/netio/netioserver.xml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/config/netio/netioserver.xml b/config/netio/netioserver.xml
index da73e902..93d53a6e 100644
--- a/config/netio/netioserver.xml
+++ b/config/netio/netioserver.xml
@@ -42,16 +42,11 @@
 	]]>
         </copyright>
 	<name>netioserver</name>
-	<version>1.27</version>
-	<title>netio: Server</title>
+	<version>1.28</version>
+	<title>Diagnostics: netio: Server</title>
+	<savetext>Run netio server</savetext>
 	<preoutput>yes</preoutput>
 	<donotsave>true</donotsave>
-	<menu>
-		<name>netio</name>
-		<tooltiptext>Run netio in client or server mode.</tooltiptext>
-		<section>Diagnostics</section>
-		<configfile>netio.xml</configfile>
-	</menu>
 	<tabs>
 		<tab>
 			<text>Client</text>
@@ -74,9 +69,9 @@
 	<custom_add_php_command>
 		<![CDATA[
 		mwexec("/usr/bin/killall netio");
-		if($_POST['port'] != "") {
-			$netioserver_options = " -p {$_POST['port']}";
-			system("/usr/local/bin/netio -s" . $netioserver_options);
+		if ($_POST['port'] != "") {
+			$port = escapeshellarg($_POST['port']);
+			system("/usr/local/bin/netio -s -p {$port}");
 		}
 		]]>
 	</custom_add_php_command>
-- 
cgit v1.2.3


From 8e22c484c6920ac92c5bffa027d56697e38ed4a9 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Thu, 12 Nov 2015 15:22:36 +0100
Subject: Bump netio package version

---
 pkg_config.10.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index e3089783..9ebdcd7c 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1029,7 +1029,7 @@
 		<category>Network Management</category>
 		<config_file>https://packages.pfsense.org/packages/config/netio/netio.xml</config_file>
 		<depends_on_package_pbi>netio-1.26-##ARCH##.pbi</depends_on_package_pbi>
-		<version>1.27</version>
+		<version>1.28</version>
 		<required_version>2.2</required_version>
 		<status>ALPHA</status>
 		<configurationfile>netio.xml</configurationfile>
-- 
cgit v1.2.3


From fa9cf9963b611b6564720d64c6743111462b6bd2 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Thu, 12 Nov 2015 15:23:22 +0100
Subject: Bump netio package version

---
 pkg_config.8.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index c4e1c8d4..8d7b8a1a 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1083,8 +1083,8 @@
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All</depends_on_package_base_url>
 		<depends_on_package>netio-1.26.tbz</depends_on_package>
 		<depends_on_package_pbi>netio-1.26-i386.pbi</depends_on_package_pbi>
-		<version>1.26</version>
-		<required_version>2.0</required_version>
+		<version>1.28</version>
+		<required_version>2.1</required_version>
 		<status>ALPHA</status>
 		<configurationfile>netio.xml</configurationfile>
 		<build_port_path>/usr/ports/benchmarks/netio</build_port_path>
-- 
cgit v1.2.3


From 376d733871dce1027e7901422bec84d9dea4d1d5 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Thu, 12 Nov 2015 15:24:09 +0100
Subject: Bump netio package version

---
 pkg_config.8.xml.amd64 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 204e1e82..c6c0b31e 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1070,8 +1070,8 @@
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All</depends_on_package_base_url>
 		<depends_on_package>netio-1.26.tbz</depends_on_package>
 		<depends_on_package_pbi>netio-1.26-amd64.pbi</depends_on_package_pbi>
-		<version>1.26</version>
-		<required_version>2.0</required_version>
+		<version>1.28</version>
+		<required_version>2.1</required_version>
 		<status>ALPHA</status>
 		<configurationfile>netio.xml</configurationfile>
 		<build_port_path>/usr/ports/benchmarks/netio</build_port_path>
-- 
cgit v1.2.3


From e9ebf58eeb1c40db9f04dcf36ccc41893fbeda33 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Thu, 12 Nov 2015 15:28:47 +0100
Subject: Add default port value

---
 config/netio/netio.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/netio/netio.xml b/config/netio/netio.xml
index 0c66f5e2..3bb079d8 100644
--- a/config/netio/netio.xml
+++ b/config/netio/netio.xml
@@ -88,6 +88,7 @@
 			<fieldname>port</fieldname>
 			<description>Enter the port that netio will connect to. (Default: 18767)</description>
 			<type>input</type>
+			<default_value>18767</default_value>
 		</field>
 	</fields>
 	<custom_add_php_command>
-- 
cgit v1.2.3


From a1d5c2f568c0cefa4b2f5117658b81cb9534df39 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Thu, 12 Nov 2015 15:29:31 +0100
Subject: Add default port value

---
 config/netio/netioserver.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/netio/netioserver.xml b/config/netio/netioserver.xml
index 93d53a6e..bbe32665 100644
--- a/config/netio/netioserver.xml
+++ b/config/netio/netioserver.xml
@@ -64,6 +64,7 @@
 			<fieldname>port</fieldname>
 			<description>Enter the port that netio will bind to. (Default: 18767)</description>
 			<type>input</type>
+			<default_value>18767</default_value>
 		</field>
 	</fields>
 	<custom_add_php_command>
-- 
cgit v1.2.3