vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 15:39:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Code cleanup of old captive portal functions

Browse source
This commit is contained in:
Simone Mainardi 2018-10-19 16:46:12 +02:00
parent e916e61742
commit a75a6c6212
2 changed files with 3 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

52
scripts/lua/modules/lua_utils.lua
View file

@ -3163,58 +3163,6 @@ function isBridgeInterface(ifstats)
return ifstats.inline
end
-- Returns true if the captive portal can be started with the current configuration
function isCaptivePortalSupported(ifstats, prefs, skip_interface_check)
if not ntop.isEnterprise() and not ntop.isnEdge() then
return false
end
local is_bridge_iface
if not skip_interface_check then
local ifstats = ifstats or interface.getStats()
is_bridge_iface = isBridgeInterface(ifstats)
else
is_bridge_iface = true
end
local prefs = prefs or ntop.getPrefs()
return is_bridge_iface and (prefs["http.port"] ~= 80)
end
-- Returns true if the captive portal is active right now
function isCaptivePortalActive(ifstats, prefs)
if not ntop.isEnterprise() then
return false
end
local ifstats = ifstats or interface.getStats()
local prefs = prefs or ntop.getPrefs()
local is_bridge_iface = isBridgeInterface(ifstats)
return is_bridge_iface and prefs["is_captive_portal_enabled"] and isCaptivePortalSupported(ifstats, prefs)
end
function getCaptivePortalUsers()
local keys = ntop.getKeysCache("ntopng.user.*.host_pool_id")
local users = {}
for key in pairs(keys or {}) do
local host_pool = ntop.getCache(key)
if not isEmptyString(host_pool) then
local username = split(key, "%.")[3]
users[username] = host_pool
end
end
return users
end
function getBridgeInitializedKey(ifid)
return "ntopng.prefs.iface_"..ifid..".bridge_initialized"
end
function hasSnmpDevices(ifid)
if (not ntop.isEnterprise()) or (not isAdministrator()) then
return false