Skip to content

fix: match ip6 zones and ip cidr in ip matchers #61

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

Merged
merged 1 commit into from
Jul 7, 2025
Merged

fix: match ip6 zones and ip cidr in ip matchers #61

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
13 changes: 10 additions & 3 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* ```
*/

import { CODE_P2P, CODE_DNS4, CODE_DNS6, CODE_DNSADDR, CODE_DNS, CODE_IP4, CODE_IP6, CODE_TCP, CODE_UDP, CODE_QUIC, CODE_QUIC_V1, CODE_WS, CODE_WSS, CODE_TLS, CODE_SNI, CODE_WEBRTC_DIRECT, CODE_CERTHASH, CODE_WEBTRANSPORT, CODE_P2P_CIRCUIT, CODE_WEBRTC, CODE_HTTP, CODE_UNIX, CODE_HTTPS, CODE_MEMORY } from '@multiformats/multiaddr'
import { CODE_P2P, CODE_DNS4, CODE_DNS6, CODE_DNSADDR, CODE_DNS, CODE_IP4, CODE_IP6, CODE_TCP, CODE_UDP, CODE_QUIC, CODE_QUIC_V1, CODE_WS, CODE_WSS, CODE_TLS, CODE_SNI, CODE_WEBRTC_DIRECT, CODE_CERTHASH, CODE_WEBTRANSPORT, CODE_P2P_CIRCUIT, CODE_WEBRTC, CODE_HTTP, CODE_UNIX, CODE_HTTPS, CODE_MEMORY, CODE_IP6ZONE, CODE_IPCIDR } from '@multiformats/multiaddr'
import { and, or, optional, fmt, code, value } from './utils.js'
import type { Multiaddr, Component } from '@multiformats/multiaddr'

Expand Down Expand Up @@ -159,8 +159,15 @@ export const DNSADDR = fmt(_DNSADDR, optional(value(CODE_P2P)))
*/
export const DNS = fmt(or(_DNS, _DNSADDR, _DNS4, _DNS6), optional(value(CODE_P2P)))

const _IP4 = value(CODE_IP4)
const _IP6 = value(CODE_IP6)
const _IP4 = and(
value(CODE_IP4),
optional(value(CODE_IPCIDR))
)
const _IP6 = and(
optional(value(CODE_IP6ZONE)),
value(CODE_IP6),
optional(value(CODE_IPCIDR))
)
const _IP = or(_IP4, _IP6)

const _IP_OR_DOMAIN = or(_IP, _DNS, _DNS4, _DNS6, _DNSADDR)
Expand Down
10 changes: 9 additions & 1 deletion src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,15 @@ export const code = (code: number): Matcher => {
match: (vals) => {
const component = vals[0]

if (component?.code !== code) {
if (component == null) {
return false
}

if (component.code !== code) {
return false
}

if (component.value != null) {
return false
}

Expand Down
14 changes: 8 additions & 6 deletions test/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,19 @@ describe('multiaddr matcher', () => {
const exactIP = [
'/ip4/0.0.0.0',
'/ip6/fc00::',
'/ip6/fe80::8cb1:25ff:fec5:28e3'
// https://github.com/ChainSafe/is-ip/issues/9
// '/ip6/fe80::8cb1:25ff:fec5:28e3%llw0'
'/ip6/fe80::8cb1:25ff:fec5:28e3',
'/ip6/fe80::1cc1:a3b8:322f:cf22/ipcidr/24',
'/ip6zone/utun0/ip6/fe80::1cc1:a3b8:322f:cf22',
'/ip6zone/llw0/ip6/fe80::1cc1:a3b8:322f:cf22/ipcidr/24'
]

const goodIP = [
...exactIP,
'/ip4/123.123.123.123/tcp/80',
'/ip6/fe80::1cc1:a3b8:322f:cf22/udp/4921/wss'
// https://github.com/ChainSafe/is-ip/issues/9
// '/ip6/fe80::1cc1:a3b8:322f:cf22%utun0/udp/4921/wss'
'/ip6/fe80::1cc1:a3b8:322f:cf22/udp/4921/wss',
'/ip6/fe80::1cc1:a3b8:322f:cf22/ipcidr/24/tcp/1234/tls/ws',
'/ip6zone/utun0/ip6/fe80::1cc1:a3b8:322f:cf22/udp/4921',
'/ip6zone/llw0/ip6/fe80::1cc1:a3b8:322f:cf22/ipcidr/24/udp/4921'
]

const badIP = [
Expand Down