mirror/nttgin-BGPalerter
1
0
Fork 0
mirror of https://github.com/nttgin/BGPalerter.git synced 2024-05-19 06:50:08 +00:00
Code Issues Releases Wiki Activity

provide proper error when prefixes list is malformed and create an emtpy file only when missing

Browse Source
This commit is contained in:
Massimo Candela
2019-10-22 23:09:33 +02:00
parent 8e3486cc44
commit d924947ef0
3 changed files with 71 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inputs/input.js
View File

@@ -55,6 +55,10 @@ export default class Input {
};
getMonitoredLessSpecifics = () => {
if (!this.prefixes.length) {
return [];
}
const prefixes = this.prefixes.sort((a, b) => {
return ipUtils.sortByPrefixLength(a.prefix, b.prefix);
});

17
inputs/inputYml.js
View File

@@ -51,12 +51,14 @@ export default class InputYml extends Input {
for (let prefixesFile of config.monitoredPrefixesFiles) {
let monitoredPrefixesFile = {};
let fileContent;
if (fs.existsSync('./' + prefixesFile)) {
fileContent = fs.readFileSync('./' + prefixesFile, 'utf8');
try {
monitoredPrefixesFile = yaml.safeLoad(fs.readFileSync('./' + prefixesFile, 'utf8')) || {};
} catch(e) {
fs.writeFileSync(prefixesFile, "");
throw new Error("No prefixes to monitor in " + prefixesFile);
monitoredPrefixesFile = yaml.safeLoad(fileContent) || {};
} catch (error) {
throw new Error("The file " + prefixesFile + " is not valid yml: " + error.message.split(":")[0]);
}
if (Object.keys(monitoredPrefixesFile).length === 0) {
@@ -86,6 +88,11 @@ export default class InputYml extends Input {
this.prefixes = this.prefixes.concat(monitoredPrefixes);
}
} else {
fs.writeFileSync(prefixesFile, "");
throw new Error("The file " + prefixesFile + " cannot be loaded. An empty one has been created.");
}
}
this.prefixes = this.prefixes.sort((a, b) => {
@@ -113,7 +120,7 @@ export default class InputYml extends Input {
return "Not a valid AS number for: " + prefix;
}
if (asns.some(asn => !asn || !new AS(asn).isValid())) {
if (!new AS(asns).isValid()) {
return "Not a valid AS number for: " + prefix;
}

20
model.js
View File

@@ -25,15 +25,19 @@ export class AS {
this.ASset = false;
if (["string", "number"].includes(typeof(numbers))) {
this.numbers = [ parseInt(numbers) ];
this.numbers = [ numbers ];
} else if (numbers instanceof Array && numbers.length){
this.ASset = true;
if (numbers.length === 1) {
this.numbers = [ parseInt(numbers[0]) ];
this.numbers = [ numbers[0] ];
} else {
this.numbers = numbers.map(i => parseInt(i));
this.numbers = numbers;
}
}
if (this.isValid()) {
this.numbers.map(i => parseInt(i));
}
}
getId = () => {
@@ -44,14 +48,20 @@ export class AS {
return this.numbers.length > 0 &&
this.numbers
.every(asn => {
try {
asn = parseInt(asn);
const intAsn = parseInt(asn);
if (intAsn !== asn) {
return false;
}
asn = intAsn;
} catch (e) {
return false;
}
return asn > 0 && asn <= 4294967295;
})
}) &&
[...new Set(this.numbers.map(i => parseInt(i)))].length === this.numbers.length;
};
includes = (ASn) => {