@libp2p/utils 7.4.5-0d3ca9f0c → 7.4.5-228942556
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.min.js +4 -4
- package/dist/index.min.js.map +4 -4
- package/dist/src/abstract-stream-muxer.d.ts.map +1 -1
- package/dist/src/abstract-stream-muxer.js +6 -1
- package/dist/src/abstract-stream-muxer.js.map +1 -1
- package/dist/src/private-ip.d.ts.map +1 -1
- package/dist/src/private-ip.js +33 -62
- package/dist/src/private-ip.js.map +1 -1
- package/package.json +5 -7
- package/src/abstract-stream-muxer.ts +6 -1
- package/src/private-ip.ts +34 -73
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-stream-muxer.d.ts","sourceRoot":"","sources":["../../src/abstract-stream-muxer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAIvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAgD,WAAW,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjQ,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEpD,MAAM,WAAW,uBAAwB,SAAQ,kBAAkB;IACjE;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAA;IAEhB;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;OAEG;IACH,OAAO,CAAC,EAAE,YAAY,CAAA;CACvB;AAED,8BAAsB,mBAAmB,CAAE,WAAW,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,iBAAiB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAE,YAAW,WAAW,CAAC,WAAW,CAAC;IACpL,OAAO,EAAE,WAAW,EAAE,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,iBAAiB,CAAA;IAEhC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,MAAM,EAAE,aAAa,CAAA;IAC/B,SAAS,CAAC,aAAa,CAAC,EAAE,aAAa,CAAA;IACvC,SAAS,CAAC,YAAY,EAAE,WAAW,EAAE,CAAA;IACrC,SAAS,CAAC,eAAe,EAAE,MAAM,CAAA;IAEjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAc;gBAE1B,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,uBAAuB;
|
|
1
|
+
{"version":3,"file":"abstract-stream-muxer.d.ts","sourceRoot":"","sources":["../../src/abstract-stream-muxer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAIvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAgD,WAAW,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjQ,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEpD,MAAM,WAAW,uBAAwB,SAAQ,kBAAkB;IACjE;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAA;IAEhB;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;OAEG;IACH,OAAO,CAAC,EAAE,YAAY,CAAA;CACvB;AAED,8BAAsB,mBAAmB,CAAE,WAAW,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,iBAAiB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAE,YAAW,WAAW,CAAC,WAAW,CAAC;IACpL,OAAO,EAAE,WAAW,EAAE,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,iBAAiB,CAAA;IAEhC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,MAAM,EAAE,aAAa,CAAA;IAC/B,SAAS,CAAC,aAAa,CAAC,EAAE,aAAa,CAAA;IACvC,SAAS,CAAC,YAAY,EAAE,WAAW,EAAE,CAAA;IACrC,SAAS,CAAC,eAAe,EAAE,MAAM,CAAA;IAEjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAc;gBAE1B,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,uBAAuB;IA8CjE,IAAI,CAAE,IAAI,EAAE,UAAU,GAAG,cAAc,GAAG,OAAO;IAc3C,KAAK,CAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBnD,KAAK,CAAE,GAAG,EAAE,KAAK,GAAG,IAAI;IAcxB,iBAAiB,CAAE,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI;IAc/B,YAAY,CAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,WAAW,CAAC;IAoBxE;;;OAGG;IACH,cAAc,CAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAqB1C,OAAO,CAAC,aAAa;IAuBrB,gBAAgB,CAAC,CAAC,SAAS,MAAM,iBAAiB,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,uBAAuB,GAAG,IAAI;IAC9L,gBAAgB,CAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,uBAAuB,GAAG,IAAI;IAsBjH;;OAEG;IACH,QAAQ,CAAC,cAAc,CAAE,OAAO,EAAE,mBAAmB,GAAG,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAE1F;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAE,IAAI,EAAE,UAAU,GAAG,cAAc,GAAG,IAAI;CAC1D"}
|
|
@@ -29,7 +29,12 @@ export class AbstractStreamMuxer extends TypedEventEmitter {
|
|
|
29
29
|
this.onData(evt.data);
|
|
30
30
|
}
|
|
31
31
|
catch (err) {
|
|
32
|
-
|
|
32
|
+
try {
|
|
33
|
+
this.abort(err);
|
|
34
|
+
}
|
|
35
|
+
catch (abortErr) {
|
|
36
|
+
this.log.error('error aborting muxer - %e', abortErr);
|
|
37
|
+
}
|
|
33
38
|
this.maConn.abort(err);
|
|
34
39
|
}
|
|
35
40
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-stream-muxer.js","sourceRoot":"","sources":["../../src/abstract-stream-muxer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAuB3C,MAAM,OAAgB,mBAA0E,SAAQ,iBAAiD;IAChJ,OAAO,CAAe;IACtB,QAAQ,CAAQ;IAChB,MAAM,CAAmB;IAEtB,GAAG,CAAQ;IACX,MAAM,CAAe;IACrB,aAAa,CAAgB;IAC7B,YAAY,CAAe;IAC3B,eAAe,CAAQ;IAEhB,OAAO,CAAe;IAEvC,YAAa,MAAqB,EAAE,IAA6B;QAC/D,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;QAC7B,IAAI,CAAC,OAAO,GAAG,EAAE,CAAA;QACjB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAA;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACzC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAA;QACvC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,EAAE,CAAA;QACjD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAE3B,gDAAgD;QAChD,MAAM,oBAAoB,GAAG,CAAC,GAAuB,EAAQ,EAAE;YAC7D,IAAI,CAAC;gBACH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACvB,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"abstract-stream-muxer.js","sourceRoot":"","sources":["../../src/abstract-stream-muxer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"private-ip.d.ts","sourceRoot":"","sources":["../../src/private-ip.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"private-ip.d.ts","sourceRoot":"","sources":["../../src/private-ip.ts"],"names":[],"mappings":"AAmDA,wBAAgB,WAAW,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAgB5D"}
|
package/dist/src/private-ip.js
CHANGED
|
@@ -1,5 +1,15 @@
|
|
|
1
1
|
import { isIPv4, isIPv6 } from '@chainsafe/is-ip';
|
|
2
|
-
import {
|
|
2
|
+
import { parseIP } from '@chainsafe/is-ip/parse';
|
|
3
|
+
import { IpNet, iPv4FromIPv6, isIPv4mappedIPv6 } from '@chainsafe/netmask';
|
|
4
|
+
/**
|
|
5
|
+
* Private, reserved or special-purpose IP ranges
|
|
6
|
+
*
|
|
7
|
+
* Addresses are matched by their parsed bytes so the result does not depend on
|
|
8
|
+
* how an address is spelled (IPv6 compression, leading zeros, case).
|
|
9
|
+
*
|
|
10
|
+
* @see https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml
|
|
11
|
+
* @see https://www.iana.org/assignments/iana-ipv6-special-registry/iana-ipv6-special-registry.xhtml
|
|
12
|
+
*/
|
|
3
13
|
const PRIVATE_IP_RANGES = [
|
|
4
14
|
'0.0.0.0/8',
|
|
5
15
|
'10.0.0.0/8',
|
|
@@ -24,69 +34,30 @@ const PRIVATE_IP_RANGES = [
|
|
|
24
34
|
'198.51.100.0/24',
|
|
25
35
|
'203.0.113.0/24',
|
|
26
36
|
'240.0.0.0/4',
|
|
27
|
-
'255.255.255.255/32'
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
}
|
|
41
|
-
/**
|
|
42
|
-
* @see https://datatracker.ietf.org/doc/html/rfc4291#section-2.5.5.2
|
|
43
|
-
*/
|
|
44
|
-
function ipv4MappedIpv6Check(ipAddr) {
|
|
45
|
-
const parts = ipAddr.split(':');
|
|
46
|
-
if (parts.length < 2) {
|
|
47
|
-
return false;
|
|
48
|
-
}
|
|
49
|
-
const octet34 = parts[parts.length - 1].padStart(4, '0');
|
|
50
|
-
const octet12 = parts[parts.length - 2].padStart(4, '0');
|
|
51
|
-
const ip4 = `${parseInt(octet12.substring(0, 2), 16)}.${parseInt(octet12.substring(2), 16)}.${parseInt(octet34.substring(0, 2), 16)}.${parseInt(octet34.substring(2), 16)}`;
|
|
52
|
-
return ipv4Check(ip4);
|
|
53
|
-
}
|
|
54
|
-
/**
|
|
55
|
-
* @see https://datatracker.ietf.org/doc/html/rfc4291#section-2.2 example 3
|
|
56
|
-
*/
|
|
57
|
-
function isIpv4EmbeddedIpv6(ipAddr) {
|
|
58
|
-
return /^::ffff:([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/.test(ipAddr);
|
|
59
|
-
}
|
|
60
|
-
function ipv4EmbeddedIpv6Check(ipAddr) {
|
|
61
|
-
const parts = ipAddr.split(':');
|
|
62
|
-
const ip4 = parts[parts.length - 1];
|
|
63
|
-
return ipv4Check(ip4);
|
|
64
|
-
}
|
|
65
|
-
function ipv6Check(ipAddr) {
|
|
66
|
-
return /^::$/.test(ipAddr) ||
|
|
67
|
-
/^::1$/.test(ipAddr) ||
|
|
68
|
-
/^64:ff9b::([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/.test(ipAddr) ||
|
|
69
|
-
/^100::([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4})$/.test(ipAddr) ||
|
|
70
|
-
/^2001::([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4})$/.test(ipAddr) ||
|
|
71
|
-
/^2001:2[0-9a-fA-F]:([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4})$/.test(ipAddr) ||
|
|
72
|
-
/^2001:db8:([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4})$/.test(ipAddr) ||
|
|
73
|
-
/^2002:([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4})$/.test(ipAddr) ||
|
|
74
|
-
/^f[c-d]([0-9a-fA-F]{2,2}):/i.test(ipAddr) ||
|
|
75
|
-
/^fe[8-9a-bA-B][0-9a-fA-F]:/i.test(ipAddr) ||
|
|
76
|
-
/^ff([0-9a-fA-F]{2,2}):/i.test(ipAddr);
|
|
77
|
-
}
|
|
37
|
+
'255.255.255.255/32',
|
|
38
|
+
'::/128', // unspecified (RFC 4291)
|
|
39
|
+
'::1/128', // loopback (RFC 4291)
|
|
40
|
+
'64:ff9b::/96', // IPv4/IPv6 translation (RFC 6052)
|
|
41
|
+
'100::/64', // discard-only (RFC 6666)
|
|
42
|
+
'2001::/32', // Teredo (RFC 4380)
|
|
43
|
+
'2001:20::/28', // ORCHIDv2 (RFC 7343)
|
|
44
|
+
'2001:db8::/32', // documentation (RFC 3849)
|
|
45
|
+
'2002::/16', // 6to4 (RFC 3056)
|
|
46
|
+
'fc00::/7', // unique local (RFC 4193)
|
|
47
|
+
'fe80::/10', // link-local unicast (RFC 4291)
|
|
48
|
+
'ff00::/8' // multicast (RFC 4291)
|
|
49
|
+
].map(cidr => new IpNet(cidr));
|
|
78
50
|
export function isPrivateIp(ip) {
|
|
79
|
-
if (isIPv4(ip)) {
|
|
80
|
-
return
|
|
81
|
-
}
|
|
82
|
-
if (isIpv4MappedIpv6(ip)) {
|
|
83
|
-
return ipv4MappedIpv6Check(ip);
|
|
84
|
-
}
|
|
85
|
-
if (isIpv4EmbeddedIpv6(ip)) {
|
|
86
|
-
return ipv4EmbeddedIpv6Check(ip);
|
|
51
|
+
if (!isIPv4(ip) && !isIPv6(ip)) {
|
|
52
|
+
return;
|
|
87
53
|
}
|
|
88
|
-
|
|
89
|
-
|
|
54
|
+
const parsed = parseIP(ip);
|
|
55
|
+
if (parsed == null) {
|
|
56
|
+
return;
|
|
90
57
|
}
|
|
58
|
+
// check IPv4-mapped IPv6 (::ffff:0:0/96) against the IPv4 ranges, the length
|
|
59
|
+
// check matters as isIPv4mappedIPv6 also matches 0.0.0.0
|
|
60
|
+
const addr = parsed.length === 16 && isIPv4mappedIPv6(parsed) ? iPv4FromIPv6(parsed) : parsed;
|
|
61
|
+
return PRIVATE_IP_RANGES.some(net => net.contains(addr));
|
|
91
62
|
}
|
|
92
63
|
//# sourceMappingURL=private-ip.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"private-ip.js","sourceRoot":"","sources":["../../src/private-ip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"private-ip.js","sourceRoot":"","sources":["../../src/private-ip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE1E;;;;;;;;GAQG;AACH,MAAM,iBAAiB,GAAG;IACxB,WAAW;IACX,YAAY;IACZ,eAAe;IACf,aAAa;IACb,gBAAgB;IAChB,eAAe;IACf,cAAc;IACd,cAAc;IACd,cAAc;IACd,cAAc;IACd,eAAe;IACf,gBAAgB;IAChB,gBAAgB;IAChB,cAAc;IACd,iBAAiB;IACjB,iBAAiB;IACjB,gBAAgB;IAChB,gBAAgB;IAChB,iBAAiB;IACjB,eAAe;IACf,iBAAiB;IACjB,gBAAgB;IAChB,aAAa;IACb,oBAAoB;IACpB,QAAQ,EAAE,yBAAyB;IACnC,SAAS,EAAE,sBAAsB;IACjC,cAAc,EAAE,mCAAmC;IACnD,UAAU,EAAE,0BAA0B;IACtC,WAAW,EAAE,oBAAoB;IACjC,cAAc,EAAE,sBAAsB;IACtC,eAAe,EAAE,2BAA2B;IAC5C,WAAW,EAAE,kBAAkB;IAC/B,UAAU,EAAE,0BAA0B;IACtC,WAAW,EAAE,gCAAgC;IAC7C,UAAU,CAAC,uBAAuB;CACnC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;AAE9B,MAAM,UAAU,WAAW,CAAE,EAAU;IACrC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;QAC/B,OAAM;IACR,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC,CAAA;IAE1B,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;QACnB,OAAM;IACR,CAAC;IAED,6EAA6E;IAC7E,yDAAyD;IACzD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,KAAK,EAAE,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;IAE7F,OAAO,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;AAC1D,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@libp2p/utils",
|
|
3
|
-
"version": "7.4.5-
|
|
3
|
+
"version": "7.4.5-228942556",
|
|
4
4
|
"description": "Package to aggregate shared logic and dependencies for the libp2p ecosystem",
|
|
5
5
|
"license": "Apache-2.0 OR MIT",
|
|
6
6
|
"homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/utils#readme",
|
|
@@ -47,8 +47,8 @@
|
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"@chainsafe/is-ip": "^2.1.0",
|
|
49
49
|
"@chainsafe/netmask": "^2.0.0",
|
|
50
|
-
"@libp2p/interface": "3.4.0-
|
|
51
|
-
"@libp2p/logger": "6.2.16-
|
|
50
|
+
"@libp2p/interface": "3.4.0-228942556",
|
|
51
|
+
"@libp2p/logger": "6.2.16-228942556",
|
|
52
52
|
"@multiformats/multiaddr": "^13.0.3",
|
|
53
53
|
"@multiformats/multiaddr-matcher": "^3.0.2",
|
|
54
54
|
"@sindresorhus/fnv1a": "^3.1.0",
|
|
@@ -61,7 +61,6 @@
|
|
|
61
61
|
"it-pushable": "^3.2.3",
|
|
62
62
|
"it-stream-types": "^2.0.2",
|
|
63
63
|
"main-event": "^1.0.5",
|
|
64
|
-
"netmask": "^2.0.2",
|
|
65
64
|
"p-defer": "^4.0.1",
|
|
66
65
|
"p-event": "^8.0.1",
|
|
67
66
|
"progress-events": "^1.1.0",
|
|
@@ -72,9 +71,8 @@
|
|
|
72
71
|
"uint8arrays": "^6.1.1"
|
|
73
72
|
},
|
|
74
73
|
"devDependencies": {
|
|
75
|
-
"@libp2p/crypto": "5.2.0-
|
|
76
|
-
"@libp2p/peer-id": "6.0.18-
|
|
77
|
-
"@types/netmask": "^2.0.5",
|
|
74
|
+
"@libp2p/crypto": "5.2.0-228942556",
|
|
75
|
+
"@libp2p/peer-id": "6.0.18-228942556",
|
|
78
76
|
"aegir": "^48.1.1",
|
|
79
77
|
"benchmark": "^2.1.4",
|
|
80
78
|
"it-all": "^3.0.9",
|
|
@@ -55,7 +55,12 @@ export abstract class AbstractStreamMuxer <MuxedStream extends AbstractStream =
|
|
|
55
55
|
try {
|
|
56
56
|
this.onData(evt.data)
|
|
57
57
|
} catch (err: any) {
|
|
58
|
-
|
|
58
|
+
try {
|
|
59
|
+
this.abort(err)
|
|
60
|
+
} catch (abortErr: any) {
|
|
61
|
+
this.log.error('error aborting muxer - %e', abortErr)
|
|
62
|
+
}
|
|
63
|
+
|
|
59
64
|
this.maConn.abort(err)
|
|
60
65
|
}
|
|
61
66
|
}
|
package/src/private-ip.ts
CHANGED
|
@@ -1,6 +1,16 @@
|
|
|
1
1
|
import { isIPv4, isIPv6 } from '@chainsafe/is-ip'
|
|
2
|
-
import {
|
|
2
|
+
import { parseIP } from '@chainsafe/is-ip/parse'
|
|
3
|
+
import { IpNet, iPv4FromIPv6, isIPv4mappedIPv6 } from '@chainsafe/netmask'
|
|
3
4
|
|
|
5
|
+
/**
|
|
6
|
+
* Private, reserved or special-purpose IP ranges
|
|
7
|
+
*
|
|
8
|
+
* Addresses are matched by their parsed bytes so the result does not depend on
|
|
9
|
+
* how an address is spelled (IPv6 compression, leading zeros, case).
|
|
10
|
+
*
|
|
11
|
+
* @see https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml
|
|
12
|
+
* @see https://www.iana.org/assignments/iana-ipv6-special-registry/iana-ipv6-special-registry.xhtml
|
|
13
|
+
*/
|
|
4
14
|
const PRIVATE_IP_RANGES = [
|
|
5
15
|
'0.0.0.0/8',
|
|
6
16
|
'10.0.0.0/8',
|
|
@@ -25,83 +35,34 @@ const PRIVATE_IP_RANGES = [
|
|
|
25
35
|
'198.51.100.0/24',
|
|
26
36
|
'203.0.113.0/24',
|
|
27
37
|
'240.0.0.0/4',
|
|
28
|
-
'255.255.255.255/32'
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
function isIpv4MappedIpv6 (ipAddr: string): boolean {
|
|
42
|
-
return /^::ffff:([0-9a-fA-F]{1,4}):([0-9a-fA-F]{1,4})$/.test(ipAddr)
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
/**
|
|
46
|
-
* @see https://datatracker.ietf.org/doc/html/rfc4291#section-2.5.5.2
|
|
47
|
-
*/
|
|
48
|
-
function ipv4MappedIpv6Check (ipAddr: string): boolean {
|
|
49
|
-
const parts = ipAddr.split(':')
|
|
50
|
-
|
|
51
|
-
if (parts.length < 2) {
|
|
52
|
-
return false
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
const octet34 = parts[parts.length - 1].padStart(4, '0')
|
|
56
|
-
const octet12 = parts[parts.length - 2].padStart(4, '0')
|
|
57
|
-
|
|
58
|
-
const ip4 = `${parseInt(octet12.substring(0, 2), 16)}.${parseInt(octet12.substring(2), 16)}.${parseInt(octet34.substring(0, 2), 16)}.${parseInt(octet34.substring(2), 16)}`
|
|
59
|
-
|
|
60
|
-
return ipv4Check(ip4)
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
/**
|
|
64
|
-
* @see https://datatracker.ietf.org/doc/html/rfc4291#section-2.2 example 3
|
|
65
|
-
*/
|
|
66
|
-
function isIpv4EmbeddedIpv6 (ipAddr: string): boolean {
|
|
67
|
-
return /^::ffff:([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/.test(ipAddr)
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
function ipv4EmbeddedIpv6Check (ipAddr: string): boolean {
|
|
71
|
-
const parts = ipAddr.split(':')
|
|
72
|
-
const ip4 = parts[parts.length - 1]
|
|
73
|
-
|
|
74
|
-
return ipv4Check(ip4)
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
function ipv6Check (ipAddr: string): boolean {
|
|
78
|
-
return /^::$/.test(ipAddr) ||
|
|
79
|
-
/^::1$/.test(ipAddr) ||
|
|
80
|
-
/^64:ff9b::([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/.test(ipAddr) ||
|
|
81
|
-
/^100::([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4})$/.test(ipAddr) ||
|
|
82
|
-
/^2001::([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4})$/.test(ipAddr) ||
|
|
83
|
-
/^2001:2[0-9a-fA-F]:([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4})$/.test(ipAddr) ||
|
|
84
|
-
/^2001:db8:([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4})$/.test(ipAddr) ||
|
|
85
|
-
/^2002:([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4}):?([0-9a-fA-F]{0,4})$/.test(ipAddr) ||
|
|
86
|
-
/^f[c-d]([0-9a-fA-F]{2,2}):/i.test(ipAddr) ||
|
|
87
|
-
/^fe[8-9a-bA-B][0-9a-fA-F]:/i.test(ipAddr) ||
|
|
88
|
-
/^ff([0-9a-fA-F]{2,2}):/i.test(ipAddr)
|
|
89
|
-
}
|
|
38
|
+
'255.255.255.255/32',
|
|
39
|
+
'::/128', // unspecified (RFC 4291)
|
|
40
|
+
'::1/128', // loopback (RFC 4291)
|
|
41
|
+
'64:ff9b::/96', // IPv4/IPv6 translation (RFC 6052)
|
|
42
|
+
'100::/64', // discard-only (RFC 6666)
|
|
43
|
+
'2001::/32', // Teredo (RFC 4380)
|
|
44
|
+
'2001:20::/28', // ORCHIDv2 (RFC 7343)
|
|
45
|
+
'2001:db8::/32', // documentation (RFC 3849)
|
|
46
|
+
'2002::/16', // 6to4 (RFC 3056)
|
|
47
|
+
'fc00::/7', // unique local (RFC 4193)
|
|
48
|
+
'fe80::/10', // link-local unicast (RFC 4291)
|
|
49
|
+
'ff00::/8' // multicast (RFC 4291)
|
|
50
|
+
].map(cidr => new IpNet(cidr))
|
|
90
51
|
|
|
91
52
|
export function isPrivateIp (ip: string): boolean | undefined {
|
|
92
|
-
if (isIPv4(ip)) {
|
|
93
|
-
return
|
|
53
|
+
if (!isIPv4(ip) && !isIPv6(ip)) {
|
|
54
|
+
return
|
|
94
55
|
}
|
|
95
56
|
|
|
96
|
-
|
|
97
|
-
return ipv4MappedIpv6Check(ip)
|
|
98
|
-
}
|
|
57
|
+
const parsed = parseIP(ip)
|
|
99
58
|
|
|
100
|
-
if (
|
|
101
|
-
return
|
|
59
|
+
if (parsed == null) {
|
|
60
|
+
return
|
|
102
61
|
}
|
|
103
62
|
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
63
|
+
// check IPv4-mapped IPv6 (::ffff:0:0/96) against the IPv4 ranges, the length
|
|
64
|
+
// check matters as isIPv4mappedIPv6 also matches 0.0.0.0
|
|
65
|
+
const addr = parsed.length === 16 && isIPv4mappedIPv6(parsed) ? iPv4FromIPv6(parsed) : parsed
|
|
66
|
+
|
|
67
|
+
return PRIVATE_IP_RANGES.some(net => net.contains(addr))
|
|
107
68
|
}
|