fixed tests

nttgin · Oct 16, 2023 · 5a07f2a · 5a07f2a
1 parent 34f5774
commit 5a07f2a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/monitors/monitorAS.js b/src/monitors/monitorAS.js
@@ -86,11 +86,19 @@ export default class MonitorAS extends Monitor {
 
                 const matchedPrefixRule = this.getMoreSpecificMatch(messagePrefix, true);
 
-                const groupsUnion = [...new Set([...matchedRule.group, ...matchedPrefixRule.group])];
-                const differentGroups = this.skipPrefixMatchOnDifferentGroups
-                    && (groupsUnion.length !== matchedRule.group.length || groupsUnion.length !== matchedPrefixRule.group);
-
-                if (differentGroups || !matchedPrefixRule) {
+                if (matchedPrefixRule) {
+                    const matchedRuleGroup = [matchedRule.group].flat() ?? ["default"];
+                    const matchedPrefixRuleGroup = [matchedPrefixRule.group].flat() ?? ["default"];
+
+                    if (this.skipPrefixMatchOnDifferentGroups && matchedRuleGroup.some(g => !matchedPrefixRuleGroup.includes(g))) {
+                        this.publishAlert(messageOrigin.getId().toString() + "-" + messagePrefix,
+                            messageOrigin.getId(),
+                            matchedRule,
+                            message,
+                            {});
+                    }
+
+                } else {
                     this.publishAlert(messageOrigin.getId().toString() + "-" + messagePrefix,
                         messageOrigin.getId(),
                         matchedRule,

diff --git a/tests/config.test.yml b/tests/config.test.yml
@@ -35,6 +35,7 @@ monitors:
     channel: misconfiguration
     name: asn-monitor
     params:
+      skipPrefixMatchOnDifferentGroups: false
       thresholdMinPeers: 2
 
   - file: monitorRPKI