johanels/akvorado
1
0
Fork 0
mirror of https://github.com/akvorado/akvorado.git synced 2025-12-11 22:14:02 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

console/filter: add IN/NOTIN for strings

Browse Source
This commit is contained in:
Vincent Bernat
2022-06-01 16:20:59 +02:00
parent 77e1847de2
commit beea3ff2be
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
console/filter/parser.peg
View File

@@ -68,6 +68,7 @@ ConditionIPExpr "condition on IP" ←
/ "DstAddr"i { return "DstAddr", nil }) _ operator:("=" / "!=") _ ip:IP {
return fmt.Sprintf("%s %s IPv6StringToNum(%s)", toString(column), toString(operator), quote(ip)), nil
}
ConditionStringExpr "condition on string" ←
column:("ExporterName"i { return "ExporterName", nil }
/ "ExporterGroup"i { return "ExporterGroup", nil }
@@ -80,11 +81,18 @@ ConditionStringExpr "condition on string" ←
/ "InIfConnectivity"i { return "InIfConnectivity", nil }
/ "OutIfConnectivity"i { return "OutIfConnectivity", nil }
/ "InIfProvider"i { return "InIfProvider", nil }
/ "OutIfProvider"i { return "OutIfProvider", nil }) _
operator:("=" / "!=" / LikeOperator ) _
str:StringLiteral {
return fmt.Sprintf("%s %s %s", toString(column), toString(operator), quote(str)), nil
/ "OutIfProvider"i { return "OutIfProvider", nil }) _
rcond:RConditionStringExpr {
return fmt.Sprintf("%s %s", toString(column), toString(rcond)), nil
}
RConditionStringExpr "condition on string" ←
operator:("=" / "!=" / LikeOperator ) _ str:StringLiteral {
return fmt.Sprintf("%s %s", toString(operator), quote(str)), nil
}
/ operator:InOperator _ '(' _ value:ListString _ ')' {
return fmt.Sprintf("%s (%s)", toString(operator), toString(value)), nil
}
ConditionBoundaryExpr "condition on boundary" ←
column:("InIfBoundary"i { return "InIfBoundary", nil }
/ "OutIfBoundary"i { return "OutIfBoundary", nil }) _
@@ -112,6 +120,7 @@ ConditionPortExpr "condition on port" ←
operator:("=" / ">=" / "<=" / "<" / ">" / "!=") _ value:Unsigned16 {
return fmt.Sprintf("%s %s %s", toString(column), toString(operator), toString(value)), nil
}
ConditionASExpr "condition on AS number" ←
column:("SrcAS"i { return "SrcAS", nil }
/ "DstAS"i { return "DstAS", nil }) _
@@ -123,6 +132,7 @@ RConditionASExpr "condition on AS number" ←
/ operator:InOperator _ '(' _ value:ListASN _ ')' {
return fmt.Sprintf("%s (%s)", toString(operator), toString(value)), nil
}
ConditionETypeExpr "condition on Ethernet type" ←
column:("EType"i { return "EType", nil }) _
operator:("=" / "!=") _ value:("IPv4"i / "IPv6"i) {
@@ -172,6 +182,9 @@ StringLiteral "quoted string" ← ( '"' DoubleStringChar* '"' / "'" SingleString
SourceChar ← .
DoubleStringChar ← !( '"' / EOL ) SourceChar
SingleStringChar ← !( "'" / EOL ) SourceChar
ListString "list of strings" ←
head:StringLiteral _ ',' _ tail:ListString { return fmt.Sprintf("%s, %s", quote(head), tail), nil }
/ value:StringLiteral { return quote(value), nil }
Unsigned8 "unsigned 8-bit integer" ← [0-9]+ !IdentStart {
v, err := strconv.ParseUint(string(c.text), 10, 8)

2
console/filter/parser_test.go
View File

@@ -18,6 +18,8 @@ func TestValidFilter(t *testing.T) {
{`ExporterName="something'"`, `ExporterName = 'something\''`},
{`ExporterName="something\"`, `ExporterName = 'something\\'`},
{`ExporterName!="something"`, `ExporterName != 'something'`},
{`ExporterName IN ("something")`, `ExporterName IN ('something')`},
{`ExporterName IN ("something","something else")`, `ExporterName IN ('something', 'something else')`},
{`ExporterName LIKE "something%"`, `ExporterName LIKE 'something%'`},
{`ExporterName UNLIKE "something%"`, `ExporterName NOT LIKE 'something%'`},
{`ExporterName IUNLIKE "something%"`, `ExporterName NOT ILIKE 'something%'`},

2
console/filter_test.go
View File

@@ -118,8 +118,10 @@ UNION DISTINCT
{"label": "!=", "detail": "comparison operator", "quoted": false},
{"label": "=", "detail": "comparison operator", "quoted": false},
{"label": "ILIKE", "detail": "comparison operator", "quoted": false},
{"label": "IN (", "detail": "comparison operator", "quoted": false},
{"label": "IUNLIKE", "detail": "comparison operator", "quoted": false},
{"label": "LIKE", "detail": "comparison operator", "quoted": false},
{"label": "NOTIN (", "detail": "comparison operator", "quoted": false},
{"label": "UNLIKE", "detail": "comparison operator", "quoted": false},
}},
}, {