vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-10 15:08:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add support for free-text search and minor bug fixes in netquery

Browse source
This commit is contained in:
Patrick Pacher 2022-05-17 08:59:18 +02:00
parent bef911e925
commit 15f85b5ae9
No known key found for this signature in database
GPG key ID: E8CD2DA160925A6D
6 changed files with 109 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
netquery/chart_handler.go
View file

@ -99,9 +99,9 @@ WITH RECURSIVE epoch(x) AS (
UNION ALL
SELECT x+1 FROM epoch WHERE x+1 < strftime('%%s')+0
)
SELECT x as timestamp, COUNT(*) AS value FROM epoch
SELECT x as timestamp, SUM(verdict IN (2, 5, 6)) AS value, SUM(verdict NOT IN (2, 5, 6)) as countBlocked FROM epoch
JOIN connections
ON strftime('%%s', connections.started)+0 <= timestamp+0 AND (connections.ended IS NULL OR strftime('%%s', connections.ended)+0 > timestamp+0)
ON strftime('%%s', connections.started)+0 <= timestamp+0 AND (connections.ended IS NULL OR strftime('%%s', connections.ended)+0 >= timestamp+0)
%s
GROUP BY round(timestamp/10, 0)*10;`
@ -110,6 +110,28 @@ SELECT x as timestamp, COUNT(*) AS value FROM epoch
return "", nil, err
}
if params == nil {
params = make(map[string]interface{})
}
if req.TextSearch != nil {
textSearch, textParams, err := req.TextSearch.toSQLConditionClause(ctx, schema, "", orm.DefaultEncodeConfig)
if err != nil {
return "", nil, err
}
if textSearch != "" {
if clause != "" {
clause += " AND "
}
clause += textSearch
for key, val := range textParams {
params[key] = val
}
}
}
if clause == "" {
return fmt.Sprintf(template, ""), map[string]interface{}{}, nil
}