Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/ip.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ describe('lib/ip', () => {
it('should work fine for IPv4', () => {
assert.strictEqual(ip.validate('64.4.4.4'), true);
assert.strictEqual(ip.validate('64.4.4.boom!'), false);
// @ts-ignore
// @ts-expect-error
assert.strictEqual(ip.validate(undefined), false);
assert.strictEqual(ip.validate('kraken'), false);
});
Expand Down
26 changes: 21 additions & 5 deletions src/ip.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,23 @@
import net from 'net';
// Borrowed from https://github.com/nodejs/node/blob/main/lib/internal/net.js
// IPv4 Segment
const v4Seg = '(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])';
const v4Str = `(?:${v4Seg}\\.){3}${v4Seg}`;
const IPv4Reg = new RegExp(`^${v4Str}$`);

// IPv6 Segment
const v6Seg = '(?:[0-9a-fA-F]{1,4})';
const IPv6Reg = new RegExp(
'^(?:' +
`(?:${v6Seg}:){7}(?:${v6Seg}|:)|` +
`(?:${v6Seg}:){6}(?:${v4Str}|:${v6Seg}|:)|` +
`(?:${v6Seg}:){5}(?::${v4Str}|(?::${v6Seg}){1,2}|:)|` +
`(?:${v6Seg}:){4}(?:(?::${v6Seg}){0,1}:${v4Str}|(?::${v6Seg}){1,3}|:)|` +
`(?:${v6Seg}:){3}(?:(?::${v6Seg}){0,2}:${v4Str}|(?::${v6Seg}){1,4}|:)|` +
`(?:${v6Seg}:){2}(?:(?::${v6Seg}){0,3}:${v4Str}|(?::${v6Seg}){1,5}|:)|` +
`(?:${v6Seg}:){1}(?:(?::${v6Seg}){0,4}:${v4Str}|(?::${v6Seg}){1,6}|:)|` +
`(?::(?:(?::${v6Seg}){0,5}:${v4Str}|(?::${v6Seg}){1,7}|:))` +
')(?:%[0-9a-zA-Z-.:]{1,})?$'
);

const parseIPv4 = (input: string): number[] => {
const ip = input.split('.', 4);
Expand Down Expand Up @@ -69,10 +88,7 @@ const bitAt = (rawAddress: Buffer | number[], idx: number): number => {
return (rawAddress[bufIdx] >>> bitIdx) & 1;
};

const validate = (ip: string): boolean => {
const version = net.isIP(ip);
return version === 4 || version === 6;
};
const validate = (ip: string): boolean => IPv4Reg.test(ip) || IPv6Reg.test(ip);

export default {
bitAt,
Expand Down