@fedify/vocab-runtime 2.3.0-dev.1190 → 2.3.0-dev.1213
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/deno.json +1 -1
- package/dist/mod.cjs +121 -13
- package/dist/mod.js +121 -13
- package/dist/tests/decimal.test.cjs +2 -1
- package/dist/tests/decimal.test.mjs +2 -1
- package/dist/tests/{docloader-Coqazz9P.mjs → docloader-BooWKCyA.mjs} +2 -2
- package/dist/tests/{docloader-aUwU21a6.cjs → docloader-D4EeCNH1.cjs} +2 -2
- package/dist/tests/docloader.test.cjs +3 -3
- package/dist/tests/docloader.test.mjs +3 -3
- package/dist/tests/{request-CNHFDaDL.cjs → request-CiTYNt3o.cjs} +1 -1
- package/dist/tests/{request-B7FCvvvv.mjs → request-DgSDl3cq.mjs} +1 -1
- package/dist/tests/request.test.cjs +1 -1
- package/dist/tests/request.test.mjs +1 -1
- package/dist/tests/url-C20FhC7p.cjs +206 -0
- package/dist/tests/url-m9Qzxy-Y.mjs +176 -0
- package/dist/tests/url.test.cjs +52 -1
- package/dist/tests/url.test.mjs +52 -1
- package/package.json +1 -1
- package/src/url.test.ts +76 -0
- package/src/url.ts +182 -16
- package/dist/tests/url-BzGwIxB4.mjs +0 -68
- package/dist/tests/url-CEmGms8t.cjs +0 -98
package/deno.json
CHANGED
package/dist/mod.cjs
CHANGED
|
@@ -4346,7 +4346,7 @@ const preloadedContexts = {
|
|
|
4346
4346
|
//#endregion
|
|
4347
4347
|
//#region deno.json
|
|
4348
4348
|
var name = "@fedify/vocab-runtime";
|
|
4349
|
-
var version = "2.3.0-dev.
|
|
4349
|
+
var version = "2.3.0-dev.1213+8ffffeb8";
|
|
4350
4350
|
//#endregion
|
|
4351
4351
|
//#region src/link.ts
|
|
4352
4352
|
const parametersNeedLowerCase = ["rel", "type"];
|
|
@@ -4640,29 +4640,137 @@ function validatePublicIpAddress(address, family) {
|
|
|
4640
4640
|
throw new UrlError(`Invalid or private address: ${address}`);
|
|
4641
4641
|
}
|
|
4642
4642
|
function isValidPublicIPv4Address(address) {
|
|
4643
|
-
const parts = address
|
|
4644
|
-
|
|
4645
|
-
|
|
4646
|
-
|
|
4647
|
-
if (first === 169 && second === 254) return false;
|
|
4648
|
-
if (first === 172 && second >= 16 && second <= 31) return false;
|
|
4649
|
-
if (first === 192 && second === 168) return false;
|
|
4650
|
-
return true;
|
|
4643
|
+
const parts = parseIPv4Address(address);
|
|
4644
|
+
if (parts == null) return false;
|
|
4645
|
+
const value = ipv4PartsToNumber(parts);
|
|
4646
|
+
return !nonPublicIPv4Prefixes.some(({ base, prefix }) => matchesIPv4Prefix(value, base, prefix));
|
|
4651
4647
|
}
|
|
4652
4648
|
function isValidPublicIPv6Address(address) {
|
|
4653
|
-
|
|
4654
|
-
if (
|
|
4655
|
-
|
|
4656
|
-
|
|
4649
|
+
const words = parseIPv6Address(address);
|
|
4650
|
+
if (words == null) return false;
|
|
4651
|
+
if (nonPublicIPv6Prefixes.some(({ words: prefixWords, prefix }) => matchesIPv6Prefix(words, prefixWords, prefix))) return false;
|
|
4652
|
+
for (const { extractIPv4, prefix, words: prefixWords } of ipv6WithIPv4Prefixes) {
|
|
4653
|
+
if (!matchesIPv6Prefix(words, prefixWords, prefix)) continue;
|
|
4654
|
+
const ipv4Address = extractIPv4(words);
|
|
4655
|
+
if (ipv4Address != null && !isValidPublicIPv4Address(ipv4Address)) return false;
|
|
4656
|
+
}
|
|
4657
|
+
return true;
|
|
4657
4658
|
}
|
|
4658
4659
|
function expandIPv6Address(address) {
|
|
4659
4660
|
address = address.toLowerCase();
|
|
4661
|
+
const ipv4Delimiter = address.lastIndexOf(":");
|
|
4662
|
+
if (address.includes(".") && ipv4Delimiter >= 0) {
|
|
4663
|
+
const ipv4Parts = parseIPv4Address(address.substring(ipv4Delimiter + 1));
|
|
4664
|
+
if (ipv4Parts == null) return address;
|
|
4665
|
+
const high = (ipv4Parts[0] << 8) + ipv4Parts[1];
|
|
4666
|
+
const low = (ipv4Parts[2] << 8) + ipv4Parts[3];
|
|
4667
|
+
address = address.substring(0, ipv4Delimiter + 1) + high.toString(16) + ":" + low.toString(16);
|
|
4668
|
+
}
|
|
4660
4669
|
if (address === "::") return "0000:0000:0000:0000:0000:0000:0000:0000";
|
|
4661
4670
|
if (address.startsWith("::")) address = "0000" + address;
|
|
4662
4671
|
if (address.endsWith("::")) address = address + "0000";
|
|
4663
4672
|
address = address.replace("::", ":0000".repeat(8 - (address.match(/:/g) || []).length) + ":");
|
|
4664
4673
|
return address.split(":").map((part) => part.padStart(4, "0")).join(":");
|
|
4665
4674
|
}
|
|
4675
|
+
const nonPublicIPv4Prefixes = [
|
|
4676
|
+
ipv4Prefix("0.0.0.0/8", "RFC 6890"),
|
|
4677
|
+
ipv4Prefix("10.0.0.0/8", "RFC 1918"),
|
|
4678
|
+
ipv4Prefix("100.64.0.0/10", "RFC 6598"),
|
|
4679
|
+
ipv4Prefix("127.0.0.0/8", "RFC 1122"),
|
|
4680
|
+
ipv4Prefix("169.254.0.0/16", "RFC 3927"),
|
|
4681
|
+
ipv4Prefix("172.16.0.0/12", "RFC 1918"),
|
|
4682
|
+
ipv4Prefix("192.0.0.0/24", "RFC 6890"),
|
|
4683
|
+
ipv4Prefix("192.0.2.0/24", "RFC 5737"),
|
|
4684
|
+
ipv4Prefix("192.88.99.0/24", "RFC 7526"),
|
|
4685
|
+
ipv4Prefix("192.168.0.0/16", "RFC 1918"),
|
|
4686
|
+
ipv4Prefix("198.18.0.0/15", "RFC 2544"),
|
|
4687
|
+
ipv4Prefix("198.51.100.0/24", "RFC 5737"),
|
|
4688
|
+
ipv4Prefix("203.0.113.0/24", "RFC 5737"),
|
|
4689
|
+
ipv4Prefix("224.0.0.0/4", "RFC 5771"),
|
|
4690
|
+
ipv4Prefix("240.0.0.0/4", "RFC 1112")
|
|
4691
|
+
];
|
|
4692
|
+
const nonPublicIPv6Prefixes = [
|
|
4693
|
+
ipv6Prefix("::/16", "RFC 4291"),
|
|
4694
|
+
ipv6Prefix("2001::/32", "RFC 4380"),
|
|
4695
|
+
ipv6Prefix("2002::/16", "RFC 3056"),
|
|
4696
|
+
ipv6Prefix("64:ff9b:1::/48", "RFC 8215"),
|
|
4697
|
+
ipv6Prefix("fc00::/7", "RFC 4193"),
|
|
4698
|
+
ipv6Prefix("fe80::/10", "RFC 4291"),
|
|
4699
|
+
ipv6Prefix("ff00::/8", "RFC 4291")
|
|
4700
|
+
];
|
|
4701
|
+
const ipv6WithIPv4Prefixes = [{
|
|
4702
|
+
...ipv6Prefix("64:ff9b::/96", "RFC 6052"),
|
|
4703
|
+
extractIPv4: (words) => ipv4FromWords(words[6], words[7])
|
|
4704
|
+
}];
|
|
4705
|
+
function ipv4Prefix(cidr, rfc) {
|
|
4706
|
+
const [address, prefixText] = cidr.split("/");
|
|
4707
|
+
const prefix = parseInt(prefixText, 10);
|
|
4708
|
+
const parts = parseIPv4Address(address);
|
|
4709
|
+
if (parts == null || !Number.isInteger(prefix) || prefix < 0 || prefix > 32) throw new Error(`Invalid IPv4 prefix: ${cidr}`);
|
|
4710
|
+
return {
|
|
4711
|
+
cidr,
|
|
4712
|
+
base: ipv4PartsToNumber(parts),
|
|
4713
|
+
prefix,
|
|
4714
|
+
rfc
|
|
4715
|
+
};
|
|
4716
|
+
}
|
|
4717
|
+
function ipv6Prefix(cidr, rfc) {
|
|
4718
|
+
const [address, prefixText] = cidr.split("/");
|
|
4719
|
+
const prefix = parseInt(prefixText, 10);
|
|
4720
|
+
const words = parseIPv6Address(address);
|
|
4721
|
+
if (words == null || !Number.isInteger(prefix) || prefix < 0 || prefix > 128) throw new Error(`Invalid IPv6 prefix: ${cidr}`);
|
|
4722
|
+
return {
|
|
4723
|
+
cidr,
|
|
4724
|
+
words,
|
|
4725
|
+
prefix,
|
|
4726
|
+
rfc
|
|
4727
|
+
};
|
|
4728
|
+
}
|
|
4729
|
+
function parseIPv4Address(address) {
|
|
4730
|
+
const parts = address.split(".").map((part) => {
|
|
4731
|
+
if (!/^\d+$/.test(part)) return NaN;
|
|
4732
|
+
return parseInt(part, 10);
|
|
4733
|
+
});
|
|
4734
|
+
if (parts.length !== 4 || parts.some((part) => !Number.isInteger(part) || part < 0 || part > 255)) return null;
|
|
4735
|
+
return parts;
|
|
4736
|
+
}
|
|
4737
|
+
function parseIPv6Address(address) {
|
|
4738
|
+
const parts = expandIPv6Address(address).split(":");
|
|
4739
|
+
if (parts.length !== 8) return null;
|
|
4740
|
+
const words = parts.map((part) => {
|
|
4741
|
+
if (!/^[0-9a-f]{1,4}$/i.test(part)) return NaN;
|
|
4742
|
+
return parseInt(part, 16);
|
|
4743
|
+
});
|
|
4744
|
+
if (words.some((word) => !Number.isInteger(word) || word < 0 || word > 65535)) return null;
|
|
4745
|
+
return words;
|
|
4746
|
+
}
|
|
4747
|
+
function ipv4PartsToNumber(parts) {
|
|
4748
|
+
return parts[0] * 2 ** 24 + parts[1] * 2 ** 16 + parts[2] * 2 ** 8 + parts[3];
|
|
4749
|
+
}
|
|
4750
|
+
function ipv4FromWords(highWord, lowWord) {
|
|
4751
|
+
return [
|
|
4752
|
+
highWord >> 8,
|
|
4753
|
+
highWord & 255,
|
|
4754
|
+
lowWord >> 8,
|
|
4755
|
+
lowWord & 255
|
|
4756
|
+
].join(".");
|
|
4757
|
+
}
|
|
4758
|
+
function matchesIPv4Prefix(address, prefixBase, prefixLength) {
|
|
4759
|
+
const blockSize = 2 ** (32 - prefixLength);
|
|
4760
|
+
return Math.floor(address / blockSize) === Math.floor(prefixBase / blockSize);
|
|
4761
|
+
}
|
|
4762
|
+
function matchesIPv6Prefix(address, prefixWords, prefixLength) {
|
|
4763
|
+
let remaining = prefixLength;
|
|
4764
|
+
for (let i = 0; i < 8 && remaining > 0; i++) if (remaining >= 16) {
|
|
4765
|
+
if (address[i] !== prefixWords[i]) return false;
|
|
4766
|
+
remaining -= 16;
|
|
4767
|
+
} else {
|
|
4768
|
+
const mask = 65535 << 16 - remaining & 65535;
|
|
4769
|
+
if ((address[i] & mask) !== (prefixWords[i] & mask)) return false;
|
|
4770
|
+
remaining = 0;
|
|
4771
|
+
}
|
|
4772
|
+
return true;
|
|
4773
|
+
}
|
|
4666
4774
|
//#endregion
|
|
4667
4775
|
//#region src/docloader.ts
|
|
4668
4776
|
const logger = (0, _logtape_logtape.getLogger)([
|
package/dist/mod.js
CHANGED
|
@@ -4342,7 +4342,7 @@ const preloadedContexts = {
|
|
|
4342
4342
|
//#endregion
|
|
4343
4343
|
//#region deno.json
|
|
4344
4344
|
var name = "@fedify/vocab-runtime";
|
|
4345
|
-
var version = "2.3.0-dev.
|
|
4345
|
+
var version = "2.3.0-dev.1213+8ffffeb8";
|
|
4346
4346
|
//#endregion
|
|
4347
4347
|
//#region src/link.ts
|
|
4348
4348
|
const parametersNeedLowerCase = ["rel", "type"];
|
|
@@ -4636,29 +4636,137 @@ function validatePublicIpAddress(address, family) {
|
|
|
4636
4636
|
throw new UrlError(`Invalid or private address: ${address}`);
|
|
4637
4637
|
}
|
|
4638
4638
|
function isValidPublicIPv4Address(address) {
|
|
4639
|
-
const parts = address
|
|
4640
|
-
|
|
4641
|
-
|
|
4642
|
-
|
|
4643
|
-
if (first === 169 && second === 254) return false;
|
|
4644
|
-
if (first === 172 && second >= 16 && second <= 31) return false;
|
|
4645
|
-
if (first === 192 && second === 168) return false;
|
|
4646
|
-
return true;
|
|
4639
|
+
const parts = parseIPv4Address(address);
|
|
4640
|
+
if (parts == null) return false;
|
|
4641
|
+
const value = ipv4PartsToNumber(parts);
|
|
4642
|
+
return !nonPublicIPv4Prefixes.some(({ base, prefix }) => matchesIPv4Prefix(value, base, prefix));
|
|
4647
4643
|
}
|
|
4648
4644
|
function isValidPublicIPv6Address(address) {
|
|
4649
|
-
|
|
4650
|
-
if (
|
|
4651
|
-
|
|
4652
|
-
|
|
4645
|
+
const words = parseIPv6Address(address);
|
|
4646
|
+
if (words == null) return false;
|
|
4647
|
+
if (nonPublicIPv6Prefixes.some(({ words: prefixWords, prefix }) => matchesIPv6Prefix(words, prefixWords, prefix))) return false;
|
|
4648
|
+
for (const { extractIPv4, prefix, words: prefixWords } of ipv6WithIPv4Prefixes) {
|
|
4649
|
+
if (!matchesIPv6Prefix(words, prefixWords, prefix)) continue;
|
|
4650
|
+
const ipv4Address = extractIPv4(words);
|
|
4651
|
+
if (ipv4Address != null && !isValidPublicIPv4Address(ipv4Address)) return false;
|
|
4652
|
+
}
|
|
4653
|
+
return true;
|
|
4653
4654
|
}
|
|
4654
4655
|
function expandIPv6Address(address) {
|
|
4655
4656
|
address = address.toLowerCase();
|
|
4657
|
+
const ipv4Delimiter = address.lastIndexOf(":");
|
|
4658
|
+
if (address.includes(".") && ipv4Delimiter >= 0) {
|
|
4659
|
+
const ipv4Parts = parseIPv4Address(address.substring(ipv4Delimiter + 1));
|
|
4660
|
+
if (ipv4Parts == null) return address;
|
|
4661
|
+
const high = (ipv4Parts[0] << 8) + ipv4Parts[1];
|
|
4662
|
+
const low = (ipv4Parts[2] << 8) + ipv4Parts[3];
|
|
4663
|
+
address = address.substring(0, ipv4Delimiter + 1) + high.toString(16) + ":" + low.toString(16);
|
|
4664
|
+
}
|
|
4656
4665
|
if (address === "::") return "0000:0000:0000:0000:0000:0000:0000:0000";
|
|
4657
4666
|
if (address.startsWith("::")) address = "0000" + address;
|
|
4658
4667
|
if (address.endsWith("::")) address = address + "0000";
|
|
4659
4668
|
address = address.replace("::", ":0000".repeat(8 - (address.match(/:/g) || []).length) + ":");
|
|
4660
4669
|
return address.split(":").map((part) => part.padStart(4, "0")).join(":");
|
|
4661
4670
|
}
|
|
4671
|
+
const nonPublicIPv4Prefixes = [
|
|
4672
|
+
ipv4Prefix("0.0.0.0/8", "RFC 6890"),
|
|
4673
|
+
ipv4Prefix("10.0.0.0/8", "RFC 1918"),
|
|
4674
|
+
ipv4Prefix("100.64.0.0/10", "RFC 6598"),
|
|
4675
|
+
ipv4Prefix("127.0.0.0/8", "RFC 1122"),
|
|
4676
|
+
ipv4Prefix("169.254.0.0/16", "RFC 3927"),
|
|
4677
|
+
ipv4Prefix("172.16.0.0/12", "RFC 1918"),
|
|
4678
|
+
ipv4Prefix("192.0.0.0/24", "RFC 6890"),
|
|
4679
|
+
ipv4Prefix("192.0.2.0/24", "RFC 5737"),
|
|
4680
|
+
ipv4Prefix("192.88.99.0/24", "RFC 7526"),
|
|
4681
|
+
ipv4Prefix("192.168.0.0/16", "RFC 1918"),
|
|
4682
|
+
ipv4Prefix("198.18.0.0/15", "RFC 2544"),
|
|
4683
|
+
ipv4Prefix("198.51.100.0/24", "RFC 5737"),
|
|
4684
|
+
ipv4Prefix("203.0.113.0/24", "RFC 5737"),
|
|
4685
|
+
ipv4Prefix("224.0.0.0/4", "RFC 5771"),
|
|
4686
|
+
ipv4Prefix("240.0.0.0/4", "RFC 1112")
|
|
4687
|
+
];
|
|
4688
|
+
const nonPublicIPv6Prefixes = [
|
|
4689
|
+
ipv6Prefix("::/16", "RFC 4291"),
|
|
4690
|
+
ipv6Prefix("2001::/32", "RFC 4380"),
|
|
4691
|
+
ipv6Prefix("2002::/16", "RFC 3056"),
|
|
4692
|
+
ipv6Prefix("64:ff9b:1::/48", "RFC 8215"),
|
|
4693
|
+
ipv6Prefix("fc00::/7", "RFC 4193"),
|
|
4694
|
+
ipv6Prefix("fe80::/10", "RFC 4291"),
|
|
4695
|
+
ipv6Prefix("ff00::/8", "RFC 4291")
|
|
4696
|
+
];
|
|
4697
|
+
const ipv6WithIPv4Prefixes = [{
|
|
4698
|
+
...ipv6Prefix("64:ff9b::/96", "RFC 6052"),
|
|
4699
|
+
extractIPv4: (words) => ipv4FromWords(words[6], words[7])
|
|
4700
|
+
}];
|
|
4701
|
+
function ipv4Prefix(cidr, rfc) {
|
|
4702
|
+
const [address, prefixText] = cidr.split("/");
|
|
4703
|
+
const prefix = parseInt(prefixText, 10);
|
|
4704
|
+
const parts = parseIPv4Address(address);
|
|
4705
|
+
if (parts == null || !Number.isInteger(prefix) || prefix < 0 || prefix > 32) throw new Error(`Invalid IPv4 prefix: ${cidr}`);
|
|
4706
|
+
return {
|
|
4707
|
+
cidr,
|
|
4708
|
+
base: ipv4PartsToNumber(parts),
|
|
4709
|
+
prefix,
|
|
4710
|
+
rfc
|
|
4711
|
+
};
|
|
4712
|
+
}
|
|
4713
|
+
function ipv6Prefix(cidr, rfc) {
|
|
4714
|
+
const [address, prefixText] = cidr.split("/");
|
|
4715
|
+
const prefix = parseInt(prefixText, 10);
|
|
4716
|
+
const words = parseIPv6Address(address);
|
|
4717
|
+
if (words == null || !Number.isInteger(prefix) || prefix < 0 || prefix > 128) throw new Error(`Invalid IPv6 prefix: ${cidr}`);
|
|
4718
|
+
return {
|
|
4719
|
+
cidr,
|
|
4720
|
+
words,
|
|
4721
|
+
prefix,
|
|
4722
|
+
rfc
|
|
4723
|
+
};
|
|
4724
|
+
}
|
|
4725
|
+
function parseIPv4Address(address) {
|
|
4726
|
+
const parts = address.split(".").map((part) => {
|
|
4727
|
+
if (!/^\d+$/.test(part)) return NaN;
|
|
4728
|
+
return parseInt(part, 10);
|
|
4729
|
+
});
|
|
4730
|
+
if (parts.length !== 4 || parts.some((part) => !Number.isInteger(part) || part < 0 || part > 255)) return null;
|
|
4731
|
+
return parts;
|
|
4732
|
+
}
|
|
4733
|
+
function parseIPv6Address(address) {
|
|
4734
|
+
const parts = expandIPv6Address(address).split(":");
|
|
4735
|
+
if (parts.length !== 8) return null;
|
|
4736
|
+
const words = parts.map((part) => {
|
|
4737
|
+
if (!/^[0-9a-f]{1,4}$/i.test(part)) return NaN;
|
|
4738
|
+
return parseInt(part, 16);
|
|
4739
|
+
});
|
|
4740
|
+
if (words.some((word) => !Number.isInteger(word) || word < 0 || word > 65535)) return null;
|
|
4741
|
+
return words;
|
|
4742
|
+
}
|
|
4743
|
+
function ipv4PartsToNumber(parts) {
|
|
4744
|
+
return parts[0] * 2 ** 24 + parts[1] * 2 ** 16 + parts[2] * 2 ** 8 + parts[3];
|
|
4745
|
+
}
|
|
4746
|
+
function ipv4FromWords(highWord, lowWord) {
|
|
4747
|
+
return [
|
|
4748
|
+
highWord >> 8,
|
|
4749
|
+
highWord & 255,
|
|
4750
|
+
lowWord >> 8,
|
|
4751
|
+
lowWord & 255
|
|
4752
|
+
].join(".");
|
|
4753
|
+
}
|
|
4754
|
+
function matchesIPv4Prefix(address, prefixBase, prefixLength) {
|
|
4755
|
+
const blockSize = 2 ** (32 - prefixLength);
|
|
4756
|
+
return Math.floor(address / blockSize) === Math.floor(prefixBase / blockSize);
|
|
4757
|
+
}
|
|
4758
|
+
function matchesIPv6Prefix(address, prefixWords, prefixLength) {
|
|
4759
|
+
let remaining = prefixLength;
|
|
4760
|
+
for (let i = 0; i < 8 && remaining > 0; i++) if (remaining >= 16) {
|
|
4761
|
+
if (address[i] !== prefixWords[i]) return false;
|
|
4762
|
+
remaining -= 16;
|
|
4763
|
+
} else {
|
|
4764
|
+
const mask = 65535 << 16 - remaining & 65535;
|
|
4765
|
+
if ((address[i] & mask) !== (prefixWords[i] & mask)) return false;
|
|
4766
|
+
remaining = 0;
|
|
4767
|
+
}
|
|
4768
|
+
return true;
|
|
4769
|
+
}
|
|
4662
4770
|
//#endregion
|
|
4663
4771
|
//#region src/docloader.ts
|
|
4664
4772
|
const logger = getLogger([
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-
|
|
1
|
+
import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-DgSDl3cq.mjs";
|
|
2
2
|
import { t as HttpHeaderLink } from "./link-NUUWCdnK.mjs";
|
|
3
|
-
import { a as validatePublicUrl, t as UrlError } from "./url-
|
|
3
|
+
import { a as validatePublicUrl, t as UrlError } from "./url-m9Qzxy-Y.mjs";
|
|
4
4
|
import { getLogger } from "@logtape/logtape";
|
|
5
5
|
import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
|
|
6
6
|
//#endregion
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
require("./chunk-C2EiDwsr.cjs");
|
|
2
|
-
const require_request = require("./request-
|
|
2
|
+
const require_request = require("./request-CiTYNt3o.cjs");
|
|
3
3
|
const require_link = require("./link-FguCydMA.cjs");
|
|
4
|
-
const require_url = require("./url-
|
|
4
|
+
const require_url = require("./url-C20FhC7p.cjs");
|
|
5
5
|
let _logtape_logtape = require("@logtape/logtape");
|
|
6
6
|
let _opentelemetry_api = require("@opentelemetry/api");
|
|
7
7
|
//#endregion
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const require_chunk = require("./chunk-C2EiDwsr.cjs");
|
|
2
|
-
const require_docloader = require("./docloader-
|
|
3
|
-
const require_request = require("./request-
|
|
4
|
-
const require_url = require("./url-
|
|
2
|
+
const require_docloader = require("./docloader-D4EeCNH1.cjs");
|
|
3
|
+
const require_request = require("./request-CiTYNt3o.cjs");
|
|
4
|
+
const require_url = require("./url-C20FhC7p.cjs");
|
|
5
5
|
let node_assert = require("node:assert");
|
|
6
6
|
let node_test = require("node:test");
|
|
7
7
|
//#region ../../node_modules/.pnpm/glob-to-regexp@0.4.1/node_modules/glob-to-regexp/index.js
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { n as preloadedContexts, t as getDocumentLoader } from "./docloader-
|
|
2
|
-
import { t as FetchError } from "./request-
|
|
3
|
-
import { t as UrlError } from "./url-
|
|
1
|
+
import { n as preloadedContexts, t as getDocumentLoader } from "./docloader-BooWKCyA.mjs";
|
|
2
|
+
import { t as FetchError } from "./request-DgSDl3cq.mjs";
|
|
3
|
+
import { t as UrlError } from "./url-m9Qzxy-Y.mjs";
|
|
4
4
|
import { deepStrictEqual, ok, rejects } from "node:assert";
|
|
5
5
|
import { test } from "node:test";
|
|
6
6
|
//#region \0rolldown/runtime.js
|
|
@@ -3,7 +3,7 @@ let node_process = require("node:process");
|
|
|
3
3
|
node_process = require_chunk.__toESM(node_process, 1);
|
|
4
4
|
//#region deno.json
|
|
5
5
|
var name = "@fedify/vocab-runtime";
|
|
6
|
-
var version = "2.3.0-dev.
|
|
6
|
+
var version = "2.3.0-dev.1213+8ffffeb8";
|
|
7
7
|
//#endregion
|
|
8
8
|
//#region src/request.ts
|
|
9
9
|
/**
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const require_chunk = require("./chunk-C2EiDwsr.cjs");
|
|
2
|
-
const require_request = require("./request-
|
|
2
|
+
const require_request = require("./request-CiTYNt3o.cjs");
|
|
3
3
|
let node_assert = require("node:assert");
|
|
4
4
|
let node_test = require("node:test");
|
|
5
5
|
let node_process = require("node:process");
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { o as version, r as getUserAgent } from "./request-
|
|
1
|
+
import { o as version, r as getUserAgent } from "./request-DgSDl3cq.mjs";
|
|
2
2
|
import { deepStrictEqual } from "node:assert";
|
|
3
3
|
import { test } from "node:test";
|
|
4
4
|
import process from "node:process";
|
|
@@ -0,0 +1,206 @@
|
|
|
1
|
+
require("./chunk-C2EiDwsr.cjs");
|
|
2
|
+
let node_dns_promises = require("node:dns/promises");
|
|
3
|
+
let node_net = require("node:net");
|
|
4
|
+
//#region src/url.ts
|
|
5
|
+
var UrlError = class extends Error {
|
|
6
|
+
constructor(message) {
|
|
7
|
+
super(message);
|
|
8
|
+
this.name = "UrlError";
|
|
9
|
+
}
|
|
10
|
+
};
|
|
11
|
+
/**
|
|
12
|
+
* Validates a URL to prevent SSRF attacks.
|
|
13
|
+
*/
|
|
14
|
+
async function validatePublicUrl(url) {
|
|
15
|
+
const parsed = new URL(url);
|
|
16
|
+
if (parsed.protocol !== "http:" && parsed.protocol !== "https:") throw new UrlError(`Unsupported protocol: ${parsed.protocol}`);
|
|
17
|
+
let hostname = parsed.hostname;
|
|
18
|
+
if (hostname.startsWith("[") && hostname.endsWith("]")) hostname = hostname.slice(1, -1);
|
|
19
|
+
if (hostname === "localhost") throw new UrlError("Localhost is not allowed");
|
|
20
|
+
const hostnameFamily = (0, node_net.isIP)(hostname);
|
|
21
|
+
if (hostnameFamily !== 0) {
|
|
22
|
+
validatePublicIpAddress(hostname, hostnameFamily);
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
if ("Deno" in globalThis && !(0, node_net.isIP)(hostname)) {
|
|
26
|
+
if ((await Deno.permissions.query({ name: "net" })).state !== "granted") return;
|
|
27
|
+
}
|
|
28
|
+
if ("Bun" in globalThis) {
|
|
29
|
+
if (hostname === "example.com" || hostname.endsWith(".example.com")) return;
|
|
30
|
+
else if (hostname === "fedify-test.internal") throw new UrlError("Invalid or private address: fedify-test.internal");
|
|
31
|
+
}
|
|
32
|
+
let addresses;
|
|
33
|
+
try {
|
|
34
|
+
addresses = await (0, node_dns_promises.lookup)(hostname, { all: true });
|
|
35
|
+
} catch {
|
|
36
|
+
addresses = [];
|
|
37
|
+
}
|
|
38
|
+
for (const { address, family } of addresses) validatePublicIpAddress(address, family);
|
|
39
|
+
}
|
|
40
|
+
function validatePublicIpAddress(address, family) {
|
|
41
|
+
if (family === 4 && isValidPublicIPv4Address(address) || family === 6 && isValidPublicIPv6Address(address)) return;
|
|
42
|
+
throw new UrlError(`Invalid or private address: ${address}`);
|
|
43
|
+
}
|
|
44
|
+
function isValidPublicIPv4Address(address) {
|
|
45
|
+
const parts = parseIPv4Address(address);
|
|
46
|
+
if (parts == null) return false;
|
|
47
|
+
const value = ipv4PartsToNumber(parts);
|
|
48
|
+
return !nonPublicIPv4Prefixes.some(({ base, prefix }) => matchesIPv4Prefix(value, base, prefix));
|
|
49
|
+
}
|
|
50
|
+
function isValidPublicIPv6Address(address) {
|
|
51
|
+
const words = parseIPv6Address(address);
|
|
52
|
+
if (words == null) return false;
|
|
53
|
+
if (nonPublicIPv6Prefixes.some(({ words: prefixWords, prefix }) => matchesIPv6Prefix(words, prefixWords, prefix))) return false;
|
|
54
|
+
for (const { extractIPv4, prefix, words: prefixWords } of ipv6WithIPv4Prefixes) {
|
|
55
|
+
if (!matchesIPv6Prefix(words, prefixWords, prefix)) continue;
|
|
56
|
+
const ipv4Address = extractIPv4(words);
|
|
57
|
+
if (ipv4Address != null && !isValidPublicIPv4Address(ipv4Address)) return false;
|
|
58
|
+
}
|
|
59
|
+
return true;
|
|
60
|
+
}
|
|
61
|
+
function expandIPv6Address(address) {
|
|
62
|
+
address = address.toLowerCase();
|
|
63
|
+
const ipv4Delimiter = address.lastIndexOf(":");
|
|
64
|
+
if (address.includes(".") && ipv4Delimiter >= 0) {
|
|
65
|
+
const ipv4Parts = parseIPv4Address(address.substring(ipv4Delimiter + 1));
|
|
66
|
+
if (ipv4Parts == null) return address;
|
|
67
|
+
const high = (ipv4Parts[0] << 8) + ipv4Parts[1];
|
|
68
|
+
const low = (ipv4Parts[2] << 8) + ipv4Parts[3];
|
|
69
|
+
address = address.substring(0, ipv4Delimiter + 1) + high.toString(16) + ":" + low.toString(16);
|
|
70
|
+
}
|
|
71
|
+
if (address === "::") return "0000:0000:0000:0000:0000:0000:0000:0000";
|
|
72
|
+
if (address.startsWith("::")) address = "0000" + address;
|
|
73
|
+
if (address.endsWith("::")) address = address + "0000";
|
|
74
|
+
address = address.replace("::", ":0000".repeat(8 - (address.match(/:/g) || []).length) + ":");
|
|
75
|
+
return address.split(":").map((part) => part.padStart(4, "0")).join(":");
|
|
76
|
+
}
|
|
77
|
+
const nonPublicIPv4Prefixes = [
|
|
78
|
+
ipv4Prefix("0.0.0.0/8", "RFC 6890"),
|
|
79
|
+
ipv4Prefix("10.0.0.0/8", "RFC 1918"),
|
|
80
|
+
ipv4Prefix("100.64.0.0/10", "RFC 6598"),
|
|
81
|
+
ipv4Prefix("127.0.0.0/8", "RFC 1122"),
|
|
82
|
+
ipv4Prefix("169.254.0.0/16", "RFC 3927"),
|
|
83
|
+
ipv4Prefix("172.16.0.0/12", "RFC 1918"),
|
|
84
|
+
ipv4Prefix("192.0.0.0/24", "RFC 6890"),
|
|
85
|
+
ipv4Prefix("192.0.2.0/24", "RFC 5737"),
|
|
86
|
+
ipv4Prefix("192.88.99.0/24", "RFC 7526"),
|
|
87
|
+
ipv4Prefix("192.168.0.0/16", "RFC 1918"),
|
|
88
|
+
ipv4Prefix("198.18.0.0/15", "RFC 2544"),
|
|
89
|
+
ipv4Prefix("198.51.100.0/24", "RFC 5737"),
|
|
90
|
+
ipv4Prefix("203.0.113.0/24", "RFC 5737"),
|
|
91
|
+
ipv4Prefix("224.0.0.0/4", "RFC 5771"),
|
|
92
|
+
ipv4Prefix("240.0.0.0/4", "RFC 1112")
|
|
93
|
+
];
|
|
94
|
+
const nonPublicIPv6Prefixes = [
|
|
95
|
+
ipv6Prefix("::/16", "RFC 4291"),
|
|
96
|
+
ipv6Prefix("2001::/32", "RFC 4380"),
|
|
97
|
+
ipv6Prefix("2002::/16", "RFC 3056"),
|
|
98
|
+
ipv6Prefix("64:ff9b:1::/48", "RFC 8215"),
|
|
99
|
+
ipv6Prefix("fc00::/7", "RFC 4193"),
|
|
100
|
+
ipv6Prefix("fe80::/10", "RFC 4291"),
|
|
101
|
+
ipv6Prefix("ff00::/8", "RFC 4291")
|
|
102
|
+
];
|
|
103
|
+
const ipv6WithIPv4Prefixes = [{
|
|
104
|
+
...ipv6Prefix("64:ff9b::/96", "RFC 6052"),
|
|
105
|
+
extractIPv4: (words) => ipv4FromWords(words[6], words[7])
|
|
106
|
+
}];
|
|
107
|
+
function ipv4Prefix(cidr, rfc) {
|
|
108
|
+
const [address, prefixText] = cidr.split("/");
|
|
109
|
+
const prefix = parseInt(prefixText, 10);
|
|
110
|
+
const parts = parseIPv4Address(address);
|
|
111
|
+
if (parts == null || !Number.isInteger(prefix) || prefix < 0 || prefix > 32) throw new Error(`Invalid IPv4 prefix: ${cidr}`);
|
|
112
|
+
return {
|
|
113
|
+
cidr,
|
|
114
|
+
base: ipv4PartsToNumber(parts),
|
|
115
|
+
prefix,
|
|
116
|
+
rfc
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
function ipv6Prefix(cidr, rfc) {
|
|
120
|
+
const [address, prefixText] = cidr.split("/");
|
|
121
|
+
const prefix = parseInt(prefixText, 10);
|
|
122
|
+
const words = parseIPv6Address(address);
|
|
123
|
+
if (words == null || !Number.isInteger(prefix) || prefix < 0 || prefix > 128) throw new Error(`Invalid IPv6 prefix: ${cidr}`);
|
|
124
|
+
return {
|
|
125
|
+
cidr,
|
|
126
|
+
words,
|
|
127
|
+
prefix,
|
|
128
|
+
rfc
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
function parseIPv4Address(address) {
|
|
132
|
+
const parts = address.split(".").map((part) => {
|
|
133
|
+
if (!/^\d+$/.test(part)) return NaN;
|
|
134
|
+
return parseInt(part, 10);
|
|
135
|
+
});
|
|
136
|
+
if (parts.length !== 4 || parts.some((part) => !Number.isInteger(part) || part < 0 || part > 255)) return null;
|
|
137
|
+
return parts;
|
|
138
|
+
}
|
|
139
|
+
function parseIPv6Address(address) {
|
|
140
|
+
const parts = expandIPv6Address(address).split(":");
|
|
141
|
+
if (parts.length !== 8) return null;
|
|
142
|
+
const words = parts.map((part) => {
|
|
143
|
+
if (!/^[0-9a-f]{1,4}$/i.test(part)) return NaN;
|
|
144
|
+
return parseInt(part, 16);
|
|
145
|
+
});
|
|
146
|
+
if (words.some((word) => !Number.isInteger(word) || word < 0 || word > 65535)) return null;
|
|
147
|
+
return words;
|
|
148
|
+
}
|
|
149
|
+
function ipv4PartsToNumber(parts) {
|
|
150
|
+
return parts[0] * 2 ** 24 + parts[1] * 2 ** 16 + parts[2] * 2 ** 8 + parts[3];
|
|
151
|
+
}
|
|
152
|
+
function ipv4FromWords(highWord, lowWord) {
|
|
153
|
+
return [
|
|
154
|
+
highWord >> 8,
|
|
155
|
+
highWord & 255,
|
|
156
|
+
lowWord >> 8,
|
|
157
|
+
lowWord & 255
|
|
158
|
+
].join(".");
|
|
159
|
+
}
|
|
160
|
+
function matchesIPv4Prefix(address, prefixBase, prefixLength) {
|
|
161
|
+
const blockSize = 2 ** (32 - prefixLength);
|
|
162
|
+
return Math.floor(address / blockSize) === Math.floor(prefixBase / blockSize);
|
|
163
|
+
}
|
|
164
|
+
function matchesIPv6Prefix(address, prefixWords, prefixLength) {
|
|
165
|
+
let remaining = prefixLength;
|
|
166
|
+
for (let i = 0; i < 8 && remaining > 0; i++) if (remaining >= 16) {
|
|
167
|
+
if (address[i] !== prefixWords[i]) return false;
|
|
168
|
+
remaining -= 16;
|
|
169
|
+
} else {
|
|
170
|
+
const mask = 65535 << 16 - remaining & 65535;
|
|
171
|
+
if ((address[i] & mask) !== (prefixWords[i] & mask)) return false;
|
|
172
|
+
remaining = 0;
|
|
173
|
+
}
|
|
174
|
+
return true;
|
|
175
|
+
}
|
|
176
|
+
//#endregion
|
|
177
|
+
Object.defineProperty(exports, "UrlError", {
|
|
178
|
+
enumerable: true,
|
|
179
|
+
get: function() {
|
|
180
|
+
return UrlError;
|
|
181
|
+
}
|
|
182
|
+
});
|
|
183
|
+
Object.defineProperty(exports, "expandIPv6Address", {
|
|
184
|
+
enumerable: true,
|
|
185
|
+
get: function() {
|
|
186
|
+
return expandIPv6Address;
|
|
187
|
+
}
|
|
188
|
+
});
|
|
189
|
+
Object.defineProperty(exports, "isValidPublicIPv4Address", {
|
|
190
|
+
enumerable: true,
|
|
191
|
+
get: function() {
|
|
192
|
+
return isValidPublicIPv4Address;
|
|
193
|
+
}
|
|
194
|
+
});
|
|
195
|
+
Object.defineProperty(exports, "isValidPublicIPv6Address", {
|
|
196
|
+
enumerable: true,
|
|
197
|
+
get: function() {
|
|
198
|
+
return isValidPublicIPv6Address;
|
|
199
|
+
}
|
|
200
|
+
});
|
|
201
|
+
Object.defineProperty(exports, "validatePublicUrl", {
|
|
202
|
+
enumerable: true,
|
|
203
|
+
get: function() {
|
|
204
|
+
return validatePublicUrl;
|
|
205
|
+
}
|
|
206
|
+
});
|