Commit 92a5f77a authored by Ad Schellevis's avatar Ad Schellevis Committed by Franco Fichtner

(legacy) remove a lot of dependencies in authgui.inc by replacing the ip lookup

parent 93bfc740
...@@ -398,7 +398,6 @@ function display_login_form() ...@@ -398,7 +398,6 @@ function display_login_form()
/* Check against locally configured IP addresses, which will catch when someone /* Check against locally configured IP addresses, which will catch when someone
port forwards WebGUI access from WAN to an internal IP on the router. */ port forwards WebGUI access from WAN to an internal IP on the router. */
$FilterIflist = filter_generate_optcfg_array() ;
$local_ip = false; $local_ip = false;
if (strstr($_SERVER['HTTP_HOST'], ":")) { if (strstr($_SERVER['HTTP_HOST'], ":")) {
$http_host_port = explode(":", $_SERVER['HTTP_HOST']); $http_host_port = explode(":", $_SERVER['HTTP_HOST']);
...@@ -406,14 +405,20 @@ function display_login_form() ...@@ -406,14 +405,20 @@ function display_login_form()
} else { } else {
$http_host = $_SERVER['HTTP_HOST']; $http_host = $_SERVER['HTTP_HOST'];
} }
foreach ($FilterIflist as $iflist) {
if ($iflist['ip'] == $http_host) { // fix, local ip check was previously done using "filter_generate_optcfg_array" which basically includes alomst everything here.
// this should do the trick as well.
if (isset($config['interfaces'])) {
foreach($config['interfaces'] as $if => $ifdetail) {
if (isset($ifdetail['enable'])) {
if (isset($ifdetail['ipaddr']) && $ifdetail['ipaddr'] == $http_host) {
$local_ip = true; $local_ip = true;
} } elseif (isset($ifdetail['ipaddr6']) && $ifdetail['ipaddr6'] == $http_host) {
if ($iflist['ipv6'] == $http_host) {
$local_ip = true; $local_ip = true;
} }
} }
}
}
if (isset($config['virtualip']['vip'])) { if (isset($config['virtualip']['vip'])) {
foreach ($config['virtualip']['vip'] as $vip) { foreach ($config['virtualip']['vip'] as $vip) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment