mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix checkes for nested aliases containing FQDNs on static routes. It fixes #2941

Browse Source
This commit is contained in:
Renato Botelho 2013-08-14 08:05:54 -03:00
parent 4262641880
commit 90bc28cc9d
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr/local/www/system_routes_edit.php
View File

@ -128,23 +128,18 @@ if ($_POST) {
} elseif (is_alias($_POST['network'])) {
$osn = $_POST['network'];
$fqdn_found = 0;
foreach (preg_split('/\s+/', $aliastable[$osn]) as $tgt) {
if (!is_ipaddr($tgt)) {
if ($fqdn_found === 0) {
$input_errors[] = sprintf(gettext("The alias (%s) has one or more FQDNs configured and cannot be used to configure a static route."), $_POST['network']);
$fqdn_found = 1;
}
continue;
}
foreach (filter_expand_alias_array($osn, true) as $tgt) {
if (is_ipaddrv4($tgt))
$tgt .= "/32";
if (is_ipaddrv6($tgt))
$tgt .= "/128";
if (!is_subnet($tgt))
continue;
if (!is_subnetv6($tgt))
continue;
$new_targets[] = $tgt;
if (is_fqdn($tgt)) {
$input_errors[] = sprintf(gettext("The alias (%s) has one or more FQDNs configured and cannot be used to configure a static route."), $_POST['network']);
$fqdn_found = 1;
break;
}
if (is_subnet($tgt))
$new_targets[] = $tgt;
}
}
if (!isset($id))