diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cb383786..71907a62 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -47,6 +47,9 @@ dependencies: change-case: specifier: ^4.1.2 version: 4.1.2 + cidr-tools: + specifier: ^7.0.4 + version: 7.0.7 colord: specifier: ^2.9.3 version: 2.9.3 @@ -92,9 +95,24 @@ dependencies: ibantools: specifier: ^4.3.3 version: 4.3.3 + ip-address: + specifier: ^9.0.5 + version: 9.0.5 + ip-bigint: + specifier: ^8.0.2 + version: 8.0.2 + ip-cidr: + specifier: ^4.0.0 + version: 4.0.0 + ip-matching: + specifier: ^2.1.2 + version: 2.1.2 is-cidr: specifier: ^5.0.3 version: 5.0.3 + is-ip: + specifier: ^5.0.1 + version: 5.0.1 json5: specifier: ^2.2.3 version: 2.2.3 @@ -4473,6 +4491,13 @@ packages: ip-regex: 5.0.0 dev: false + /cidr-tools@7.0.7: + resolution: {integrity: sha512-JeLGxKmaxk59IDRptqYfKa6Pw0bq8EzX7NoBu5XRKLPP9YmUu9mYcqiNliX4h3exjOqMdtzuY6F/rFj43V4Yww==} + engines: {node: '>=18'} + dependencies: + ip-bigint: 8.0.2 + dev: false + /clean-regexp@1.0.0: resolution: {integrity: sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==} engines: {node: '>=4'} @@ -4500,6 +4525,13 @@ packages: wrap-ansi: 6.2.0 dev: false + /clone-regexp@3.0.0: + resolution: {integrity: sha512-ujdnoq2Kxb8s3ItNBtnYeXdm07FcU0u8ARAT1lQ2YdMwQC+cdiXX8KoqMVuglztILivceTtp4ivqGSmEmhBUJw==} + engines: {node: '>=12'} + dependencies: + is-regexp: 3.1.0 + dev: false + /clone@1.0.4: resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==} engines: {node: '>=0.8'} @@ -4604,6 +4636,11 @@ packages: upper-case: 2.0.2 dev: false + /convert-hrtime@5.0.0: + resolution: {integrity: sha512-lOETlkIeYSJWcbbcvjRKGxVMXJR+8+OQb/mTPbA4ObPMytYIsUbuOE0Jzy60hjARYszq1id0j8KgVhC+WGZVTg==} + engines: {node: '>=12'} + dev: false + /convert-source-map@1.9.0: resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} dev: true @@ -5753,6 +5790,11 @@ packages: resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} dev: true + /function-timeout@0.1.1: + resolution: {integrity: sha512-0NVVC0TaP7dSTvn1yMiy6d6Q8gifzbvQafO46RtLG/kHJUBNd+pVRGOBoK44wNBvtSPUJRfdVvkFdD3p0xvyZg==} + engines: {node: '>=14.16'} + dev: false + /function.prototype.name@1.1.6: resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==} engines: {node: '>= 0.4'} @@ -6187,6 +6229,19 @@ packages: sprintf-js: 1.1.2 dev: false + /ip-address@9.0.5: + resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==} + engines: {node: '>= 12'} + dependencies: + jsbn: 1.1.0 + sprintf-js: 1.1.3 + dev: false + + /ip-bigint@8.0.2: + resolution: {integrity: sha512-UMKHGx7+4O2mD/6jnpNtt4UMA0tRQ3XAiNVYlbLssFU1LegKqKwPqbqtLVW7lQU/c6rCWI1hcxxs4TP96Xa+rQ==} + engines: {node: '>=18'} + dev: false + /ip-cidr@3.1.0: resolution: {integrity: sha512-HUCn4snshEX1P8cja/IyU3qk8FVDW8T5zZcegDFbu4w7NojmAhk5NcOgj3M8+0fmumo1afJTPDtJlzsxLdOjtg==} engines: {node: '>=10.0.0'} @@ -6195,6 +6250,17 @@ packages: jsbn: 1.1.0 dev: false + /ip-cidr@4.0.0: + resolution: {integrity: sha512-i1Jhb9sqm2+PuOHTfya3ekAUi+dadhgcEz+4FKKY1hXemocP4Xf7io8Xflc74/i2ejxe/5fp4z8z3BAsfAZ8sw==} + engines: {node: '>=16.14.0'} + dependencies: + ip-address: 9.0.5 + dev: false + + /ip-matching@2.1.2: + resolution: {integrity: sha512-/ok+VhKMasgR5gvTRViwRFQfc0qYt9Vdowg6TO4/pFlDCob5ZjGPkwuOoQVCd5OrMm20zqh+1vA8KLJZTeWudg==} + dev: false + /ip-regex@5.0.0: resolution: {integrity: sha512-fOCG6lhoKKakwv+C6KdsOnGvgXnmgfmp0myi3bcNwj3qfwPAxRKWEuFhvEFF7ceYIz6+1jRZ+yguLFAmUNPEfw==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -6327,6 +6393,14 @@ packages: engines: {node: '>=8'} dev: true + /is-ip@5.0.1: + resolution: {integrity: sha512-FCsGHdlrOnZQcp0+XT5a+pYowf33itBalCl+7ovNXC/7o5BhIpG14M3OrpPPdBSIQJCm+0M5+9mO7S9VVTTCFw==} + engines: {node: '>=14.16'} + dependencies: + ip-regex: 5.0.0 + super-regex: 0.2.0 + dev: false + /is-lower-case@1.1.3: resolution: {integrity: sha512-+5A1e/WJpLLXZEDlgz4G//WYSHyQBD32qa4Jd3Lw06qQlv3fJHnp3YIHjTQSGzHMgzmVKz2ZP3rBxTHkPw/lxA==} dependencies: @@ -6392,6 +6466,11 @@ packages: engines: {node: '>=0.10.0'} dev: true + /is-regexp@3.1.0: + resolution: {integrity: sha512-rbku49cWloU5bSMI+zaRaXdQHXnthP6DZ/vLnfdSKyL4zUzuWnomtOEiZZOd+ioQ+avFo/qau3KPTc7Fjy1uPA==} + engines: {node: '>=12'} + dev: false + /is-shared-array-buffer@1.0.2: resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==} dependencies: @@ -8205,6 +8284,10 @@ packages: resolution: {integrity: sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==} dev: false + /sprintf-js@1.1.3: + resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==} + dev: false + /sql-formatter@13.0.0: resolution: {integrity: sha512-V21cVvge4rhn9Fa7K/fTKcmPM+x1yee6Vhq8ZwgaWh3VPBqApgsaoFB5kLAhiqRo5AmSaRyLU7LIdgnNwH01/w==} hasBin: true @@ -8335,6 +8418,15 @@ packages: dependencies: acorn: 8.11.2 + /super-regex@0.2.0: + resolution: {integrity: sha512-WZzIx3rC1CvbMDloLsVw0lkZVKJWbrkJ0k1ghKFmcnPrW1+jWbgTkTEWVtD9lMdmI4jZEz40+naBxl1dCUhXXw==} + engines: {node: '>=14.16'} + dependencies: + clone-regexp: 3.0.0 + function-timeout: 0.1.1 + time-span: 5.1.0 + dev: false + /supports-color@5.5.0: resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} engines: {node: '>=4'} @@ -8427,6 +8519,13 @@ packages: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} dev: true + /time-span@5.1.0: + resolution: {integrity: sha512-75voc/9G4rDIJleOo4jPvN4/YC4GRZrY8yy1uU4lwrB3XEQbWve8zXoO5No4eFrGcTAMYyoY67p8jRQdtA1HbA==} + engines: {node: '>=12'} + dependencies: + convert-hrtime: 5.0.0 + dev: false + /tiny-emitter@2.1.0: resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==} dev: false diff --git a/src/libs/ip_calculator/ip.ts b/src/libs/ip_calculator/ip.ts deleted file mode 100644 index 8e7ec106..00000000 --- a/src/libs/ip_calculator/ip.ts +++ /dev/null @@ -1,405 +0,0 @@ -/* eslint-disable no-labels */ -/* eslint-disable no-restricted-syntax */ - -const IPv4MAX = (BigInt(2) ** BigInt(32)) - BigInt(1); -const IPv6MAX = (BigInt(2) ** BigInt(128)) - BigInt(1); - -/** -* Represents a single IP address v4 or v6. -* @class IP -* @param {string} address -* host = new IP("184.170.96.196"); -* @return {object} -> IP{address:"184.170.96.196", version: 4, integer: 0, short: 0} -*/ - -export default class IP { - integer: bigint; - short: string; - version: number; - address: string; - /** - * @constructor - */ - constructor(address: string) { - this.integer = 0n; - this.short = ''; - this.version = this._checkVersion(address); - this.address = this._checkAddress(address, this.version); - } - - // Public methods - - /** - * toInteger - Converts dotquad or hextet IP to integer - * @return {BigInt} -> 2130706432 - */ - toInteger() { - let bigInt; - if (this.version === 4) { - const splittedAddr = this.address.split('.').reverse(); - bigInt = splittedAddr.reduce((bigInt, octet, index) => { - return (Number(octet) * 256 ** index + bigInt - ); - }, 0); - } - else { - const joinedAddr = this.address.split(':').join(''); - bigInt = BigInt(`0x${joinedAddr}`); - } - this.integer = BigInt(bigInt); - return BigInt(bigInt); - } - - /** - * toDottedNotation - Converts big integer IP to full dotquad or hextet representation - * @param {bigint} bigInt - * @return {string} -> "184.170.96.196" - */ - toDottedNotation(bigInt: bigint) { - if (this.version === 4) { - return ( - [(bigInt >> BigInt(24) & BigInt(255)), (bigInt >> BigInt(16) & BigInt(255)), - (bigInt >> BigInt(8) & BigInt(255)), - (bigInt & BigInt(255)), - ].join('.') - ); - } - else { - let hex = bigInt.toString(16); - const groups = []; - while (hex.length < 32) { - hex = `0${hex}`; - } - for (let i = 0; i < 8; i++) { - groups.push(hex.slice(i * 4, (i + 1) * 4)); - } - return groups.join(':'); - } - } - - /** - * toBinary - Converts decimal IP to full-length binary representation. - * @return {string} -> 01111111000000000000000000000001 - */ - toBinary() { - if (this.integer === 0n) { - this.toInteger(); - } - let binary = this.integer.toString(2); - const markLen = this.version === 4 ? 32 : 128; - - if (binary.length < markLen) { - while (binary.length < markLen) { - binary = `0${binary}`; - } - } - return binary; - } - - /** - * toHEX - Converts both IP versions to hexadecimal representation. - * @return {string} -> 7f000001 - */ - toHEX() { - if (this.integer === 0n) { - this.toInteger(); - } - return this.integer.toString(16); - } - - /** - * toCompressed - Compress an IP address to its shortest possible form. - * IP('127.1.0.0').toCompressed - * @return {string} -> "127.1" - */ - toCompressed(addr: string, ver: number) { - if (ver === 4) { - const splittedAddr = addr.split('.'); - const sRange = [[1, 3], [2, 2], [3, 1], [0, 0]]; - - for (let i = splittedAddr.length - 1; i >= 0; i--) { - if (splittedAddr[i] === '0') { - continue; - } - else { - splittedAddr.splice(sRange[i][0], sRange[i][1]); - this.short = splittedAddr.join('.'); - return this.short; - } - } - } - else { - const splitted = addr.split(':'); - // finding longest zero group - const [startOfLongest, longestLength] = _longestZerosGroup(splitted); - // 'N/A' - _longestZerosGroup fn return in case if there is NO - // '0000' blocks in address - if (startOfLongest !== 'N/A' || longestLength !== 'N/A') { - splitted.splice(Number(startOfLongest), Number(longestLength), ''); - if (startOfLongest === 0) { - splitted.unshift(''); - } - if (Number(startOfLongest) + Number(longestLength) === 8) { - splitted.push(''); - } - } - - // removing single '0000' blocks and leading zeros - for (let i = 0; i < splitted.length; i++) { - if (splitted[i] === '0000') { - splitted.splice(i, 1, '0'); - } - - loopStr: - for (let j = 0; j < splitted[i].length; j++) { - if (splitted[i][j] === '0' && splitted[i] !== '0') { - splitted[i] = splitted[i].substring(j + 1); - j--; - continue; - } - else { - break loopStr; - } - } - } - this.short = splitted.join(':'); - return this.short; - } - } - - // Private methods - - /** - * checkVersion - Determins this IP version. - * @private - * @param {string} addr - * @return {number} -> 4 or 6 - */ - _checkVersion(addr: string) { - // matches all possible chars in both versions of IP - const reGen = /^[0-9a-f.:]+$/i; - if (reGen.test(addr)) { - // checks if there is .. and more or whole IP is just a dot - const reDots = /\.{2,}|^\.{1}$/; - // checks if there is ::: and more or whole IP is just a colon - const reColon = /:{3,}|^:{1}$/; - // checks if there is only digits in integer IP - const reNum = /^[0-9]+$/; - - if (reNum.test(addr)) { - const parsedAddr = BigInt(addr); - if (parsedAddr > IPv6MAX || parsedAddr <= 0) { - throw new Error('Tips: IP address cant be bigger than 2 to the 128-th power or negative number'); - } - else if (parsedAddr <= IPv4MAX) { - return 4; - } - else if (parsedAddr > IPv4MAX) { - return 6; - } - } - else if (addr.includes('.') && !reDots.test(addr)) { - return 4; - } - else if (addr.includes(':') && !reColon.test(addr)) { - return 6; - } - } - throw new Error('Tips: Please, enter a valid IP address (Like "127.1.0.0", long integer, short or long IPv6)'); - } - - /** - * checkAddress - Validates this IP address. - * @private - * @return {string} as a valid address - */ - _checkAddress(addr: string, v: number) { - const reNum = /^[0-9]+$/; - if (reNum.test(addr)) { - this.integer = BigInt(addr); - return this.toDottedNotation(this.integer); - } - - const splittedAddr = addr.split(v === 4 ? '.' : ':'); - - if (v === 6 && splittedAddr.length < 8) { - const dbColon = (addr.match(/::/g) || []).length; - if (dbColon !== 1) { - throw new Error('Tips: Please, enter a valid IP address (Like "127.1.0.0", long integer, short or long IPv6)'); - } - } - - if ((v === 4 ? this._isIPv4 : this._isIPv6).call(this, splittedAddr)) { // TODO: make ifs more readable - if (splittedAddr.length === (v === 4 ? 4 : 8) && this.short === '') { - return addr; - } - else { - return this._toRepresentation(splittedAddr); - } - } - else { - throw new Error('Tips: Please, enter a valid IP address (Like "127.1.0.0", long integer, short or long IPv6)'); - } - } - - /** - * _isIPv6 - Validates IPv6. - * @private - * @return {boolean} whether splitted address is valid IPv6 or not - */ - _isIPv6(splittedAddr: string[]) { - if (splittedAddr.length <= 8) { - let checked = false; - const [isShort, cleanedAddr] = this._isShort(splittedAddr); - - const regex = /^[0-9a-f]{1,4}$/i; - const isValid = function (hextet: string) { - return regex.test(hextet); - }; - checked = (cleanedAddr as string[]).every(isValid); - - if (checked && isShort) { - this.short = splittedAddr.join(':'); - } - return checked; - } - else { - throw new Error('Tips: IPv6 cannot contain more than 8 bytes'); - } - } - - /** - * _isIPv4 - Validates IPv4. - * @private - * @return {boolean} whether splitted address is valid IPv4 or not - */ - _isIPv4(splittedAddr: string[]) { - if (splittedAddr.length <= 4) { - if (splittedAddr.length < 4) { - this.short = splittedAddr.join('.'); - } - const isValid = function (octet: string) { - return (!!((Number(octet) <= 255 && Number(octet) >= 0))); - }; - return splittedAddr.every(isValid); - } - else { - throw new Error('Tips: IPv4 cannot contain more than 4 bytes'); - } - } - - /** - * _isShort - checks if IPv6 addres was compressed like this "234:f:34:34:1:1:2:2" or like "1234::1234:1234" and removes empty strings for future validation - * @private - * @param {array} splittedAddr - * @return {array} with both results boolean and cleaned array - */ - _isShort(splittedAddr: string[]) { - let isShort = false; - const cleanedAddr = [...splittedAddr]; - for (let i = 0; i < cleanedAddr.length; i++) { - if (cleanedAddr[i].length === 0) { - cleanedAddr.splice(i, 1); - isShort = true; - i--; // code chunk similar to toCompressed method - // for addr '::1' can happen that there are 2 empty strings - // together, so by i-- we check every el of array but not next but one - } - else if (cleanedAddr[i].length < 4) { - isShort = true; - } - } - return [isShort, cleanedAddr]; - } - - /** - * toRepresentation - Converts short version to canonical representation of IP. - * IP('::1').address - * @private - * @param {array} splittedAddr - * @return {string} -> "0000:0000:0000:0000:0000:0000:0000:0001" - */ - _toRepresentation(splittedAddr: string[]) { - if (this.version === 4) { - for (let i = 0; i <= 4; i++) { - if (splittedAddr[i] === '') { - let missOcts = 5 - splittedAddr.length; - let flag = true; - while (missOcts > 0) { - if (flag) { - splittedAddr.splice(i, 1, '0'); - missOcts--; - flag = false; - } - else { - splittedAddr.splice(i, 0, '0'); - missOcts--; - } - } - } - } - while (splittedAddr.length < 4) { - splittedAddr.push('0'); - } - return splittedAddr.join('.'); - } - else { - for (let i = 0; i <= 8; i++) { - if (splittedAddr[i] === '') { - let missHex = 9 - splittedAddr.length; - let flag = true; - while (missHex > 0) { - if (flag) { - splittedAddr.splice(i, 1, '0000'); - missHex--; - flag = false; - } - else { - splittedAddr.splice(i, 0, '0000'); - missHex--; - } - } - } - } - for (let i = 0; i < splittedAddr.length; i++) { - if (splittedAddr[i].length < 4) { - let missNum = 4 - splittedAddr[i].length; - while (missNum > 0) { - splittedAddr[i] = `0${splittedAddr[i]}`; - missNum--; - } - } - } - } - return splittedAddr.join(':'); - } -}// IP class end - -/** - * longestZerosGroup - Helper fn counting longest consecutive zeros for shortening IPv6 - * "0000:0000:0000:0000:0000:0000:0000:0001" - * @private - * @param {array} zeros - * @return {array} -> [0, 7] - */ -function _longestZerosGroup(splittedAddr: string[]) { - let curr = 0; - let currLongest = 0; - let startOfLongest = 0; - let hasZeros = false; - - while (curr < splittedAddr.length - 2) { - const startOfRun = curr; - while (curr < splittedAddr.length && splittedAddr[curr] === '0000') { - hasZeros = true; - curr++; - } - - if ((curr - startOfRun) > currLongest) { - startOfLongest = startOfRun; - currLongest = curr - startOfRun; - } - curr++; - } - return hasZeros ? [startOfLongest, currLongest] : ['N/A', 'N/A']; -} diff --git a/src/libs/ip_calculator/ipv4registry.json b/src/libs/ip_calculator/ipv4registry.json deleted file mode 100644 index 91b262c7..00000000 --- a/src/libs/ip_calculator/ipv4registry.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - ["0.0.0.0", [8, "This host on this network"]], - ["10.0.0.0", [8, "Private-Use"]], - ["100.64.0.0", [10, "Shared Address Space"]], - ["127.0.0.0", [8, "Loopback"]], - ["169.254.0.0", [16, "Link Local"]], - ["172.16.0.0", [12, "Private-Use"]], - ["192.0.0.0", [24, "IETF Protocol Assignments"]], - ["192.0.0.0", [29, "IPv4 Service Continuity Prefix"]], - ["192.0.0.8", [32, "IPv4 dummy address"]], - ["192.0.0.9", [32, "Port Control Protocol Anycast"]], - ["192.0.0.10", [32, "Traversal Using Relays around NAT Anycast"]], - ["192.0.0.170", [32, "NAT64/DNS64 Discovery"]], - ["192.0.0.171", [32, "NAT64/DNS64 Discovery"]], - ["192.0.2.0", [24, "Documentation (TEST-NET-1)"]], - ["192.31.196.0", [24, "AS112-v4"]], - ["192.52.193.0", [24, "AMT"]], - ["192.88.99.0", [24, "Deprecated (6to4 Relay Anycast)"]], - ["192.168.0.0", [16, "Private Use"]], - ["192.175.48.0", [24, "Direct Delegation AS112 Service"]], - ["198.18.0.0", [15, "Benchmarking"]], - ["198.51.100.0", [24, "Documentation (TEST-NET-2)"]], - ["203.0.113.0", [24, "Documentation (TEST-NET-3)"]], - ["240.0.0.0", [4, "Reserved"]], - ["255.255.255.255", [32, "Limited Broadcast"]] -] \ No newline at end of file diff --git a/src/libs/ip_calculator/ipv6registry.json b/src/libs/ip_calculator/ipv6registry.json deleted file mode 100644 index c419b4d1..00000000 --- a/src/libs/ip_calculator/ipv6registry.json +++ /dev/null @@ -1,24 +0,0 @@ -[ - ["::1", [128, "Loopback Address"]], - ["::", [128, "Unspecified Address"]], - ["::", [128, "Unspecified Address"]], - ["::ffff:0:0", [98, "IPv4-mapped Address"]], - ["64:ff9b::", [96, "IPv4-IPv6 Translat."]], - ["64:ff9b:1::", [48, "IPv4-IPv6 Translat."]], - ["100::", [64, "Discard-Only Address Block"]], - ["2001::", [23, "IETF Protocol Assignments"]], - ["2001::", [32, "TEREDO"]], - ["2001:1::1", [128, "Port Control Protocol Anycast"]], - ["2001:1::2", [128, "Traversal Using Relays around NAT Anycast"]], - ["2001:2::", [48, "Benchmarking"]], - ["2001:3::", [32, "AMT"]], - ["2001:4:112::", [48, "AS112-v6"]], - ["2001:5::", [32, "EID Space for LISP (Managed by RIPE NCC)"]], - ["2001:10::", [28, "Deprecated (previously ORCHID)"]], - ["2001:20::", [28, "ORCHIDv2"]], - ["2001:db8::", [32, "Documentation"]], - ["2002::", [16, "6to4"]], - ["2620:4f:8000::", [48, "Direct Delegation AS112 Service"]], - ["fc00::", [7, "Unique-Local"]], - ["fe80::", [10, "Link-Local Unicast"]] - ] \ No newline at end of file diff --git a/src/libs/ip_calculator/network.ts b/src/libs/ip_calculator/network.ts deleted file mode 100644 index 9ffcdc74..00000000 --- a/src/libs/ip_calculator/network.ts +++ /dev/null @@ -1,229 +0,0 @@ -import IP from './ip'; -import ipv4registry from './ipv4registry.json'; -import ipv6registry from './ipv6registry.json'; - -const IPv4MAX = (BigInt(2) ** BigInt(32)) - BigInt(1); -const IPv6MAX = (BigInt(2) ** BigInt(128)) - BigInt(1); - -// IP range specific information, see IANA allocations. -// http://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml -const _ipv4Registry = new Map(ipv4registry.map(v => [v[0] as string, v[1]])); - -// https://www.iana.org/assignments/iana-ipv6-special-registry/iana-ipv6-special-registry.xhtml -const _ipv6Registry = new Map(ipv6registry.map(v => [v[0] as string, v[1]])); - -/** -* Network slice calculations. -* @class Network -* @param {string} address -* @param {integer} prefix -* host = new IP("127.128.99.3",8) -* @return {object} -> IP{address:"127.128.99.3", prefix: 8} -*/ - -export default class Network extends IP { - prefix: bigint; - /** - * Extends IP class. Calls the parent class IP with the parameters passed to Network. - * @constructor - */ - constructor(address: string, prefix: number) { - super(address); - this.prefix = this._checkPrefix(prefix); - } - - // Private methods - - /** - * _checkPrefix - Returns this IP prefix and validates it - * @private - * @return {integer} -> prefix: 25n - */ - _checkPrefix(prefix: number) { - if (this.version === 4) { - if (prefix > 0 && prefix <= 32) { - return BigInt(prefix); - } - } - else { - if (prefix > 0 && prefix <= 128) { - return BigInt(prefix); - } - } - throw new Error('Tips: Invalid prefix'); - } - - // Public methods - - /** - * printInfo - Shows IANA allocation information for the current IP address. - * @return {string} ->LOOPBACK - */ - printInfo() { - const results = []; - for (const [addr, info] of (this.version === 4 ? _ipv4Registry : _ipv6Registry).entries()) { - const found = this.contains(this.address, addr, Number(info[0])); - if (found) { - results.unshift(info[1]); - } - } - return results.length === 0 ? 'Unknown' : results[0]; - } - - /** - * maskToInteger - Returns network mask as bigInt - * @return {BigInt} -> 4278190080n - */ - maskToInteger() { - if (this.version === 4) { - return (IPv4MAX >> (BigInt(32) - this.prefix)) << (BigInt(32) - this.prefix); - } - else { - return (IPv6MAX >> (BigInt(128) - this.prefix)) << (BigInt(128) - this.prefix); - } - } - - /** - * getMask - Returns mask from the prefix - * @return {string} -> 255.255.0.0 - */ - getMask() { - return this.toDottedNotation(this.maskToInteger()); - } - - /** - * networkToInteger - Returns network as bigInt. - * @return {BigInt} -> 21307064320 - */ - networkToInteger() { - return this.toInteger() & this.maskToInteger(); - } - - /** - * getNetwork - Returns network part of the address - * @return {string} -> 127 - */ - getNetwork() { - return this.toDottedNotation(this.networkToInteger()); - } - - /** - * getBroadcast - Calculates broadcast.IPv6 doesn't have a broadcast - * address, but it's used for other calculations such as Network.hostLast. - * @return {string} -> 127.255.255.255 - */ - getBroadcast() { - return this.version === 4 - ? this.toDottedNotation(this.broadcastToLong()) - : 'IPv6 doesnt have broadcast address'; - } - - /** - * broadcastToLong - Returns broadcast as long. - * @return {BigInt} ->2147483647 - */ - broadcastToLong() { - if (this.version === 4) { - return this.networkToInteger() | (IPv4MAX - this.maskToInteger()); - } - else { - return this.networkToInteger() | (IPv6MAX - this.maskToInteger()); - } - } - - /** - * hostFirst - Calculates first available host in this subnet. - * @return {string} ->127.0.0.1 - */ - hostFirst() { - const isSmall4 = this.version === 4 && this.prefix > BigInt(30); - let first; - - if (this.version === 6) { - first = this.getNetwork(); - } - else if (isSmall4) { - return 'N/A'; - } - else { - first = this.toDottedNotation(this.networkToInteger() + BigInt(1)); - } - return this.toCompressed(first, this.version); - } - - /** - * hostLast - Calculates last available host in this subnet. - * @return {string} ->127.255.255.255 - */ - hostLast() { - const isLast4 = this.version === 4 && this.prefix === BigInt(32); - const isLast6 = this.version === 6 && this.prefix === BigInt(128); - const isPrev4 = this.version === 4 && this.prefix === BigInt(31); - const isPrev6 = this.version === 6 && this.prefix === BigInt(127); - let last; - - if (isLast4 || isLast6 || isPrev4) { - return 'N/A'; - } - else if (isPrev6) { - last = this.address; - } - else if (this.version === 4) { - last = this.toDottedNotation(this.broadcastToLong() - BigInt(1)); - } - else { - last = this.toDottedNotation(this.broadcastToLong()); - } - return this.toCompressed(last, this.version); - } - - /** - * contains - Check if thisIP is part of the network - * @param {string} thisIP - * @param {string} otherIP - * @param {number} prefix - * @return {boolean} - */ - contains(thisIP: string, otherIP: string, prefix: number) { - const other = new Network(otherIP, prefix); - const thisNetwork = this.networkToInteger(); - const otherNetwork = other.networkToInteger(); - const smaller = (thisNetwork <= otherNetwork) - && (otherNetwork <= this.broadcastToLong()); - const bigger = (otherNetwork <= thisNetwork) - && (thisNetwork <= other.broadcastToLong()); - return smaller || bigger; - } - - /** - * hostRange - Generates a range of usable host IP addresses within the network. - * @return {array} -> ['127.0.0.1','127.255.255.255'] - */ - hostRange() { - const range = []; - range.push(this.hostFirst()); - range.push(this.hostLast()); - return range; - } - - /** - * networkSize - Returns number of ips within the network. - * @return {number} -> 16777214 - */ - networkSize() { - const size = BigInt(2) ** ((this.version === 4 ? BigInt(32) : BigInt(128)) - this.prefix); - - if (this.version === 4 && this.prefix < BigInt(30)) { - return size - BigInt(2); - } - return size; - } - - /** - * networkCount - Returns number of network fo the prefix. - * @return {number} -> 16777214 - */ - networkCount() { - return this.prefix <= 64 ? (BigInt(2) ** BigInt(64n - this.prefix)).toString() : ''; - } -} diff --git a/src/tools/ipv6-subnet-calculator/ipv6-subnet-calculator.vue b/src/tools/ipv6-subnet-calculator/ipv6-subnet-calculator.vue index e9f1c660..df4c79aa 100644 --- a/src/tools/ipv6-subnet-calculator/ipv6-subnet-calculator.vue +++ b/src/tools/ipv6-subnet-calculator/ipv6-subnet-calculator.vue @@ -1,102 +1,116 @@