fix(crypto): relax network interface check for seednode ips (#3391)

ArkEcosystem · Jan 20, 2020 · 2824ac6 · 2824ac6
1 parent 3766146
commit 2824ac6
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 9 deletions.
diff --git a/__tests__/unit/crypto/utils/is-valid-peer.test.ts b/__tests__/unit/crypto/utils/is-valid-peer.test.ts
@@ -51,4 +51,26 @@ describe("isValidPeer", () => {
         expect(isValidPeer({ ip: "5.196.105.32" })).toBeTrue();
         expect(isValidPeer({ ip: "5.196.105.32" })).toBeTrue();
     });
+
+    it("should be ok if IP is from network interface", () => {
+        const ips = [
+            "167.114.29.51",
+            "167.114.29.52",
+            "167.114.29.53",
+            "167.114.29.54",
+            "167.114.29.55"
+        ];
+
+        const spy = jest.spyOn(os, "networkInterfaces").mockReturnValue({
+            "eth0": ips.map(ip => ({ address: ip }) as any)
+        });
+
+        for (const ip of ips) {
+            expect(isValidPeer({ ip }, false)).toBeTrue();
+            expect(isValidPeer({ ip })).toBeFalse();
+        }
+
+        spy.mockRestore();
+    });
+
 });
diff --git a/packages/crypto/src/utils/is-valid-peer.ts b/packages/crypto/src/utils/is-valid-peer.ts
@@ -1,18 +1,22 @@
 import { parse, process } from "ipaddr.js";
 import os from "os";
 
-export const isLocalHost = (ip: string): boolean => {
+export const isLocalHost = (ip: string, includeNetworkInterfaces: boolean = true): boolean => {
     try {
         const parsed = parse(ip);
         if (parsed.range() === "loopback" || ip.startsWith("0") || ["127.0.0.1", "::ffff:127.0.0.1"].includes(ip)) {
             return true;
         }
 
-        const interfaces: {
-            [index: string]: os.NetworkInterfaceInfo[];
-        } = os.networkInterfaces();
+        if (includeNetworkInterfaces) {
+            const interfaces: {
+                [index: string]: os.NetworkInterfaceInfo[];
+            } = os.networkInterfaces();
 
-        return Object.keys(interfaces).some(ifname => interfaces[ifname].some(iface => iface.address === ip));
+            return Object.keys(interfaces).some(ifname => interfaces[ifname].some(iface => iface.address === ip));
+        }
+
+        return false;
     } catch (error) {
         return false;
     }
@@ -26,14 +30,13 @@ const sanitizeRemoteAddress = (ip: string): string | undefined => {
     }
 };
 
-export const isValidPeer = (peer: { ip: string; status?: string | number }): boolean => {
+export const isValidPeer = (peer: { ip: string }, includeNetworkInterfaces: boolean = true): boolean => {
     peer.ip = sanitizeRemoteAddress(peer.ip);
-
     if (!peer.ip) {
         return false;
     }
 
-    if (isLocalHost(peer.ip)) {
+    if (isLocalHost(peer.ip, includeNetworkInterfaces)) {
         return false;
     }
 

diff --git a/packages/crypto/src/validation/formats.ts b/packages/crypto/src/validation/formats.ts
@@ -14,7 +14,7 @@ const vendorField = (ajv: Ajv) => {
 const validPeer = (ajv: Ajv) => {
     ajv.addFormat("peer", (ip: string) => {
         try {
-            return isValidPeer({ ip });
+            return isValidPeer({ ip }, false);
         } catch {
             return false;
         }