Merge branch 'dev' into dist

nttgin · Oct 16, 2023 · 22a7db6 · 22a7db6
2 parents 18d61a9 + 5a07f2a
commit 22a7db6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/config.yml.example b/config.yml.example
@@ -46,7 +46,7 @@ monitors:
     channel: misconfiguration
     name: asn-monitor
     params:
-      skipPrefixMatch: false
+      skipPrefixMatchOnDifferentGroups: false
       thresholdMinPeers: 3
 
   - file: monitorRPKI

diff --git a/src/config/config.js b/src/config/config.js
@@ -68,7 +68,7 @@ export default class Config {
                     channel: "misconfiguration",
                     name: "asn-monitor",
                     params: {
-                        skipPrefixMatch: false,
+                        skipPrefixMatchOnDifferentGroups: false,
                         thresholdMinPeers: 3
                     }
                 },

diff --git a/src/monitors/monitorAS.js b/src/monitors/monitorAS.js
@@ -37,7 +37,7 @@ export default class MonitorAS extends Monitor {
     constructor(name, channel, params, env, input){
         super(name, channel, params, env, input);
         this.thresholdMinPeers = (params && params.thresholdMinPeers != null) ? params.thresholdMinPeers : 3;
-        this.skipPrefixMatch = !!params?.skipPrefixMatch;
+        this.skipPrefixMatchOnDifferentGroups = !!params?.skipPrefixMatchOnDifferentGroups;
         this.updateMonitoredResources();
     };
 
@@ -69,7 +69,7 @@ export default class MonitorAS extends Monitor {
         if (prefixesOut.length > 1) {
             return `${matchedMessages[0].originAS} is announcing some prefixes which are not in the configured list of announced prefixes: ${prefixesOut}`
         } else if (prefixesOut.length === 1) {
-           return `${matchedMessages[0].originAS} is announcing ${matchedMessages[0].prefix} but this prefix is not in the configured list of announced prefixes`;
+            return `${matchedMessages[0].originAS} is announcing ${matchedMessages[0].prefix} but this prefix is not in the configured list of announced prefixes`;
         }
 
         return false;
@@ -86,7 +86,19 @@ export default class MonitorAS extends Monitor {
 
                 const matchedPrefixRule = this.getMoreSpecificMatch(messagePrefix, true);
 
-                if (this.skipPrefixMatch || !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