Skip to content

BREAKING CHANGE: Fix big number addition, bump typescript version #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonluca wants to merge 1 commit into
base: main
Choose a base branch
from
Open

BREAKING CHANGE: Fix big number addition, bump typescript version #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 40 additions & 22 deletions index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { toLong, fromLong } from 'ip';
// @ts-ignore
import { Address4, Address6 } from 'ip-address';

import { toLong, fromLong } from "ip";
import { Address4, Address6 } from "ip-address";
import { BigInteger } from "jsbn";
// Set default max range
let maxRange = 10000;

Expand Down Expand Up @@ -31,37 +30,48 @@ const getRangev4 = (ip1: string, ip2: string) => {

// Prevent DoS
if (totalIPs > maxRange) {
throw new Error(`Too many IPs in range. Total number: ${totalIPs}. Max count is ${maxRange}, to increase, set the limit with the MAX_RANGE environment variable`)
throw new Error(
`Too many IPs in range. Total number: ${totalIPs}. Max count is ${maxRange}, to increase, set the limit with the MAX_RANGE environment variable`
);
}

for (firstAddressLong; firstAddressLong <= lastAddressLong; firstAddressLong++)
for (
firstAddressLong;
firstAddressLong <= lastAddressLong;
firstAddressLong++
)
ips.push(fromLong(firstAddressLong));

return ips;
};

const getRangev6 = (ip1: string, ip2: string) => {
const ips = [];
const getRangev6 = (ip1: string, ip2: string): string[] => {
const ips: string[] = [];

const firstAddress = new Address6(ip1);
const lastAddress = new Address6(ip2);

for (let i = firstAddress.bigInteger(); i <= lastAddress.bigInteger(); i++) {
const start = firstAddress.bigInteger();
const end = lastAddress.bigInteger();
const one = new BigInteger("1");

for (let i = start; i.compareTo(end) <= 0; i = i.add(one)) {
ips.push(Address6.fromBigInteger(i).correctForm());
}

return ips;
};

const isCIDR = (ipCIDR: Address4 | Address6): boolean => Boolean(ipCIDR.parsedSubnet);
const isCIDR = (ipCIDR: Address4 | Address6): boolean =>
Boolean(ipCIDR.parsedSubnet);

const isRange = (ipRange: string): boolean => ipRange.indexOf('-') !== -1;
const isRange = (ipRange: string): boolean => ipRange.indexOf("-") !== -1;

const getIPRange = (ip1: string, ip2?: string): string[] => {
if (process.env.MAX_RANGE && isNaN(parseInt(process.env.MAX_RANGE, 10))) {
throw new Error('MAX_RANGE must be an integer');
throw new Error("MAX_RANGE must be an integer");
}
maxRange = parseInt(process.env.MAX_RANGE || '10000', 10);
maxRange = parseInt(process.env.MAX_RANGE || "10000", 10);

const ip1v4 = getIPv4(ip1);
const ip1v6 = getIPv6(ip1);
Expand All @@ -72,41 +82,49 @@ const getIPRange = (ip1: string, ip2?: string): string[] => {
if (ip2) {
// IPv4
const ip2v4 = getIPv4(ip2);
if (ip1v4.valid && ip2v4.valid && !ip1v4.parsedSubnet && !ip2v4.parsedSubnet) {
if (ip1v4 && ip2v4 && !ip1v4.parsedSubnet && !ip2v4.parsedSubnet) {
return getRangev4(ip1v4.correctForm(), ip2v4.correctForm());
}

// IPv6
const ip2v6 = getIPv6(ip2);
if (ip1v6.valid && ip2v6.valid && !ip1v6.parsedSubnet && !ip2v6.parsedSubnet) {
if (ip1v6 && ip2v6 && !ip1v6.parsedSubnet && !ip2v6.parsedSubnet) {
return getRangev6(ip1v6.correctForm(), ip2v6.correctForm());
}

// IPs do not match version, or are invalid
throw new Error('Cannot get range of two IPs if they are not both valid and the same version');
throw new Error(
"Cannot get range of two IPs if they are not both valid and the same version"
);
}

//
// CIDR
//
if (isCIDR(ip1v4)) {
return getRangev4(ip1v4.startAddress().correctForm(), ip1v4.endAddress().correctForm());
if (ip1v4 && isCIDR(ip1v4)) {
return getRangev4(
ip1v4.startAddress().correctForm(),
ip1v4.endAddress().correctForm()
);
}

if (isCIDR(ip1v6)) {
return getRangev6(ip1v6.startAddress().correctForm(), ip1v6.endAddress().correctForm());
if (ip1v6 && isCIDR(ip1v6)) {
return getRangev6(
ip1v6.startAddress().correctForm(),
ip1v6.endAddress().correctForm()
);
}

//
// Hyphenated Range
//
if (isRange(ip1)) {
const [firstAddress, lastAddress] = ip1.split('-');
const [firstAddress, lastAddress] = ip1.split("-");
return getIPRange(firstAddress, lastAddress);
}

// Did not match any of the above
throw new Error('IP supplied is not valid');
throw new Error("IP supplied is not valid");
};

export { getIPRange };
Loading