Merge pull request #1170 from doktornotor/patch-1

6 files changed, 89 insertions, 22 deletions

diff --git a/config/nmap/nmap.inc b/config/nmap/nmap.inc
index cbf1b15a..45a87d64 100644
--- a/config/nmap/nmap.inc
+++ b/config/nmap/nmap.inc
@@ -27,10 +27,12 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+require_once("pkg-utils.inc");
+require_once("util.inc");
 
 function nmap_install() {
 	$destination_file = "/usr/local/share/nmap/nmap-mac-prefixes";
-	$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
+	$pfs_version = substr(trim(file_get_contents("/etc/version")), 0, 3);
 	switch ($pfs_version) {
 		case "2.1":
 			$source_file = "/usr/pbi/nmap-" . php_uname("m") . "/share/nmap/nmap-mac-prefixes";
@@ -48,17 +50,23 @@ function nmap_install() {
 	}
 }
 
+function nmap_deinstall() {
+	$destination_file = "/usr/local/share/nmap/nmap-mac-prefixes";
+	if (is_link($destination_file)) {
+		@unlink($destination_file);
+	}
+}
+	 
 function nmap_custom_php_validation_command($post, &$input_errors) {
-	global $_POST, $savemsg, $config;
-	if (empty($_POST['hostname'])) {
+	if (empty($post['hostname'])) {
 		$input_errors[] = gettext("You must enter an IP address to scan.");
-	} elseif (!(is_ipaddr($_POST['hostname']) || is_subnet($_POST['hostname']) || is_hostname($_POST['hostname']))) {
+	} elseif (!(is_ipaddr($post['hostname']) || is_subnet($post['hostname']) || is_hostname($post['hostname']))) {
 		$input_errors[] = gettext("You must enter a valid IP address to scan.");
 	}
 
-	if(!empty($_POST['interface'])) {
+	if(!empty($post['interface'])) {
 		$interfaces = get_configured_interface_with_descr();
-		if (!array_key_exists($_POST['interface'], $interfaces)) {
+		if (!array_key_exists($post['interface'], $interfaces)) {
 			$input_errors[] = gettext("Invalid interface.");
 		}
 	}
@@ -122,7 +130,7 @@ function nmap_get_interfaces() {
 		if (is_array($config['openvpn']["openvpn-{$mode}"])) {
 			foreach ($config['openvpn']["openvpn-{$mode}"] as $id => $setting) {
 				if (!isset($setting['disable'])) {
-					$tmp["name"]  = gettext("OpenVPN") . " ".$mode.": ".htmlspecialchars($setting['description']);
+					$tmp["name"]  = gettext("OpenVPN") . " " . $mode . ": " . htmlspecialchars($setting['description']);
 					$tmp["value"] = 'ovpn' . substr($mode, 0, 1) . $setting['vpnid'];
 					$nmap_ifs[] = $tmp;
 				}
diff --git a/config/nmap/nmap.priv.inc b/config/nmap/nmap.priv.inc
new file mode 100644
index 00000000..131d6d99
--- /dev/null
+++ b/config/nmap/nmap.priv.inc
@@ -0,0 +1,37 @@
+<?php
+/*
+	nmap.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-nmap'] = array();
+$priv_list['page-diagnostics-nmap']['name'] = "WebCfg - Diagnostics: nmap package";
+$priv_list['page-diagnostics-nmap']['descr'] = "Allow access to nmap package GUI";
+$priv_list['page-diagnostics-nmap']['match'] = array();
+$priv_list['page-diagnostics-nmap']['match'][] = "pkg_edit.php?xml=nmap.xml*";
+
+?>
diff --git a/config/nmap/nmap.xml b/config/nmap/nmap.xml
index 446ba461..665b40e9 100644
--- a/config/nmap/nmap.xml
+++ b/config/nmap/nmap.xml
@@ -42,7 +42,7 @@
 ]]>
 	</copyright>
 	<name>nmap</name>
-	<version>1.4</version>
+	<version>1.4.1</version>
 	<title>Diagnostics: NMap</title>
 	<savetext>Scan</savetext>
 	<preoutput>yes</preoutput>
@@ -50,7 +50,6 @@
 	<include_file>/usr/local/pkg/nmap.inc</include_file>
 	<menu>
 		<name>NMap</name>
-		<tooltiptext>NMap is a utility for network exploration or security auditing. It supports ping scanning (determine which hosts are up), many port scanning techniques (determine what services the hosts are offering), version detection (determine what application/service is runing on a port), and TCP/IP fingerprinting (remote host OS or device identification). It also offers flexible target and port specification, decoy/stealth scanning, SunRPC scanning, and more. Most Unix and Windows platforms are supported in both GUI and command line modes. Several popular handheld devices are also supported, including the Sharp Zaurus and the iPAQ.</tooltiptext>
 		<section>Diagnostics</section>
 		<configfile>nmap.xml</configfile>
 	</menu>
@@ -58,6 +57,10 @@
 		<prefix>/usr/local/pkg/</prefix>
 		<item>https://packages.pfsense.org/packages/config/nmap/nmap.inc</item>
 	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/etc/inc/priv/</prefix>
+		<item>https://packages.pfsense.org/packages/config/nmap/nmap.priv.inc</item>
+	</additional_files_needed>
 	<fields>
 		<field>
 			<fielddescr>IP or Hostname</fielddescr>
@@ -68,7 +71,7 @@
 		<field>
 			<fielddescr>Interface</fielddescr>
 			<fieldname>interface</fieldname>
-			<description>Enter the source interface here.</description>
+			<description>Select the source interface here.</description>
 			<type>select_source</type>
 			<source><![CDATA[nmap_get_interfaces()]]></source>
 			<source_name>name</source_name>
@@ -86,28 +89,44 @@
 				<option><name>UDP</name><value>udp</value></option>
 				<option><name>ARP (directly connected networks only!)</name><value>arp</value></option>
 			</options>
-			<typehint>Scan method</typehint>
+			<typehint>Select scan method.</typehint>
 		</field>
 		<field>
 			<fielddescr>-P0</fielddescr>
 			<fieldname>noping</fieldname>
-			<description>This allows the scanning of networks that don't allow ICMP echo requests (or responses) through their firewall. microsoft.com is an example of such a network, and thus you should always use -P0 or -PT80 when port scanning microsoft.com. Note the "ping" in this context may involve more than the traditional ICMP echo request packet. Nmap supports many such probes, including arbitrary combinations of TCP, UDP, and ICMP probes. By default, Nmap sends an ICMP echo request and a TCP ACK packet to port 80.</description>
+			<description>
+				<![CDATA[
+				Do not try to ping hosts at all before scanning them. This allows the scanning of networks that don't allow ICMP echo requests (or responses) through their firewall.<br/>
+				microsoft.com is an example of such a network, and thus you should always use -P0 or -PT80 when port scanning microsoft.com.<br/>
+				Note the "ping" in this context may involve more than the traditional ICMP echo request packet. Nmap supports many such probes, including arbitrary combinations of TCP, UDP, and ICMP probes.<br/>
+				By default, Nmap sends an ICMP echo request and a TCP ACK packet to port 80.
+				]]>
+			</description>
 			<type>checkbox</type>
-			<typehint>Do not try to ping hosts at all before scanning them.</typehint>
 		</field>
 		<field>
 			<fielddescr>-sV</fielddescr>
 			<fieldname>servicever</fieldname>
-			<description>After TCP and/or UDP ports are discovered using one of the other scan methods, version detection communicates with those ports to try and determine more about what is actually running. A file called nmap-service-probes is used to determine the best probes for detecting various services and the match strings to expect. Nmap tries to determine the service protocol (e.g. ftp, ssh, telnet, http), the application name (e.g. ISC Bind, Apache httpd, Solaris telnetd), the version number, and sometimes miscellaneous details like whether an X server is open to connections or the SSH protocol version).</description>
+			<description>
+				<![CDATA[
+				Try to identify service versions. After TCP and/or UDP ports are discovered using one of the other scan methods, version detection communicates with those ports to try and determine more about what is actually running.<br/>
+				A file called nmap-service-probes is used to determine the best probes for detecting various services and the match strings to expect.<br/>
+				Nmap tries to determine the service protocol (e.g. ftp, ssh, telnet, http), the application name (e.g. ISC Bind, Apache httpd, Solaris telnetd), the version number, and sometimes miscellaneous details like whether an X server is open to connections or the SSH protocol version).
+				]]>
+			</description>
 			<type>checkbox</type>
-			<typehint>Try to identify service versions.</typehint>
 		</field>
 		<field>
 			<fielddescr>-O</fielddescr>
 			<fieldname>osdetect</fieldname>
-			<description>This option activates remote host identification via TCP/IP fingerprinting. In other words, it uses a bunch of techniques to detect subtleties in the underlying operating system network stack of the computers you are scanning. It uses this information to create a "fingerprint" which it compares with its database of known OS fingerprints (the nmap-os-fingerprints file) to decide what type of system you are scanning.</description>
+			<description>
+				<![CDATA[
+				Turn on OS detection. This option activates remote host identification via TCP/IP fingerprinting.<br/>
+				In other words, it uses a bunch of techniques to detect subtleties in the underlying operating system network stack of the computers you are scanning.<br/>
+				It uses this information to create a "fingerprint" which it compares with its database of known OS fingerprints (the nmap-os-fingerprints file) to decide what type of system you are scanning.
+				]]>
+			</description>
 			<type>checkbox</type>
-			<typehint>Turn on OS detection.</typehint>
 		</field>
 	</fields>
 	<custom_add_php_command>
@@ -119,4 +138,7 @@
 	<custom_php_install_command>
 		nmap_install();
 	</custom_php_install_command>
+	<custom_php_deinstall_command>
+		nmap_deinstall();
+	</custom_php_deinstall_command>
 </packagegui>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 112898cc..bad12f6c 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -809,7 +809,7 @@
 		<category>Security</category>
 		<depends_on_package_pbi>nmap-6.47-##ARCH##.pbi</depends_on_package_pbi>
 		<config_file>https://packages.pfsense.org/packages/config/nmap/nmap.xml</config_file>
-		<version>1.4</version>
+		<version>1.4.1</version>
 		<status>RELEASE</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Nmap_package</pkginfolink>
 		<required_version>2.2</required_version>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index a981d5c5..12352ac4 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -848,10 +848,10 @@
 		<depends_on_package>nmap-6.25_1.tbz</depends_on_package>
 		<depends_on_package_pbi>nmap-6.40_2-i386.pbi</depends_on_package_pbi>
 		<config_file>https://packages.pfsense.org/packages/config/nmap/nmap.xml</config_file>
-		<version>nmap-6.40_2 pkg v1.3</version>
+		<version>6.40_2 pkg v1.4.1</version>
 		<status>Stable</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Nmap_package</pkginfolink>
-		<required_version>2.0</required_version>
+		<required_version>2.1</required_version>
 		<configurationfile>nmap.xml</configurationfile>
 		<build_port_path>/usr/ports/security/nmap</build_port_path>
 		<depends_on_package>libpcap-1.2.1.tbz</depends_on_package>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 1f7fb8e4..701c6bd4 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -835,10 +835,10 @@
 		<depends_on_package>nmap-6.25_1.tbz</depends_on_package>
 		<depends_on_package_pbi>nmap-6.40_2-amd64.pbi</depends_on_package_pbi>
 		<config_file>https://packages.pfsense.org/packages/config/nmap/nmap.xml</config_file>
-		<version>nmap-6.40_2 pkg v1.3</version>
+		<version>6.40_2 pkg v1.4.1</version>
 		<status>Stable</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Nmap_package</pkginfolink>
-		<required_version>2.0</required_version>
+		<required_version>2.1</required_version>
 		<configurationfile>nmap.xml</configurationfile>
 		<build_port_path>/usr/ports/security/nmap</build_port_path>
 		<depends_on_package>libpcap-1.2.1.tbz</depends_on_package>