mirror of
https://github.com/ntop/ntopng.git
synced 2026-05-03 09:20:10 +00:00
Indent
This commit is contained in:
Luca Deri
parent
69cf433aa5
commit
57ea103748
1 changed files with 182 additions and 182 deletions
|
|
@ -1,10 +1,10 @@
|
|||
--
|
||||
-- (C) 2020-24 - ntop.org
|
||||
-- (C) 2020-25 - ntop.org
|
||||
--
|
||||
|
||||
local dirs = ntop.getDirs()
|
||||
package.path = dirs.installdir .. "/scripts/lua/modules/?.lua;" .. package.path
|
||||
package.path = dirs.installdir .. "/scripts/lua/modules/pools/?.lua;" ..
|
||||
package.path
|
||||
package.path = dirs.installdir .. "/scripts/lua/modules/pools/?.lua;" .. package.path
|
||||
|
||||
require "ntop_utils"
|
||||
local json = require("dkjson")
|
||||
|
|
@ -16,20 +16,20 @@ local session_id_length = 32
|
|||
local redis_accounting_key = "ntopng.radius.accounting.%s"
|
||||
|
||||
local function get_first_ip(mac)
|
||||
-- Get the first ip used by the mac
|
||||
local first_host = {}
|
||||
local mac_hosts = interface.getMacHosts(mac) or {}
|
||||
if table.len(mac_hosts) > 0 then
|
||||
for _, h in pairsByKeys(mac_hosts, asc) do
|
||||
first_host = h
|
||||
break
|
||||
end
|
||||
end
|
||||
-- Get the first ip used by the mac
|
||||
local first_host = {}
|
||||
local mac_hosts = interface.getMacHosts(mac) or {}
|
||||
if table.len(mac_hosts) > 0 then
|
||||
for _, h in pairsByKeys(mac_hosts, asc) do
|
||||
first_host = h
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
local ip_address = first_host["ip"]
|
||||
if isEmptyString(ip_address) then ip_address = nil end
|
||||
local ip_address = first_host["ip"]
|
||||
if isEmptyString(ip_address) then ip_address = nil end
|
||||
|
||||
return ip_address
|
||||
return ip_address
|
||||
end
|
||||
|
||||
-- ##############################################
|
||||
|
|
@ -40,51 +40,51 @@ end
|
|||
---@param password string, used to login the account to radius
|
||||
---@return boolean, true if the accounting start went well, false otherwise
|
||||
function radius_handler.accountingStart(name, username, password)
|
||||
if not radius_handler.isAccountingEnabled() then return true end
|
||||
name = string.upper(name)
|
||||
if not radius_handler.isAccountingEnabled() then return true end
|
||||
name = string.upper(name)
|
||||
|
||||
-- Check if the user is already saved on redis
|
||||
local is_accounting_on = radius_handler.isAccountingRequested(name)
|
||||
-- Check if the user is already saved on redis
|
||||
local is_accounting_on = radius_handler.isAccountingRequested(name)
|
||||
|
||||
-- In case the info are already on redis, means that the system is restarted
|
||||
-- or the same request has been done twice, so just skip this
|
||||
if is_accounting_on then return true end
|
||||
-- In case the info are already on redis, means that the system is restarted
|
||||
-- or the same request has been done twice, so just skip this
|
||||
if is_accounting_on then return true end
|
||||
|
||||
|
||||
local session_id = tostring(math.random(100000000000000000,
|
||||
999999999999999999))
|
||||
local ip_address = get_first_ip(name)
|
||||
local current_time = os.time()
|
||||
math.randomseed(current_time)
|
||||
|
||||
traceError(TRACE_NORMAL, TRACE_CONSOLE,
|
||||
string.format(
|
||||
"Accounting start requested for MAC [%s] with username [%s][IP: %s]",
|
||||
name, username, ip_address or ""))
|
||||
local session_id = tostring(math.random(100000000000000000,
|
||||
999999999999999999))
|
||||
local ip_address = get_first_ip(name)
|
||||
local current_time = os.time()
|
||||
math.randomseed(current_time)
|
||||
|
||||
traceError(TRACE_NORMAL, TRACE_CONSOLE,
|
||||
string.format(
|
||||
"Accounting start requested for MAC [%s] with username [%s][IP: %s]",
|
||||
name, username, ip_address or ""))
|
||||
|
||||
local accounting_started =
|
||||
interface.radiusAccountingStart(username --[[ Username ]] , name --[[ MAC Address ]] ,
|
||||
session_id, ip_address --[[ First IP Address ]] ,
|
||||
current_time)
|
||||
if accounting_started then
|
||||
local key = string.format(redis_accounting_key, name)
|
||||
local user_data = {
|
||||
name = name,
|
||||
username = username,
|
||||
password = password,
|
||||
session_id = session_id,
|
||||
start_session_time = current_time,
|
||||
ip_address = ip_address,
|
||||
bytes_sent = 0,
|
||||
bytes_rcvd = 0,
|
||||
packets_sent = 0,
|
||||
packets_rcvd = 0
|
||||
}
|
||||
local accounting_started =
|
||||
interface.radiusAccountingStart(username --[[ Username ]] , name --[[ MAC Address ]] ,
|
||||
session_id, ip_address --[[ First IP Address ]] ,
|
||||
current_time)
|
||||
if accounting_started then
|
||||
local key = string.format(redis_accounting_key, name)
|
||||
local user_data = {
|
||||
name = name,
|
||||
username = username,
|
||||
password = password,
|
||||
session_id = session_id,
|
||||
start_session_time = current_time,
|
||||
ip_address = ip_address,
|
||||
bytes_sent = 0,
|
||||
bytes_rcvd = 0,
|
||||
packets_sent = 0,
|
||||
packets_rcvd = 0
|
||||
}
|
||||
|
||||
ntop.setCache(key, json.encode(user_data))
|
||||
end
|
||||
ntop.setCache(key, json.encode(user_data))
|
||||
end
|
||||
|
||||
return true
|
||||
return true
|
||||
end
|
||||
|
||||
-- ##############################################
|
||||
|
|
@ -93,62 +93,62 @@ end
|
|||
---@param name string, used to check if name is an accounting going on
|
||||
---@return boolean, true if the accounting went well, false otherwise and the stop was called
|
||||
function radius_handler.accountingStop(name, terminate_cause, info)
|
||||
if not radius_handler.isAccountingEnabled() then return true end
|
||||
name = string.upper(name)
|
||||
if not radius_handler.isAccountingEnabled() then return true end
|
||||
name = string.upper(name)
|
||||
|
||||
local _, user_data = radius_handler.isAccountingRequested(name)
|
||||
-- Removing the entry from redis
|
||||
ntop.delCache(string.format(redis_accounting_key, name))
|
||||
local _, user_data = radius_handler.isAccountingRequested(name)
|
||||
-- Removing the entry from redis
|
||||
ntop.delCache(string.format(redis_accounting_key, name))
|
||||
|
||||
traceError(TRACE_NORMAL, TRACE_CONSOLE,
|
||||
string.format("Accounting stop requested for MAC [%s]", name))
|
||||
traceError(TRACE_NORMAL, TRACE_CONSOLE,
|
||||
string.format("Accounting stop requested for MAC [%s]", name))
|
||||
|
||||
-- Check in case no user_data is found
|
||||
if user_data then
|
||||
local bytes_sent = 0
|
||||
local bytes_rcvd = 0
|
||||
local packets_sent = 0
|
||||
local packets_rcvd = 0
|
||||
local current_time = os.time()
|
||||
local ip_address = ""
|
||||
if user_data and not isEmptyString(user_data.ip_address) then
|
||||
ip_address = user_data.ip_address
|
||||
else
|
||||
ip_address = get_first_ip(name)
|
||||
if not isEmptyString(ip_address) then
|
||||
user_data.ip_address = ip_address
|
||||
end
|
||||
end
|
||||
-- Check in case no user_data is found
|
||||
if user_data then
|
||||
local bytes_sent = 0
|
||||
local bytes_rcvd = 0
|
||||
local packets_sent = 0
|
||||
local packets_rcvd = 0
|
||||
local current_time = os.time()
|
||||
local ip_address = ""
|
||||
if user_data and not isEmptyString(user_data.ip_address) then
|
||||
ip_address = user_data.ip_address
|
||||
else
|
||||
ip_address = get_first_ip(name)
|
||||
if not isEmptyString(ip_address) then
|
||||
user_data.ip_address = ip_address
|
||||
end
|
||||
end
|
||||
|
||||
bytes_sent = user_data.bytes_sent or 0
|
||||
bytes_rcvd = user_data.bytes_rcvd or 0
|
||||
packets_sent = user_data.packets_sent or 0
|
||||
packets_rcvd = user_data.packets_rcvd or 0
|
||||
bytes_sent = user_data.bytes_sent or 0
|
||||
bytes_rcvd = user_data.bytes_rcvd or 0
|
||||
packets_sent = user_data.packets_sent or 0
|
||||
packets_rcvd = user_data.packets_rcvd or 0
|
||||
|
||||
if info then
|
||||
-- These are in B, needs to be converted in KB
|
||||
if (info["bytes.sent"] or 0) > 0 then
|
||||
bytes_sent = math.floor((info["bytes.sent"] or 0) / 1024 + 0.5)
|
||||
end
|
||||
if (info["bytes.rcvd"] or 0) > 0 then
|
||||
bytes_rcvd = math.floor((info["bytes.rcvd"] or 0) / 1024 + 0.5)
|
||||
end
|
||||
if info then
|
||||
-- These are in B, needs to be converted in KB
|
||||
if (info["bytes.sent"] or 0) > 0 then
|
||||
bytes_sent = math.floor((info["bytes.sent"] or 0) / 1024 + 0.5)
|
||||
end
|
||||
if (info["bytes.rcvd"] or 0) > 0 then
|
||||
bytes_rcvd = math.floor((info["bytes.rcvd"] or 0) / 1024 + 0.5)
|
||||
end
|
||||
|
||||
if (info["packets.sent"] or 0) > 0 then
|
||||
packets_sent = info["packets.sent"] or 0
|
||||
end
|
||||
if (info["packets.rcvd"] or 0) > 0 then
|
||||
packets_rcvd = info["packets.rcvd"] or 0
|
||||
end
|
||||
end
|
||||
if (info["packets.sent"] or 0) > 0 then
|
||||
packets_sent = info["packets.sent"] or 0
|
||||
end
|
||||
if (info["packets.rcvd"] or 0) > 0 then
|
||||
packets_rcvd = info["packets.rcvd"] or 0
|
||||
end
|
||||
end
|
||||
|
||||
interface.radiusAccountingStop(user_data.username --[[ Username ]] ,
|
||||
user_data.session_id, name --[[ MAC Address]] ,
|
||||
ip_address, bytes_sent, bytes_rcvd,
|
||||
packets_sent, packets_rcvd,
|
||||
terminate_cause, current_time -
|
||||
user_data.start_session_time)
|
||||
end
|
||||
interface.radiusAccountingStop(user_data.username --[[ Username ]] ,
|
||||
user_data.session_id, name --[[ MAC Address]] ,
|
||||
ip_address, bytes_sent, bytes_rcvd,
|
||||
packets_sent, packets_rcvd,
|
||||
terminate_cause, current_time -
|
||||
user_data.start_session_time)
|
||||
end
|
||||
end
|
||||
|
||||
-- ##############################################
|
||||
|
|
@ -157,67 +157,67 @@ end
|
|||
---@param name string, used to check if name is an accounting going on
|
||||
---@return boolean, true if the accounting went well, false otherwise and the stop was called
|
||||
function radius_handler.accountingUpdate(name, info)
|
||||
if not radius_handler.isAccountingEnabled() then return true end
|
||||
name = string.upper(name)
|
||||
if not radius_handler.isAccountingEnabled() then return true end
|
||||
name = string.upper(name)
|
||||
|
||||
local is_accounting_on, user_data = radius_handler.isAccountingRequested(
|
||||
name)
|
||||
local res = true
|
||||
local is_accounting_on, user_data = radius_handler.isAccountingRequested(
|
||||
name)
|
||||
local res = true
|
||||
|
||||
if is_accounting_on and user_data then
|
||||
local key = string.format(redis_accounting_key, name)
|
||||
local ip_address
|
||||
if user_data and not isEmptyString(user_data.ip_address) then
|
||||
ip_address = user_data.ip_address
|
||||
else
|
||||
ip_address = get_first_ip(name)
|
||||
if not isEmptyString(ip_address) then
|
||||
-- Update the info with the ip_address if it's not empty
|
||||
user_data.ip_address = ip_address
|
||||
end
|
||||
end
|
||||
local current_time = os.time()
|
||||
local bytes_sent = user_data.bytes_sent or 0
|
||||
local bytes_rcvd = user_data.bytes_rcvd or 0
|
||||
local packets_sent = user_data.packets_sent or 0
|
||||
local packets_rcvd = user_data.packets_rcvd or 0
|
||||
if is_accounting_on and user_data then
|
||||
local key = string.format(redis_accounting_key, name)
|
||||
local ip_address
|
||||
if user_data and not isEmptyString(user_data.ip_address) then
|
||||
ip_address = user_data.ip_address
|
||||
else
|
||||
ip_address = get_first_ip(name)
|
||||
if not isEmptyString(ip_address) then
|
||||
-- Update the info with the ip_address if it's not empty
|
||||
user_data.ip_address = ip_address
|
||||
end
|
||||
end
|
||||
local current_time = os.time()
|
||||
local bytes_sent = user_data.bytes_sent or 0
|
||||
local bytes_rcvd = user_data.bytes_rcvd or 0
|
||||
local packets_sent = user_data.packets_sent or 0
|
||||
local packets_rcvd = user_data.packets_rcvd or 0
|
||||
|
||||
-- These are in B, needs to be converted in KB
|
||||
if info and (info["bytes.sent"]) > 0 then
|
||||
bytes_sent = math.floor((info["bytes.sent"]) / 1024 + 0.5)
|
||||
end
|
||||
if info and (info["bytes.rcvd"]) > 0 then
|
||||
bytes_rcvd = math.floor((info["bytes.rcvd"]) / 1024 + 0.5)
|
||||
end
|
||||
-- These are in B, needs to be converted in KB
|
||||
if info and (info["bytes.sent"]) > 0 then
|
||||
bytes_sent = math.floor((info["bytes.sent"]) / 1024 + 0.5)
|
||||
end
|
||||
if info and (info["bytes.rcvd"]) > 0 then
|
||||
bytes_rcvd = math.floor((info["bytes.rcvd"]) / 1024 + 0.5)
|
||||
end
|
||||
|
||||
if info and (info["packets.sent"]) > 0 then
|
||||
packets_sent = info["packets.sent"]
|
||||
end
|
||||
if info and (info["packets.rcvd"]) > 0 then
|
||||
packets_rcvd = info["packets.rcvd"]
|
||||
end
|
||||
if info and (info["packets.sent"]) > 0 then
|
||||
packets_sent = info["packets.sent"]
|
||||
end
|
||||
if info and (info["packets.rcvd"]) > 0 then
|
||||
packets_rcvd = info["packets.rcvd"]
|
||||
end
|
||||
|
||||
traceError(TRACE_NORMAL, TRACE_CONSOLE, string.format(
|
||||
"Accounting update [MAC: %s][IP: %s][In Bytes: %d][Out Bytes: %d][Radius In Bytes: %d][Radius Out Bytes: %d]",
|
||||
name, ip_address or "", info["bytes.rcvd"],
|
||||
info["bytes.sent"], bytes_rcvd, bytes_sent))
|
||||
traceError(TRACE_NORMAL, TRACE_CONSOLE, string.format(
|
||||
"Accounting update [MAC: %s][IP: %s][In Bytes: %d][Out Bytes: %d][Radius In Bytes: %d][Radius Out Bytes: %d]",
|
||||
name, ip_address or "", info["bytes.rcvd"],
|
||||
info["bytes.sent"], bytes_rcvd, bytes_sent))
|
||||
|
||||
user_data.bytes_sent = bytes_sent
|
||||
user_data.bytes_rcvd = bytes_rcvd
|
||||
user_data.packets_sent = packets_sent
|
||||
user_data.packets_rcvd = packets_rcvd
|
||||
user_data.bytes_sent = bytes_sent
|
||||
user_data.bytes_rcvd = bytes_rcvd
|
||||
user_data.packets_sent = packets_sent
|
||||
user_data.packets_rcvd = packets_rcvd
|
||||
|
||||
ntop.setCache(key, json.encode(user_data))
|
||||
ntop.setCache(key, json.encode(user_data))
|
||||
|
||||
interface.radiusAccountingUpdate(name, user_data.session_id,
|
||||
user_data.username, user_data.password,
|
||||
ip_address, bytes_sent, bytes_rcvd,
|
||||
packets_sent, packets_rcvd,
|
||||
current_time -
|
||||
user_data.start_session_time)
|
||||
end
|
||||
interface.radiusAccountingUpdate(name, user_data.session_id,
|
||||
user_data.username, user_data.password,
|
||||
ip_address, bytes_sent, bytes_rcvd,
|
||||
packets_sent, packets_rcvd,
|
||||
current_time -
|
||||
user_data.start_session_time)
|
||||
end
|
||||
|
||||
return res
|
||||
return res
|
||||
end
|
||||
|
||||
-- ##############################################
|
||||
|
|
@ -227,52 +227,52 @@ end
|
|||
---@return boolean, in case the accounting is up or not
|
||||
---@return table, containing the user data in case an accounting is up
|
||||
function radius_handler.isAccountingRequested(name)
|
||||
name = string.upper(name)
|
||||
local key = string.format(redis_accounting_key, name)
|
||||
local user_data = ntop.getCache(key)
|
||||
name = string.upper(name)
|
||||
local key = string.format(redis_accounting_key, name)
|
||||
local user_data = ntop.getCache(key)
|
||||
|
||||
if not isEmptyString(user_data) then return true, json.decode(user_data) end
|
||||
if not isEmptyString(user_data) then return true, json.decode(user_data) end
|
||||
|
||||
return false, nil
|
||||
return false, nil
|
||||
end
|
||||
|
||||
-- ##############################################
|
||||
|
||||
function radius_handler.isAccountingEnabled()
|
||||
local accounting_enabled = ntop.getPref(
|
||||
"ntopng.prefs.radius.accounting_enabled")
|
||||
if (not accounting_enabled) or
|
||||
(isEmptyString(accounting_enabled) or (accounting_enabled == "0")) then
|
||||
return false
|
||||
end
|
||||
local accounting_enabled = ntop.getPref(
|
||||
"ntopng.prefs.radius.accounting_enabled")
|
||||
if (not accounting_enabled) or
|
||||
(isEmptyString(accounting_enabled) or (accounting_enabled == "0")) then
|
||||
return false
|
||||
end
|
||||
|
||||
return true
|
||||
return true
|
||||
end
|
||||
|
||||
-- ##############################################
|
||||
|
||||
function radius_handler.getAllKeys()
|
||||
local keys = ntop.getKeysCache("ntopng.radius.accounting.*")
|
||||
if keys then
|
||||
require "lua_utils"
|
||||
local prefix_to_remove = "ntopng.radius.accounting."
|
||||
local characters_to_remove = string.len(prefix_to_remove)
|
||||
local new_keys = {}
|
||||
for member, _ in pairs(keys) do
|
||||
local mac_address = member:gsub(prefix_to_remove, "")
|
||||
if isMacAddress(mac_address) then
|
||||
new_keys[#new_keys + 1] = mac_address
|
||||
end
|
||||
end
|
||||
keys = new_keys
|
||||
end
|
||||
return keys or {}
|
||||
local keys = ntop.getKeysCache("ntopng.radius.accounting.*")
|
||||
if keys then
|
||||
require "lua_utils"
|
||||
local prefix_to_remove = "ntopng.radius.accounting."
|
||||
local characters_to_remove = string.len(prefix_to_remove)
|
||||
local new_keys = {}
|
||||
for member, _ in pairs(keys) do
|
||||
local mac_address = member:gsub(prefix_to_remove, "")
|
||||
if isMacAddress(mac_address) then
|
||||
new_keys[#new_keys + 1] = mac_address
|
||||
end
|
||||
end
|
||||
keys = new_keys
|
||||
end
|
||||
return keys or {}
|
||||
end
|
||||
|
||||
-- ##############################################
|
||||
|
||||
function radius_handler.deleteAllKeys()
|
||||
ntop.delCache("ntopng.radius.accounting.*")
|
||||
ntop.delCache("ntopng.radius.accounting.*")
|
||||
end
|
||||
|
||||
-- ##############################################
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue