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

Fixes radius preferences not switching correctly (#7631)

Browse source
This commit is contained in:
Matteo Biscosi 2023-07-10 16:48:07 +00:00
parent b21c962fee
commit 8c4c89d4db
2 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

51
scripts/lua/admin/prefs.lua
View file

@ -850,10 +850,8 @@ if auth.has_capability(auth.capabilities.preferences) then
-- RADIUS GUI authentication
local elementToSwitch = {"row_toggle_radius_accounting", "radius_admin_group",
"radius_unpriv_capabilties_group", "radius_server_address", "radius_secret",
"row_radius_auth_proto"}
local showElements = (ntop.getPref("ntopng.prefs.radius.auth_enabled") == "1")
"radius_unpriv_capabilties_group", "radius_server_address", "radius_acct_server_address",
"radius_secret", "row_radius_auth_proto"}
prefsToggleButton(subpage_active, {
field = auth_toggles.radius,
@ -863,15 +861,7 @@ if auth.has_capability(auth.capabilities.preferences) then
})
-- RADIUS traffic accounting
local accountingElements = {"radius_acct_server_address"}
prefsToggleButton(subpage_active, {
field = "toggle_radius_accounting",
pref = "radius.accounting_enabled",
default = "0",
to_switch = accountingElements
})
local showElements = (ntop.getPref("ntopng.prefs.radius.auth_enabled") == "1")
-- RADIUS server settings (used for both RADIUS auth and accountign)
prefsInputFieldPrefs(subpage_active.entries["radius_server"].title,
subpage_active.entries["radius_server"].description, "ntopng.prefs.radius", "radius_server_address",
@ -884,18 +874,6 @@ if auth.has_capability(auth.capabilities.preferences) then
}
})
-- RADIUS server settings (used for both RADIUS auth and accountign)
prefsInputFieldPrefs(subpage_active.entries["radius_accounting_server"].title,
subpage_active.entries["radius_accounting_server"].description, "ntopng.prefs.radius",
"radius_acct_server_address", "127.0.0.1:1813", nil, showElements, true, false, {
attributes = {
spellcheck = "false",
maxlength = 255,
required = "required",
pattern = "[0-9.\\-A-Za-z]+:[0-9]+"
}
})
-- https://github.com/FreeRADIUS/freeradius-client/blob/7b7473ab78ca5f99e083e5e6c16345b7c2569db1/include/freeradius-client.h#L395
prefsInputFieldPrefs(subpage_active.entries["radius_secret"].title,
subpage_active.entries["radius_secret"].description, "ntopng.prefs.radius", "radius_secret", "", "password",
@ -933,6 +911,29 @@ if auth.has_capability(auth.capabilities.preferences) then
pattern = "[^\\s]+"
}
})
local accountingElements = {"radius_acct_server_address"}
prefsToggleButton(subpage_active, {
field = "toggle_radius_accounting",
pref = "radius.accounting_enabled",
default = "0",
to_switch = accountingElements,
hidden = not showElements
})
local showElementsAccounting = (ntop.getPref("ntopng.prefs.radius.accounting_enabled") == "1")
-- RADIUS server settings (used for both RADIUS auth and accountign)
prefsInputFieldPrefs(subpage_active.entries["radius_accounting_server"].title,
subpage_active.entries["radius_accounting_server"].description, "ntopng.prefs.radius",
"radius_acct_server_address", "127.0.0.1:1813", nil, showElements and showElementsAccounting, true, false, {
attributes = {
spellcheck = "false",
maxlength = 255,
required = "required",
pattern = "[0-9.\\-A-Za-z]+:[0-9]+"
}
})
end
-- #####################