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

Fixes possible collisions when looking up flows by key

Browse source
This commit is contained in:
Simone Mainardi 2019-10-16 19:04:10 +02:00
parent 6533175336
commit 6fd7386c03
24 changed files with 146 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/lua/modules/alert_utils.lua
View file

@ -682,14 +682,14 @@ local function formatRawFlow(record, flow_json, skip_add_links)
local status_info = alert2statusinfo(decoded)
-- active flow lookup
if not interface.isView() and status_info and status_info["ntopng.key"] and record["alert_tstamp"] then
if not interface.isView() and status_info and status_info["ntopng.key"] and status_info["hash_entry_id"] and record["alert_tstamp"] then
-- attempt a lookup on the active flows
local active_flow = interface.findFlowByKey(status_info["ntopng.key"])
local active_flow = interface.findFlowByKeyAndHashId(status_info["ntopng.key"], status_info["hash_entry_id"])
if active_flow and active_flow["seen.first"] < tonumber(record["alert_tstamp"]) then
return string.format("%s [%s: <A HREF='%s/lua/flow_details.lua?flow_key=%u'><span class='label label-info'>Info</span></A> %s]",
return string.format("%s [%s: <A HREF='%s/lua/flow_details.lua?flow_key=%u&flow_hash_id=%u'><span class='label label-info'>Info</span></A> %s]",
flow_consts.getStatusDescription(tonumber(record["flow_status"]), status_info),
i18n("flow"), ntop.getHttpPrefix(), active_flow["ntopng.key"],
i18n("flow"), ntop.getHttpPrefix(), active_flow["ntopng.key"], active_flow["hash_entry_id"],
getFlowLabel(active_flow, true, true))
end
end