diff options
| author | NewEraCracker <neweracracker@gmail.com> | 2016-03-18 16:22:51 +0000 |
|---|---|---|
| committer | NewEraCracker <neweracracker@gmail.com> | 2016-06-15 09:11:23 +0100 |
| commit | 6a53de6f7e4d94a67bfdc482f347a475ef1b747f (patch) | |
| tree | 32970299c83f77523c5ced2baf30de71f7c964d5 | |
| parent | f68dc9f497b7002ff5a7ab7f8aa9abcb8049b6d6 (diff) | |
| download | pfsense-6a53de6f7e4d94a67bfdc482f347a475ef1b747f.zip pfsense-6a53de6f7e4d94a67bfdc482f347a475ef1b747f.tar.gz | |
Fix Redmine #6011
This will add linklocal fallback where no IPv6 is otherwise configured to allow login using this IPs
| -rw-r--r-- | src/etc/inc/auth.inc | 3 | ||||
| -rw-r--r-- | src/etc/inc/interfaces.inc | 4 | ||||
| -rw-r--r-- | src/etc/inc/util.inc | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc index bb42ca2..36cc151 100644 --- a/src/etc/inc/auth.inc +++ b/src/etc/inc/auth.inc @@ -205,8 +205,9 @@ if (function_exists("display_error_form") && !isset($config['system']['webgui'][ break; } } - $interface_list_ipv6s = get_configured_ipv6_addresses(); + $interface_list_ipv6s = get_configured_ipv6_addresses(true); foreach ($interface_list_ipv6s as $ilipv6s) { + $ilipv6s = explode('%', $ilipv6s)[0]; if (strcasecmp($referrer_host, $ilipv6s) == 0) { $found_host = true; break; diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 0d1edb1..3133ebf 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -5376,7 +5376,7 @@ function get_interface_ip($interface = "wan") { } } -function get_interface_ipv6($interface = "wan", $flush = false) { +function get_interface_ipv6($interface = "wan", $flush = false, $linklocal_fallback = false) { global $config; if (substr($interface, 0, 4) == '_vip') { @@ -5425,7 +5425,7 @@ function get_interface_ipv6($interface = "wan", $flush = false) { * NOTE: On the case when only the prefix is requested, * the communication on WAN will be done over link-local. */ - if (is_array($config['interfaces'][$interface]) && isset($config['interfaces'][$interface]['dhcp6prefixonly'])) { + if ($linklocal_fallback || (is_array($config['interfaces'][$interface]) && isset($config['interfaces'][$interface]['dhcp6prefixonly']))) { $curip = find_interface_ipv6_ll($realif, $flush); if ($curip && is_ipaddrv6($curip) && ($curip != "::")) { return $curip; diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index 171483e..582c039 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -1469,13 +1469,13 @@ function get_configured_ip_addresses() { * IPv6 addresses. * */ -function get_configured_ipv6_addresses() { +function get_configured_ipv6_addresses($linklocal_fallback = false) { require_once("interfaces.inc"); $ipv6_array = array(); $interfaces = get_configured_interface_list(); if (is_array($interfaces)) { foreach ($interfaces as $int) { - $ipaddrv6 = get_interface_ipv6($int); + $ipaddrv6 = get_interface_ipv6($int, false, $linklocal_fallback); $ipv6_array[$int] = $ipaddrv6; } } |
