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

Fixes parsing of IP addresses and CIDRs for custom protocols

Browse source 
Fixes #4050
This commit is contained in:
Simone Mainardi 2020-06-17 18:49:35 +02:00
parent 93e42d4df0
commit c8db38a06c
2 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
scripts/lua/modules/protos_utils.lua
View file

@ -3,7 +3,7 @@
--
local os_utils = require("os_utils")
local http_lint = require "http_lint"
local protos_utils = {}
-- ##############################################
@ -94,9 +94,9 @@ function protos_utils.parseProtosTxt()
for _, rule in ipairs(rules) do
parts = string.split(rule, ":")
if((parts ~= nil) and (#parts == 2)) then
if((parts ~= nil) and (#parts == 2 or #parts == 3)) then
local filter = parts[1]
local value = parts[2]
local value = rule:gsub(filter..":", "")
local is_port_based, port_based_rule = parsePortBasedRule(filter, value, line)
if is_port_based then
@ -150,17 +150,29 @@ end
function protos_utils.getProtosTxtRule(line)
line = trimString(line)
if isIPv4(line) then
return {
match = "host",
value = line,
}
if isIPv4(line) or http_lint.validateNetwork(line) then
return {
match = "ip",
value = line
}
else
local parts = string.split(line, ":")
if((parts ~= nil) and (#parts == 2)) then
local filter = parts[1]
local value = parts[2]
if tonumber(value) then
if isIPv4(filter) or http_lint.validateNetwork(filter) then
-- e.g., 8.248.73.247:443
-- e.g., 213.75.170.11/32:443
return {
match = "ip",
value = line
}
end
end
local is_port_based, port_based_rule = parsePortBasedRule(filter, value, line)
if is_port_based then