summaryrefslogtreecommitdiffstats
path: root/usr/local/www
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2013-12-04 18:20:58 -0200
committerRenato Botelho <garga@FreeBSD.org>2013-12-04 18:21:18 -0200
commit20dda766516f943339799abc31f7c3640fff3195 (patch)
tree865cc0b19432fed27b693d21cab1088c4500b2a6 /usr/local/www
parentf51fa0d411483ac3b645c1c4cd21d54256b20ad3 (diff)
downloadpfsense-20dda766516f943339799abc31f7c3640fff3195.zip
pfsense-20dda766516f943339799abc31f7c3640fff3195.tar.gz
Prevent network or broadcast address to be set on interface (console, GUI and wizard). It should fix #3196
Diffstat (limited to 'usr/local/www')
-rwxr-xr-xusr/local/www/interfaces.php8
-rw-r--r--usr/local/www/wizards/setup_wizard.xml20
2 files changed, 25 insertions, 3 deletions
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index b8a3cf0..75fd460 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -611,6 +611,14 @@ if ($_POST['apply']) {
if (is_ipaddr_configured($_POST['ipaddr'], $if, true))
$input_errors[] = gettext("This IPv4 address is being used by another interface or VIP.");
+ /* Do not accept network or broadcast address, except if subnet is 31 or 32 */
+ if ($_POST['subnet'] < 31) {
+ if ($_POST['ipaddr'] == gen_subnet($_POST['ipaddr'], $_POST['subnet']))
+ $input_errors[] = gettext("This IPv4 address is the network address and cannot be used");
+ else if ($_POST['ipaddr'] == gen_subnet_max($_POST['ipaddr'], $_POST['subnet']))
+ $input_errors[] = gettext("This IPv4 address is the broadcast address and cannot be used");
+ }
+
foreach ($staticroutes as $route_subnet) {
list($network, $subnet) = explode("/", $route_subnet);
if ($_POST['subnet'] == $subnet && $network == gen_subnet($_POST['ipaddr'], $_POST['subnet'])) {
diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml
index db9f05d..daf32dd 100644
--- a/usr/local/www/wizards/setup_wizard.xml
+++ b/usr/local/www/wizards/setup_wizard.xml
@@ -409,9 +409,17 @@
print_info_box_np("Invalid MAC Address. Please press back in your browser window and correct.");
die;
}
- if(!empty($_POST['ipaddress']) && ($_POST['selectedtype'] == "Static") && (!is_ipaddr($_POST['ipaddress']))) {
- print_info_box_np("Invalid WAN IP Address. Please press back in your browser window and correct.");
- die;
+ if(!empty($_POST['ipaddress']) && ($_POST['selectedtype'] == "Static")) {
+ if (!is_ipaddr($_POST['ipaddress'])) {
+ print_info_box_np("Invalid WAN IP Address. Please press back in your browser window and correct.");
+ die;
+ }
+ if ($_POST['subnetmask'] < 31 &&
+ ($_POST['ipaddress'] == gen_subnet($_POST['ipaddress'], $_POST['subnetmask']) ||
+ $_POST['ipaddress'] == gen_subnet_max($_POST['ipaddress'], $_POST['subnetmask']))) {
+ print_info_box_np("Invalid WAN IP Address. Please press back in your browser window and correct.");
+ die;
+ }
}
if(!empty($_POST['dhcphostname']) && !is_hostname($_POST['dhcphostname'])) {
print_info_box_np("Invalid DHCP Hostname. Please press back in your browser window and correct.");
@@ -509,6 +517,12 @@
print_info_box_np("Invalid LAN IP Address. Please press back in your browser window and correct.");
die;
}
+ if ($_POST['subnetmask'] < 31 &&
+ ($_POST['lanipaddress'] == gen_subnet($_POST['lanipaddress'], $_POST['subnetmask']) ||
+ $_POST['lanipaddress'] == gen_subnet_max($_POST['lanipaddress'], $_POST['subnetmask']))) {
+ print_info_box_np("Invalid LAN IP Address. Please press back in your browser window and correct.");
+ die;
+ }
$ft = explode(".", $_POST['lanipaddress']);
$ft_ip = $ft[0] . "." . $ft[1] . "." . $ft[2] . ".";
$config['dhcpd']['lan']['range']['from'] = $ft_ip . "10";
OpenPOWER on IntegriCloud