Skip to content
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

fix: Handle valid CIDR ranges for IPv4 and IPv6 #394

Merged
merged 3 commits into from
Dec 3, 2024
+9 −1
Merged

fix: Handle valid CIDR ranges for IPv4 and IPv6 #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71beed1
fix: add case 43 (ipcidr) to fix the ipcidr range bug
acul71 Nov 29, 2024
5b739f1
Update src/convert.ts
acul71 Dec 2, 2024
8b3aa9f
Update src/convert.ts
acul71 Dec 2, 2024
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
6 changes: 6 additions & 0 deletions src/convert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export function convert (proto: string, a: string | Uint8Array): Uint8Array | st
/**
* Convert [code,Uint8Array] to string
*/
// eslint-disable-next-line complexity
export function convertToString (proto: number | string, buf: Uint8Array): string {
const protocol = getProtocol(proto)
switch (protocol.code) {
Expand All @@ -40,6 +41,8 @@ export function convertToString (proto: number | string, buf: Uint8Array): strin
return bytes2ip(buf)
case 42: // ipv6zone
return bytes2str(buf)
case 43: // ipcidr
return uint8ArrayToString(buf, 'base10')

case 6: // tcp
case 273: // udp
Expand Down Expand Up @@ -71,6 +74,7 @@ export function convertToString (proto: number | string, buf: Uint8Array): strin
}
}

// eslint-disable-next-line complexity
export function convertToBytes (proto: string | number, str: string): Uint8Array {
const protocol = getProtocol(proto)
switch (protocol.code) {
Expand All @@ -80,6 +84,8 @@ export function convertToBytes (proto: string | number, str: string): Uint8Array
return ip2bytes(str)
case 42: // ipv6zone
return str2bytes(str)
case 43: // ipcidr
return uint8ArrayFromString(str, 'base10')

case 6: // tcp
case 273: // udp
Expand Down
4 changes: 3 additions & 1 deletion test/filter/multiaddr-filter.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ describe('MultiaddrFilter', () => {
['/ip4/192.168.10.10/ipcidr/24', '/ip4/192.168.11.2/udp/60', false],
['/ip4/192.168.10.10/ipcidr/24', '/ip6/2001:db8:3333:4444:5555:6666:7777:8888/tcp/60', false],
['/ip6/2001:db8:3333:4444:5555:6666:7777:8888/ipcidr/60', '/ip6/2001:0db8:3333:4440:0000:0000:0000:0000/tcp/60', true],
['/ip6/2001:db8:3333:4444:5555:6666:7777:8888/ipcidr/60', '/ip6/2001:0db8:3333:4450:0000:0000:0000:0000/tcp/60', false]
['/ip6/2001:db8:3333:4444:5555:6666:7777:8888/ipcidr/60', '/ip6/2001:0db8:3333:4450:0000:0000:0000:0000/tcp/60', false],
['/ip6/2001:db8:3333:4444:5555:6666:7777:8888/ipcidr/128', '/ip6/2001:db8:3333:4444:5555:6666:7777:8888/tcp/60', true],
['/ip6/2001:db8:3333:4444:5555:6666:7777:8888/ipcidr/128', '/ip6/2001:db8:3333:4444:5555:6666:7777:8880/tcp/60', false]
]

cases.forEach(([cidr, ip, result]) => {
Expand Down
Loading