Add an 'arp' scan type to nmap, also add a source interface selection, and do some input validation as well.

2 files changed, 132 insertions, 71 deletions

diff --git a/config/nmap/nmap.inc b/config/nmap/nmap.inc
index a2c0f8cf..552ad01c 100644
--- a/config/nmap/nmap.inc
+++ b/config/nmap/nmap.inc
@@ -28,6 +28,24 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+function nmap_custom_php_validation_command($post, $input_errors) {
+	global $_POST, $savemsg, $config;
+	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']))) {
+		$input_errors[] = gettext("You must enter a valid IP address to scan.");
+	}
+
+	if(!empty($_POST['interface'])) {
+		$interfaces = get_configured_interface_with_descr();
+		if (!array_key_exists($_POST['interface'], $interfaces)) {
+			$input_errors[] = gettext("Invalid interface.");
+		}
+	}
+}
+
 function nmap_custom_add_php_command() {
 	$nmap_options = "";
 
@@ -48,14 +66,44 @@ function nmap_custom_add_php_command() {
 		case 'udp':
 			$nmap_options .= " -sU";
 			break;
+		case 'arp':
+			$nmap_options .= " -sP -PR";
+			break;
 	}
-	
+
 	if($_POST['noping']) $nmap_options .= " -P0";
 	if($_POST['servicever']) $nmap_options .= " -sV";
 	if($_POST['osdetect']) $nmap_options .= " -O";
+	if(!empty($_POST['interface'])) $nmap_options .= " -e " . get_real_interface($_POST['interface']);
 
 	$nmap_options .= " " . escapeshellarg($_POST['hostname']);
+	echo "Running: /usr/local/bin/nmap {$nmap_options}</br>";
 	system("/usr/local/bin/nmap" . $nmap_options);
 }
 
+function nmap_get_interfaces() {
+	global $config;
+	$interfaces = get_configured_interface_with_descr();
+	$nmap_ifs = array(array("name" => "Any", "value" => ""));
+	foreach ($interfaces as $iface => $ifacename) {
+		$tmp["name"]  = $ifacename;
+		$tmp["value"] = $iface;
+		$nmap_ifs[] = $tmp;
+	}
+
+	foreach (array('server', 'client') as $mode) {
+		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["value"] = 'ovpn' . substr($mode, 0, 1) . $setting['vpnid'];
+					$nmap_ifs[] = $tmp;
+				}
+			}
+		}
+	}
+
+	return $nmap_ifs;
+}
+
 ?>
diff --git a/config/nmap/nmap.xml b/config/nmap/nmap.xml
index 7f290ade..71eb21ef 100644
--- a/config/nmap/nmap.xml
+++ b/config/nmap/nmap.xml
@@ -2,56 +2,56 @@
 <!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-        <copyright>
-        <![CDATA[
+	<copyright>
+	<![CDATA[
 /* $Id$ */
 /* ========================================================================== */
 /*
-    authng.xml
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2007 to whom it may belong
-    All rights reserved.
+	authng.xml
+	part of pfSense (http://www.pfSense.com)
+	Copyright (C) 2007 to whom it may belong
+	All rights reserved.
 
-    Based on m0n0wall (http://m0n0.ch/wall)
-    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
-    All rights reserved.
-                                                                              */
+	Based on m0n0wall (http://m0n0.ch/wall)
+	Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
+	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.
+	 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.
+	 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.
-                                                                              */
+	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>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
+]]>
+	</copyright>
+	<description>Describe your package here</description>
+	<requirements>Describe your package requirements here</requirements>
+	<faq>Currently there are no FAQ items provided.</faq>
 	<name>nmap</name>
-	<version>4.76</version>
+	<version>6.01</version>
 	<title>Diagnostics: NMap</title>
 	<savetext>Scan</savetext>
 	<preoutput>yes</preoutput>
 	<donotsave>true</donotsave>
-    <include_file>/usr/local/pkg/nmap.inc</include_file>
+	<include_file>/usr/local/pkg/nmap.inc</include_file>
 	<!-- Menu is where this packages menu will appear -->
 	<menu>
 		<name>NMap</name>
@@ -66,47 +66,60 @@
 	</additional_files_needed>
 	<fields>
 		<field>
-                    <fielddescr>IP or Hostname</fielddescr>
-                    <fieldname>hostname</fieldname>
-                    <description>Enter the IP address or hostname that you would like to scan.</description>
-                    <type>input</type>
+			<fielddescr>IP or Hostname</fielddescr>
+			<fieldname>hostname</fieldname>
+			<description>Enter the IP address or hostname that you would like to scan.</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Interface</fielddescr>
+			<fieldname>interface</fieldname>
+			<description>Enter the source interface here.</description>
+			<type>select_source</type>
+			<source><![CDATA[nmap_get_interfaces()]]></source>
+			<source_name>name</source_name>
+			<source_value>value</source_value>
 		</field>
 		<field>
 			<fielddescr>Scan Method</fielddescr>
 			<fieldname>scanmethod</fieldname>
-                        <type>select</type>
-                        <default_value>syn</default_value>
-                        <options>
-                                <option><name>SYN</name><value>syn</value></option>
-                                <option><name>TCP connect()</name><value>connect</value></option>
-                                <option><name>Ping</name><value>icmp</value></option>
-                                <option><name>UDP</name><value>udp</value></option>
-                        </options>
-						<typehint>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 contecx 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>
-                    <type>checkbox</type>
-                    <typehint>Do not try to ping hosts at all before scanning them.</typehint>
-                </field>
+			<type>select</type>
+			<default_value>syn</default_value>
+			<options>
+				<option><name>SYN</name><value>syn</value></option>
+				<option><name>TCP connect()</name><value>connect</value></option>
+				<option><name>Ping</name><value>icmp</value></option>
+				<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>
+		</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 contecx 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>
+			<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>
-		    <type>checkbox</type>
-		    <typehint>Try to identify service versions</typehint>
+			<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>
+			<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>
-		    <type>checkbox</type>
-		    <typehint>Turn on OS detection</typehint>
+			<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>
+			<type>checkbox</type>
+			<typehint>Turn on OS detection</typehint>
 		</field>
-        </fields>
-        <custom_add_php_command>
-			nmap_custom_add_php_command();
-        </custom_add_php_command>
+	</fields>
+	<custom_add_php_command>
+		nmap_custom_add_php_command();
+	</custom_add_php_command>
+	<custom_php_validation_command>
+		nmap_custom_php_validation_command($_POST, &amp;$input_errors);
+	</custom_php_validation_command>
 </packagegui>