upstream/opnsense-core
1
0
Fork 0
mirror of https://github.com/opnsense/core.git synced 2026-02-18 18:18:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

firewall: live view: combined filters stored as converted strings, adjust parsing (fixes https://github.com/opnsense/core/issues/9741)

Browse source
This commit is contained in:
Stephan de Wit 2026-02-06 14:24:34 +01:00
parent 17310aea35
commit 72cea55c1a
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
View file

@ -1183,13 +1183,16 @@
const filters = template.filters.split(',').map(val => {
let interface = null;
const parts = val.split(/(!=|!~|=|~)/);
// XXX consolidate with earlier parsing
let field = parts[0];
/* determine if combined filter */
let combinedMatch = parts[0].match(/^\s*(\w+)\s+(or|and)\s+(\w+)\s*$/i);
let field = combinedMatch ? [combinedMatch[1], combinedMatch[3]] : parts[0];
switch (field) {
case '__addr__':
/* backwards compatibility */
field = ['src', 'dst'];
break;
case '__port__':
/* backwards compatibility */
field = ['srcport', 'dstport']
case 'interface':
case 'interface_name':
@ -1198,7 +1201,7 @@
break;
}
return {field: field, operator: parts[1], value: parts[2], format: interface};
})
});
return {filters, mode}
};