v1.28.1

fixed crash on malformed list of downstream/upstream ASes (#593)
nttgin · Jun 24, 2021 · 9419444 · 9419444
1 parent b621fbe
commit 9419444
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 24 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bgpalerter",
-  "version": "1.28.0",
+  "version": "1.28.1",
   "description": "Software to monitor streams of BGP data. Pre-configured for real-time detection of visibility loss, RPKI invalid announcements, hijacks, and more.",
   "author": {
     "name": "Massimo Candela",

diff --git a/src/inputs/inputYml.js b/src/inputs/inputYml.js
@@ -133,8 +133,12 @@ export default class InputYml extends Input {
                                             group: 'default'
                                         }, monitoredPrefixesFile.options.monitorASns[asn]);
 
-                                        if (item.upstreams) item.upstreams = new AS(item.upstreams);
-                                        if (item.downstreams) item.downstreams = new AS(item.downstreams);
+                                        if (item.upstreams && item.upstreams.length) {
+                                            item.upstreams = new AS(item.upstreams);
+                                        }
+                                        if (item.downstreams && item.downstreams.length) {
+                                            item.downstreams = new AS(item.downstreams);
+                                        }
 
                                         return item;
                                     });
@@ -184,13 +188,20 @@ export default class InputYml extends Input {
         const options = fileContent.options;
 
         if (options && options.monitorASns) {
-            optionsError = Object
-                .keys(options.monitorASns)
-                .map(asn => {
-                    if (!new AS(asn).isValid()) {
-                        return "Not a valid AS number in monitorASns";
-                    }
-                });
+
+            for (let item in options.monitorASns) {
+                if (!new AS(item).isValid()) {
+                    optionsError.push("Not a valid AS number in monitorASns");
+                }
+                const upstreams = options.monitorASns[item].upstreams;
+                const downstreams = options.monitorASns[item].downstreams;
+                if (upstreams && upstreams.length && !new AS(upstreams).isValid()) {
+                    optionsError.push(`One of the upstream ASes provided for AS${item} is not valid`);
+                }
+                if (downstreams && downstreams.length && !new AS(downstreams).isValid()) {
+                    optionsError.push(`One of the downstream ASes provided for AS${item} is not valid`);
+                }
+            }
         }
 
         prefixesError = Object

diff --git a/src/model.js b/src/model.js
@@ -56,24 +56,22 @@ export class AS {
         if (["string", "number"].includes(typeof(numbers))) {
             this.numbers = [ numbers ];
         } else if (numbers instanceof Array && numbers.length){
-            this.ASset = true;
-            if (numbers.length === 1) {
-                this.numbers = [ numbers[0] ];
-            } else {
-                this.numbers = numbers;
+            if (numbers.length > 1) {
+                this.ASset = true;
             }
+            this.numbers = numbers;
         }
 
         if (this.isValid()) {
             this.numbers = this.numbers.map(i => parseInt(i));
-        }
 
-        const key = this.numbers.join("-");
-        if (!!AS._instances[key]) {
-            return AS._instances[key];
-        }
+            const key = this.numbers.join("-");
+            if (!!AS._instances[key]) {
+                return AS._instances[key];
+            }
 
-        AS._instances[key] = this;
+            AS._instances[key] = this;
+        }
     }
 
     getId () {
@@ -82,7 +80,8 @@ export class AS {
 
     isValid () {
         if (this._valid === null) {
-            this._valid = this.numbers.length > 0 &&
+            this._valid = this.numbers &&
+                this.numbers.length > 0 &&
                 this.numbers
                     .every(asn => {