From db1ba94578273f758dc828f772921f36c0291172 Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Mon, 22 Mar 2021 10:05:14 -0700 Subject: [PATCH] Simplify isPrivateIP check --- data/interfaces/default/js/script.js | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js index 15f6417d..014b7174 100644 --- a/data/interfaces/default/js/script.js +++ b/data/interfaces/default/js/script.js @@ -281,22 +281,7 @@ function isPrivateIP(ip_address) { if (ipaddr.isValid(ip_address)) { var addr = ipaddr.process(ip_address); - - var rangeList = []; - if (addr.kind() === 'ipv4') { - rangeList = [ - ipaddr.parseCIDR('127.0.0.0/8'), - ipaddr.parseCIDR('10.0.0.0/8'), - ipaddr.parseCIDR('172.16.0.0/12'), - ipaddr.parseCIDR('192.168.0.0/16') - ]; - } else { - rangeList = [ - ipaddr.parseCIDR('fd00::/8') - ]; - } - - if (ipaddr.subnetMatch(addr, rangeList, -1) >= 0) { + if (addr.range() === 'loopback' || addr.range() === 'private') { defer.resolve(); } else { defer.reject();