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
7 changes: 4 additions & 3 deletions lib/ipaddr.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@
colonCount--;
}

// The following loop would hang if colonCount > parts
if (colonCount > parts) {
// An address must not contain more separators than available parts,
// and :: must compress at least one part.
if (colonCount >= parts) {
return null;
}

Expand Down Expand Up @@ -91,7 +92,7 @@
const results = [];

for (let i = 0; i < ref.length; i++) {
results.push(parseInt(ref[i], 16));
results.push(ref[i].length > 4 ? NaN : parseInt(ref[i], 16));
}

return results;
Expand Down
19 changes: 19 additions & 0 deletions test/ipaddr.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,25 @@ describe('ipaddr', () => {
assert.equal(ipaddr.IPv6.isValid(undefined), false);
})

it('rejects IPv6 parts longer than four hexadecimal digits', () => {
assert.equal(ipaddr.IPv6.isValid('00000::1'), false);
assert.throws(() => ipaddr.IPv6.parse('00000::1'));
assert.equal(ipaddr.IPv6.isValid('00000:0:0:0:0:0:1.2.3.4'), false);
assert.throws(() => ipaddr.IPv6.parse('00000:0:0:0:0:0:1.2.3.4'));
})

it('rejects compression of zero IPv6 parts', () => {
assert.equal(ipaddr.IPv6.isValid('1:2:3:4:5:6:7:8::'), false);
assert.throws(() => ipaddr.IPv6.parse('1:2:3:4:5:6:7:8::'));
assert.equal(ipaddr.IPv6.isValid('::1:2:3:4:5:6:7:8'), false);
assert.throws(() => ipaddr.IPv6.parse('::1:2:3:4:5:6:7:8'));
})

it('does not reject compression of exactly one IPv6 part', () => {
assert.equal(ipaddr.IPv6.isValid('1:2:3:4:5:6:7::'), true);
assert.equal(ipaddr.IPv6.isValid('::1:2:3:4:5:6:7'), true);
})

it('validates IPv6 addresses in CIDR notation', () => {
assert.equal(ipaddr.IPv6.isValidCIDR('::/0'), true);
assert.equal(ipaddr.IPv6.isValidCIDR('2001:db8:F53A::1%z/64'), true);
Expand Down