Merge pull request #1332 from phil-davis/patch-3

6 files changed, 48 insertions, 15 deletions

diff --git a/usr/local/www/services_dhcp_edit.php b/usr/local/www/services_dhcp_edit.php
index 5ad02db..2fb7f17 100644
--- a/usr/local/www/services_dhcp_edit.php
+++ b/usr/local/www/services_dhcp_edit.php
@@ -171,7 +171,7 @@ if ($_POST) {
 		if (!is_hostname($_POST['hostname'])) {
 			$input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'.");
 		} else {
-			if (strpos($_POST['hostname'],'.')) {
+			if (!is_unqualified_hostname($_POST['hostname'])) {
 				$input_errors[] = gettext("A valid hostname is specified, but the domain name part should be omitted");
 			}
 		}
diff --git a/usr/local/www/services_dhcpv6_edit.php b/usr/local/www/services_dhcpv6_edit.php
index 6b223fc..e2e2fb1 100644
--- a/usr/local/www/services_dhcpv6_edit.php
+++ b/usr/local/www/services_dhcpv6_edit.php
@@ -123,7 +123,7 @@ if ($_POST) {
 		if (!is_hostname($_POST['hostname'])) {
 			$input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'.");
 		} else {
-			if (strpos($_POST['hostname'],'.')) {
+			if (!is_unqualified_hostname($_POST['hostname'])) {
 				$input_errors[] = gettext("A valid hostname is specified, but the domain name part should be omitted");
 			}
 		}
diff --git a/usr/local/www/services_dnsmasq_edit.php b/usr/local/www/services_dnsmasq_edit.php
index 7f6d071..dce311c 100644
--- a/usr/local/www/services_dnsmasq_edit.php
+++ b/usr/local/www/services_dnsmasq_edit.php
@@ -86,8 +86,15 @@ if ($_POST) {
 	
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 	
-	if (($_POST['host'] && !is_hostname($_POST['host']))) 
-		$input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'.");
+	if ($_POST['host']) {
+		if (!is_hostname($_POST['host'])) { 
+			$input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'. It may not start or end with '-'.");
+		} else {
+			if (!is_unqualified_hostname($_POST['host'])) {
+				$input_errors[] = gettext("A valid hostname is specified, but the domain name part should be omitted");
+			}
+		}
+	}
 
 	if (($_POST['domain'] && !is_domain($_POST['domain']))) 
 		$input_errors[] = gettext("A valid domain must be specified.");
@@ -124,8 +131,14 @@ if ($_POST) {
 
 		var_dump(array('fields' => $aliasreqdfields, 'names' => $aliasreqdfieldsn, 'alias' => $alias));
 		do_input_validation($_POST, $aliasreqdfields, $aliasreqdfieldsn, $input_errors);
-		if (($alias['host'] && !is_hostname($alias['host']))) {
-			$input_errors[] = gettext("Hostnames in alias list can only contain the characters A-Z, 0-9 and '-'.");
+		if ($alias['host']) {
+			if (!is_hostname($alias['host'])) {
+				$input_errors[] = gettext("Hostnames in an alias list can only contain the characters A-Z, 0-9 and '-'. They may not start or end with '-'.");
+			} else {
+				if (!is_unqualified_hostname($alias['host'])) {
+					$input_errors[] = gettext("A valid alias hostname is specified, but the domain name part should be omitted");
+				}
+			}
 		}
 		if (($alias['domain'] && !is_domain($alias['domain']))) {
 			$input_errors[] = gettext("A valid domain must be specified in alias list.");
diff --git a/usr/local/www/services_unbound_host_edit.php b/usr/local/www/services_unbound_host_edit.php
index 7c3db7d..5ebf9ae 100644
--- a/usr/local/www/services_unbound_host_edit.php
+++ b/usr/local/www/services_unbound_host_edit.php
@@ -1,7 +1,7 @@
 <?php 
 /* $Id$ */
 /*
-	services_unbound_edit_host.php
+	services_unbound_host_edit.php
 	part of the pfSense project (https://www.pfsense.org)
 	Copyright (C) 2014 Warren Baker (warren@decoy.co.za)
         Copyright (C) 2013-2014 Electric Sheep Fencing, LP
@@ -88,8 +88,15 @@ if ($_POST) {
 	
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 	
-	if (($_POST['host'] && !is_hostname($_POST['host']))) 
-		$input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'.");
+	if ($_POST['host']) {
+		if (!is_hostname($_POST['host'])) { 
+			$input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9, '_' and '-'. It may not start or end with '-'.");
+		} else {
+			if (!is_unqualified_hostname($_POST['host'])) {
+				$input_errors[] = gettext("A valid hostname is specified, but the domain name part should be omitted");
+			}
+		}
+	}
 
 	if (($_POST['domain'] && !is_domain($_POST['domain']))) 
 		$input_errors[] = gettext("A valid domain must be specified.");
@@ -126,8 +133,15 @@ if ($_POST) {
 
 		var_dump(array('fields' => $aliasreqdfields, 'names' => $aliasreqdfieldsn, 'alias' => $alias));
 		do_input_validation($_POST, $aliasreqdfields, $aliasreqdfieldsn, $input_errors);
-		if (($alias['host'] && !is_hostname($alias['host'])))
-			$input_errors[] = gettext("Hostnames in alias list can only contain the characters A-Z, 0-9 and '-'.");
+		if ($alias['host']) {
+			if (!is_hostname($alias['host'])) {
+				$input_errors[] = gettext("Hostnames in an alias list can only contain the characters A-Z, 0-9 and '-'. They may not start or end with '-'.");
+			} else {
+				if (!is_unqualified_hostname($alias['host'])) {
+					$input_errors[] = gettext("A valid alias hostname is specified, but the domain name part should be omitted");
+				}
+			}
+		}
 		if (($alias['domain'] && !is_domain($alias['domain'])))
 			$input_errors[] = gettext("A valid domain must be specified in alias list.");
 	}
diff --git a/usr/local/www/system.php b/usr/local/www/system.php
index 31845c2..1329e8d 100644
--- a/usr/local/www/system.php
+++ b/usr/local/www/system.php
@@ -109,8 +109,14 @@ if ($_POST) {
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
-	if ($_POST['hostname'] && !is_hostname($_POST['hostname'])) {
-		$input_errors[] = gettext("The hostname may only contain the characters a-z, 0-9 and '-'.");
+	if ($_POST['hostname']) {
+		if (!is_hostname($_POST['hostname'])) {
+			$input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'. It may not start or end with '-'.");
+		} else {
+			if (!is_unqualified_hostname($_POST['hostname'])) {
+				$input_errors[] = gettext("A valid hostname is specified, but the domain name part should be omitted");
+			}
+		}
 	}
 	if ($_POST['domain'] && !is_domain($_POST['domain'])) {
 		$input_errors[] = gettext("The domain may only contain the characters a-z, 0-9, '-' and '.'.");
diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml
index 0558250..7f56d21 100644
--- a/usr/local/www/wizards/setup_wizard.xml
+++ b/usr/local/www/wizards/setup_wizard.xml
@@ -3,7 +3,7 @@
 <copyright>
 /* $Id$ */
 /*
-	setup.xml
+	setup_wizard.xml
         part of pfSense (https://www.pfsense.org/)
 
 	Copyright (C) 2004, 2005 Scott Ullrich
@@ -121,7 +121,7 @@
 	</stepbeforeformdisplay>
 	<stepsubmitphpaction>
 		<![CDATA[
-		if(empty($_POST['hostname']) || !is_hostname($_POST['hostname'])) {
+		if(empty($_POST['hostname']) || !is_unqualified_hostname($_POST['hostname'])) {
 			print_info_box_np("Hostname is invalid. Please press back in your browser window and correct.");
 			die;
 		}