introduced error logs on for non standard iso codes

massimocandela · Jun 30, 2021 · 6caaef5 · 6caaef5
1 parent 337d23c
commit 6caaef5
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -52,6 +52,8 @@
     "cli-progress": "^3.9.0",
     "ip-address": "^8.0.0",
     "ip-sub": "^1.0.25",
+    "iso-3166-1": "^2.0.1",
+    "iso-3166-2": "^1.0.0",
     "md5": "^2.3.0",
     "moment": "^2.29.1",
     "readline": "^1.3.0",

diff --git a/src/csvParser.js b/src/csvParser.js
@@ -1,4 +1,6 @@
 import ipUtils from "ip-sub";
+import iso3166a from "iso-3166-1";
+import iso3166b from "iso-3166-2";
 
 const checkPrefix = (prefix) => {
     if (!prefix.includes("/")) {
@@ -17,8 +19,40 @@ class Geofeed {
         this.zip = zip || null;
         this.city = city;
         this.valid = true;
+    };
+
+    validate = () => {
+        const out = [];
+        const validCountry = !this.country || iso3166a.whereAlpha2(this.country.toLowerCase());
+        const validRegion = !this.region || iso3166b.subdivision(this.region);
+        const validCombination = !this.country || !this.region || !!validCountry && !!validRegion && validRegion.countryCode === this.country;
+
+        if (!validCountry) {
+            out.push("Not valid Country Code (iso-3166-1)");
+        }
+
+        if (!validRegion) {
+            out.push("Not valid Subdivision Code (iso-3166-2)");
+        }
+
+        if (validCountry && validRegion && !validCombination) {
+            out.push("The Subdivision is not inside the Country");
+        }
+
+        return out;
+    };
+
+    toString = () => {
+        return [
+            this.prefix,
+            this.country || "",
+            this.region || "",
+            this.city || "",
+            this.zip || ""
+        ].join(",");
     }
 }
+
 export default class CsvParser {
 
     parse = (inetnum, content) => {

diff --git a/src/finder.js b/src/finder.js
@@ -134,19 +134,29 @@ export default class Finder {
                 return [].concat.apply([], out);
             })
             .then(data => {
-               if (!this.params.includeZip) {
-                   data.forEach(i => i.zip = null);
-               }
+                if (!this.params.includeZip) {
+                    data.forEach(i => i.zip = null);
+                }
 
-               return data;
+                return data;
             });
     };
 
     validateGeofeeds = (geofeeds) => {
         return geofeeds
             .filter(geofeed => {
-                return geofeed && !!geofeed.inetnum && !!geofeed.prefix &&
-                    (ipUtils.isEqualPrefix(geofeed.inetnum, geofeed.prefix) || ipUtils.isSubnet(geofeed.inetnum, geofeed.prefix));
+                const errors = geofeed.validate();
+
+                if (errors.length > 0) {
+                    console.log(`Error: ${geofeed} ${errors.join(", ")}`);
+                }
+
+                if (this.params.keepNonIso || errors.length === 0) {
+                    return geofeed && !!geofeed.inetnum && !!geofeed.prefix &&
+                        (ipUtils.isEqualPrefix(geofeed.inetnum, geofeed.prefix) || ipUtils.isSubnet(geofeed.inetnum, geofeed.prefix));
+                }
+
+                return false;
             });
 
     };
@@ -249,14 +259,21 @@ export default class Finder {
         }
     };
 
-    getInetnum = (prefix) =>
-        new Promise((resolve, reject) => {
-            webWhois.lookup(prefix, (error, data) => {
+    _whois = (prefix, server) => {
+        return new Promise((resolve, reject) => {
+            webWhois.lookup(prefix, { follow: 4, verbose: true }, (error, data) => {
                 if (error) {
                     reject(error)
                 } else {
                     resolve(data);
                 }
             })
         });
+    }
+
+    getInetnum = (prefix) =>
+        this._whois(prefix)
+            .then(list => {
+                return list.map(i => i.data).join("\n")
+            });
 }
diff --git a/src/index.js b/src/index.js
@@ -4,7 +4,7 @@ import yargs from 'yargs';
 
 const toGeofeed = (geofeedsObjects) => {
     return geofeedsObjects
-        .map(g => `${g.prefix || ""},${g.country || ""},${g.region || ""},${g.city || ""},${g.zip || ""},`)
+        // .map(g => `${g.prefix || ""},${g.country || ""},${g.region || ""},${g.city || ""},${g.zip || ""},`)
         .join("\n");
 };
 
@@ -34,6 +34,10 @@ const params = yargs
             // .nargs('z', 0)
             // .describe('z', 'Zip codes are deprecated in geofeed and by default are excluded from the output.')
 
+            .alias('k', 'keep-non-iso')
+            .nargs('k', 0)
+            .describe('k', 'Keep entries with invalid ISO codes')
+
             .alias('i', 'include')
             .nargs('i', 1)
             .default('i', 'ripe,apnic,lacnic,afrinic,arin')
@@ -48,6 +52,7 @@ const options = {
     defaultCacheDays: 7,
     arinBulk: params.b,
     includeZip: params.z || false,
+    keepNonIso: params.k || false,
     include: ((params.i) ? params.i : "ripe,apnic,lacnic,afrinic,arin").split(","),
     output: params.o || "result.csv",
     test: params.t || null,