@fedify/vocab-runtime 2.2.3-dev.1098 → 2.2.4
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-zsEXAwKc.mjs → docloader-BOdfIE36.mjs} +2 -2
- package/dist/tests/{docloader-9GvDf0Rt.cjs → docloader-C3WXn7tr.cjs} +2 -2
- package/dist/tests/docloader.test.cjs +3 -3
- package/dist/tests/docloader.test.mjs +3 -3
- package/dist/tests/{request-C_nzWPXM.cjs → request-BqFu2ecV.cjs} +1 -1
- package/dist/tests/{request-D9m4tSpz.mjs → request-DesvQ4hK.mjs} +1 -1
- package/dist/tests/request.test.cjs +1 -1
- package/dist/tests/request.test.mjs +1 -1
- package/dist/tests/url-Ds8K8vxN.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-Cj9-Ycue.cjs +0 -98
package/deno.json
CHANGED
package/dist/mod.cjs
CHANGED
|
@@ -4384,7 +4384,7 @@ const preloadedContexts = {
|
|
|
4384
4384
|
//#endregion
|
|
4385
4385
|
//#region deno.json
|
|
4386
4386
|
var name = "@fedify/vocab-runtime";
|
|
4387
|
-
var version = "2.2.
|
|
4387
|
+
var version = "2.2.4";
|
|
4388
4388
|
//#endregion
|
|
4389
4389
|
//#region src/link.ts
|
|
4390
4390
|
const parametersNeedLowerCase = ["rel", "type"];
|
|
@@ -4678,29 +4678,137 @@ function validatePublicIpAddress(address, family) {
|
|
|
4678
4678
|
throw new UrlError(`Invalid or private address: ${address}`);
|
|
4679
4679
|
}
|
|
4680
4680
|
function isValidPublicIPv4Address(address) {
|
|
4681
|
-
const parts = address
|
|
4682
|
-
|
|
4683
|
-
|
|
4684
|
-
|
|
4685
|
-
if (first === 169 && second === 254) return false;
|
|
4686
|
-
if (first === 172 && second >= 16 && second <= 31) return false;
|
|
4687
|
-
if (first === 192 && second === 168) return false;
|
|
4688
|
-
return true;
|
|
4681
|
+
const parts = parseIPv4Address(address);
|
|
4682
|
+
if (parts == null) return false;
|
|
4683
|
+
const value = ipv4PartsToNumber(parts);
|
|
4684
|
+
return !nonPublicIPv4Prefixes.some(({ base, prefix }) => matchesIPv4Prefix(value, base, prefix));
|
|
4689
4685
|
}
|
|
4690
4686
|
function isValidPublicIPv6Address(address) {
|
|
4691
|
-
|
|
4692
|
-
if (
|
|
4693
|
-
|
|
4694
|
-
|
|
4687
|
+
const words = parseIPv6Address(address);
|
|
4688
|
+
if (words == null) return false;
|
|
4689
|
+
if (nonPublicIPv6Prefixes.some(({ words: prefixWords, prefix }) => matchesIPv6Prefix(words, prefixWords, prefix))) return false;
|
|
4690
|
+
for (const { extractIPv4, prefix, words: prefixWords } of ipv6WithIPv4Prefixes) {
|
|
4691
|
+
if (!matchesIPv6Prefix(words, prefixWords, prefix)) continue;
|
|
4692
|
+
const ipv4Address = extractIPv4(words);
|
|
4693
|
+
if (ipv4Address != null && !isValidPublicIPv4Address(ipv4Address)) return false;
|
|
4694
|
+
}
|
|
4695
|
+
return true;
|
|
4695
4696
|
}
|
|
4696
4697
|
function expandIPv6Address(address) {
|
|
4697
4698
|
address = address.toLowerCase();
|
|
4699
|
+
const ipv4Delimiter = address.lastIndexOf(":");
|
|
4700
|
+
if (address.includes(".") && ipv4Delimiter >= 0) {
|
|
4701
|
+
const ipv4Parts = parseIPv4Address(address.substring(ipv4Delimiter + 1));
|
|
4702
|
+
if (ipv4Parts == null) return address;
|
|
4703
|
+
const high = (ipv4Parts[0] << 8) + ipv4Parts[1];
|
|
4704
|
+
const low = (ipv4Parts[2] << 8) + ipv4Parts[3];
|
|
4705
|
+
address = address.substring(0, ipv4Delimiter + 1) + high.toString(16) + ":" + low.toString(16);
|
|
4706
|
+
}
|
|
4698
4707
|
if (address === "::") return "0000:0000:0000:0000:0000:0000:0000:0000";
|
|
4699
4708
|
if (address.startsWith("::")) address = "0000" + address;
|
|
4700
4709
|
if (address.endsWith("::")) address = address + "0000";
|
|
4701
4710
|
address = address.replace("::", ":0000".repeat(8 - (address.match(/:/g) || []).length) + ":");
|
|
4702
4711
|
return address.split(":").map((part) => part.padStart(4, "0")).join(":");
|
|
4703
4712
|
}
|
|
4713
|
+
const nonPublicIPv4Prefixes = [
|
|
4714
|
+
ipv4Prefix("0.0.0.0/8", "RFC 6890"),
|
|
4715
|
+
ipv4Prefix("10.0.0.0/8", "RFC 1918"),
|
|
4716
|
+
ipv4Prefix("100.64.0.0/10", "RFC 6598"),
|
|
4717
|
+
ipv4Prefix("127.0.0.0/8", "RFC 1122"),
|
|
4718
|
+
ipv4Prefix("169.254.0.0/16", "RFC 3927"),
|
|
4719
|
+
ipv4Prefix("172.16.0.0/12", "RFC 1918"),
|
|
4720
|
+
ipv4Prefix("192.0.0.0/24", "RFC 6890"),
|
|
4721
|
+
ipv4Prefix("192.0.2.0/24", "RFC 5737"),
|
|
4722
|
+
ipv4Prefix("192.88.99.0/24", "RFC 7526"),
|
|
4723
|
+
ipv4Prefix("192.168.0.0/16", "RFC 1918"),
|
|
4724
|
+
ipv4Prefix("198.18.0.0/15", "RFC 2544"),
|
|
4725
|
+
ipv4Prefix("198.51.100.0/24", "RFC 5737"),
|
|
4726
|
+
ipv4Prefix("203.0.113.0/24", "RFC 5737"),
|
|
4727
|
+
ipv4Prefix("224.0.0.0/4", "RFC 5771"),
|
|
4728
|
+
ipv4Prefix("240.0.0.0/4", "RFC 1112")
|
|
4729
|
+
];
|
|
4730
|
+
const nonPublicIPv6Prefixes = [
|
|
4731
|
+
ipv6Prefix("::/16", "RFC 4291"),
|
|
4732
|
+
ipv6Prefix("2001::/32", "RFC 4380"),
|
|
4733
|
+
ipv6Prefix("2002::/16", "RFC 3056"),
|
|
4734
|
+
ipv6Prefix("64:ff9b:1::/48", "RFC 8215"),
|
|
4735
|
+
ipv6Prefix("fc00::/7", "RFC 4193"),
|
|
4736
|
+
ipv6Prefix("fe80::/10", "RFC 4291"),
|
|
4737
|
+
ipv6Prefix("ff00::/8", "RFC 4291")
|
|
4738
|
+
];
|
|
4739
|
+
const ipv6WithIPv4Prefixes = [{
|
|
4740
|
+
...ipv6Prefix("64:ff9b::/96", "RFC 6052"),
|
|
4741
|
+
extractIPv4: (words) => ipv4FromWords(words[6], words[7])
|
|
4742
|
+
}];
|
|
4743
|
+
function ipv4Prefix(cidr, rfc) {
|
|
4744
|
+
const [address, prefixText] = cidr.split("/");
|
|
4745
|
+
const prefix = parseInt(prefixText, 10);
|
|
4746
|
+
const parts = parseIPv4Address(address);
|
|
4747
|
+
if (parts == null || !Number.isInteger(prefix) || prefix < 0 || prefix > 32) throw new Error(`Invalid IPv4 prefix: ${cidr}`);
|
|
4748
|
+
return {
|
|
4749
|
+
cidr,
|
|
4750
|
+
base: ipv4PartsToNumber(parts),
|
|
4751
|
+
prefix,
|
|
4752
|
+
rfc
|
|
4753
|
+
};
|
|
4754
|
+
}
|
|
4755
|
+
function ipv6Prefix(cidr, rfc) {
|
|
4756
|
+
const [address, prefixText] = cidr.split("/");
|
|
4757
|
+
const prefix = parseInt(prefixText, 10);
|
|
4758
|
+
const words = parseIPv6Address(address);
|
|
4759
|
+
if (words == null || !Number.isInteger(prefix) || prefix < 0 || prefix > 128) throw new Error(`Invalid IPv6 prefix: ${cidr}`);
|
|
4760
|
+
return {
|
|
4761
|
+
cidr,
|
|
4762
|
+
words,
|
|
4763
|
+
prefix,
|
|
4764
|
+
rfc
|
|
4765
|
+
};
|
|
4766
|
+
}
|
|
4767
|
+
function parseIPv4Address(address) {
|
|
4768
|
+
const parts = address.split(".").map((part) => {
|
|
4769
|
+
if (!/^\d+$/.test(part)) return NaN;
|
|
4770
|
+
return parseInt(part, 10);
|
|
4771
|
+
});
|
|
4772
|
+
if (parts.length !== 4 || parts.some((part) => !Number.isInteger(part) || part < 0 || part > 255)) return null;
|
|
4773
|
+
return parts;
|
|
4774
|
+
}
|
|
4775
|
+
function parseIPv6Address(address) {
|
|
4776
|
+
const parts = expandIPv6Address(address).split(":");
|
|
4777
|
+
if (parts.length !== 8) return null;
|
|
4778
|
+
const words = parts.map((part) => {
|
|
4779
|
+
if (!/^[0-9a-f]{1,4}$/i.test(part)) return NaN;
|
|
4780
|
+
return parseInt(part, 16);
|
|
4781
|
+
});
|
|
4782
|
+
if (words.some((word) => !Number.isInteger(word) || word < 0 || word > 65535)) return null;
|
|
4783
|
+
return words;
|
|
4784
|
+
}
|
|
4785
|
+
function ipv4PartsToNumber(parts) {
|
|
4786
|
+
return parts[0] * 2 ** 24 + parts[1] * 2 ** 16 + parts[2] * 2 ** 8 + parts[3];
|
|
4787
|
+
}
|
|
4788
|
+
function ipv4FromWords(highWord, lowWord) {
|
|
4789
|
+
return [
|
|
4790
|
+
highWord >> 8,
|
|
4791
|
+
highWord & 255,
|
|
4792
|
+
lowWord >> 8,
|
|
4793
|
+
lowWord & 255
|
|
4794
|
+
].join(".");
|
|
4795
|
+
}
|
|
4796
|
+
function matchesIPv4Prefix(address, prefixBase, prefixLength) {
|
|
4797
|
+
const blockSize = 2 ** (32 - prefixLength);
|
|
4798
|
+
return Math.floor(address / blockSize) === Math.floor(prefixBase / blockSize);
|
|
4799
|
+
}
|
|
4800
|
+
function matchesIPv6Prefix(address, prefixWords, prefixLength) {
|
|
4801
|
+
let remaining = prefixLength;
|
|
4802
|
+
for (let i = 0; i < 8 && remaining > 0; i++) if (remaining >= 16) {
|
|
4803
|
+
if (address[i] !== prefixWords[i]) return false;
|
|
4804
|
+
remaining -= 16;
|
|
4805
|
+
} else {
|
|
4806
|
+
const mask = 65535 << 16 - remaining & 65535;
|
|
4807
|
+
if ((address[i] & mask) !== (prefixWords[i] & mask)) return false;
|
|
4808
|
+
remaining = 0;
|
|
4809
|
+
}
|
|
4810
|
+
return true;
|
|
4811
|
+
}
|
|
4704
4812
|
//#endregion
|
|
4705
4813
|
//#region src/docloader.ts
|
|
4706
4814
|
const logger = (0, _logtape_logtape.getLogger)([
|
package/dist/mod.js
CHANGED
|
@@ -4380,7 +4380,7 @@ const preloadedContexts = {
|
|
|
4380
4380
|
//#endregion
|
|
4381
4381
|
//#region deno.json
|
|
4382
4382
|
var name = "@fedify/vocab-runtime";
|
|
4383
|
-
var version = "2.2.
|
|
4383
|
+
var version = "2.2.4";
|
|
4384
4384
|
//#endregion
|
|
4385
4385
|
//#region src/link.ts
|
|
4386
4386
|
const parametersNeedLowerCase = ["rel", "type"];
|
|
@@ -4674,29 +4674,137 @@ function validatePublicIpAddress(address, family) {
|
|
|
4674
4674
|
throw new UrlError(`Invalid or private address: ${address}`);
|
|
4675
4675
|
}
|
|
4676
4676
|
function isValidPublicIPv4Address(address) {
|
|
4677
|
-
const parts = address
|
|
4678
|
-
|
|
4679
|
-
|
|
4680
|
-
|
|
4681
|
-
if (first === 169 && second === 254) return false;
|
|
4682
|
-
if (first === 172 && second >= 16 && second <= 31) return false;
|
|
4683
|
-
if (first === 192 && second === 168) return false;
|
|
4684
|
-
return true;
|
|
4677
|
+
const parts = parseIPv4Address(address);
|
|
4678
|
+
if (parts == null) return false;
|
|
4679
|
+
const value = ipv4PartsToNumber(parts);
|
|
4680
|
+
return !nonPublicIPv4Prefixes.some(({ base, prefix }) => matchesIPv4Prefix(value, base, prefix));
|
|
4685
4681
|
}
|
|
4686
4682
|
function isValidPublicIPv6Address(address) {
|
|
4687
|
-
|
|
4688
|
-
if (
|
|
4689
|
-
|
|
4690
|
-
|
|
4683
|
+
const words = parseIPv6Address(address);
|
|
4684
|
+
if (words == null) return false;
|
|
4685
|
+
if (nonPublicIPv6Prefixes.some(({ words: prefixWords, prefix }) => matchesIPv6Prefix(words, prefixWords, prefix))) return false;
|
|
4686
|
+
for (const { extractIPv4, prefix, words: prefixWords } of ipv6WithIPv4Prefixes) {
|
|
4687
|
+
if (!matchesIPv6Prefix(words, prefixWords, prefix)) continue;
|
|
4688
|
+
const ipv4Address = extractIPv4(words);
|
|
4689
|
+
if (ipv4Address != null && !isValidPublicIPv4Address(ipv4Address)) return false;
|
|
4690
|
+
}
|
|
4691
|
+
return true;
|
|
4691
4692
|
}
|
|
4692
4693
|
function expandIPv6Address(address) {
|
|
4693
4694
|
address = address.toLowerCase();
|
|
4695
|
+
const ipv4Delimiter = address.lastIndexOf(":");
|
|
4696
|
+
if (address.includes(".") && ipv4Delimiter >= 0) {
|
|
4697
|
+
const ipv4Parts = parseIPv4Address(address.substring(ipv4Delimiter + 1));
|
|
4698
|
+
if (ipv4Parts == null) return address;
|
|
4699
|
+
const high = (ipv4Parts[0] << 8) + ipv4Parts[1];
|
|
4700
|
+
const low = (ipv4Parts[2] << 8) + ipv4Parts[3];
|
|
4701
|
+
address = address.substring(0, ipv4Delimiter + 1) + high.toString(16) + ":" + low.toString(16);
|
|
4702
|
+
}
|
|
4694
4703
|
if (address === "::") return "0000:0000:0000:0000:0000:0000:0000:0000";
|
|
4695
4704
|
if (address.startsWith("::")) address = "0000" + address;
|
|
4696
4705
|
if (address.endsWith("::")) address = address + "0000";
|
|
4697
4706
|
address = address.replace("::", ":0000".repeat(8 - (address.match(/:/g) || []).length) + ":");
|
|
4698
4707
|
return address.split(":").map((part) => part.padStart(4, "0")).join(":");
|
|
4699
4708
|
}
|
|
4709
|
+
const nonPublicIPv4Prefixes = [
|
|
4710
|
+
ipv4Prefix("0.0.0.0/8", "RFC 6890"),
|
|
4711
|
+
ipv4Prefix("10.0.0.0/8", "RFC 1918"),
|
|
4712
|
+
ipv4Prefix("100.64.0.0/10", "RFC 6598"),
|
|
4713
|
+
ipv4Prefix("127.0.0.0/8", "RFC 1122"),
|
|
4714
|
+
ipv4Prefix("169.254.0.0/16", "RFC 3927"),
|
|
4715
|
+
ipv4Prefix("172.16.0.0/12", "RFC 1918"),
|
|
4716
|
+
ipv4Prefix("192.0.0.0/24", "RFC 6890"),
|
|
4717
|
+
ipv4Prefix("192.0.2.0/24", "RFC 5737"),
|
|
4718
|
+
ipv4Prefix("192.88.99.0/24", "RFC 7526"),
|
|
4719
|
+
ipv4Prefix("192.168.0.0/16", "RFC 1918"),
|
|
4720
|
+
ipv4Prefix("198.18.0.0/15", "RFC 2544"),
|
|
4721
|
+
ipv4Prefix("198.51.100.0/24", "RFC 5737"),
|
|
4722
|
+
ipv4Prefix("203.0.113.0/24", "RFC 5737"),
|
|
4723
|
+
ipv4Prefix("224.0.0.0/4", "RFC 5771"),
|
|
4724
|
+
ipv4Prefix("240.0.0.0/4", "RFC 1112")
|
|
4725
|
+
];
|
|
4726
|
+
const nonPublicIPv6Prefixes = [
|
|
4727
|
+
ipv6Prefix("::/16", "RFC 4291"),
|
|
4728
|
+
ipv6Prefix("2001::/32", "RFC 4380"),
|
|
4729
|
+
ipv6Prefix("2002::/16", "RFC 3056"),
|
|
4730
|
+
ipv6Prefix("64:ff9b:1::/48", "RFC 8215"),
|
|
4731
|
+
ipv6Prefix("fc00::/7", "RFC 4193"),
|
|
4732
|
+
ipv6Prefix("fe80::/10", "RFC 4291"),
|
|
4733
|
+
ipv6Prefix("ff00::/8", "RFC 4291")
|
|
4734
|
+
];
|
|
4735
|
+
const ipv6WithIPv4Prefixes = [{
|
|
4736
|
+
...ipv6Prefix("64:ff9b::/96", "RFC 6052"),
|
|
4737
|
+
extractIPv4: (words) => ipv4FromWords(words[6], words[7])
|
|
4738
|
+
}];
|
|
4739
|
+
function ipv4Prefix(cidr, rfc) {
|
|
4740
|
+
const [address, prefixText] = cidr.split("/");
|
|
4741
|
+
const prefix = parseInt(prefixText, 10);
|
|
4742
|
+
const parts = parseIPv4Address(address);
|
|
4743
|
+
if (parts == null || !Number.isInteger(prefix) || prefix < 0 || prefix > 32) throw new Error(`Invalid IPv4 prefix: ${cidr}`);
|
|
4744
|
+
return {
|
|
4745
|
+
cidr,
|
|
4746
|
+
base: ipv4PartsToNumber(parts),
|
|
4747
|
+
prefix,
|
|
4748
|
+
rfc
|
|
4749
|
+
};
|
|
4750
|
+
}
|
|
4751
|
+
function ipv6Prefix(cidr, rfc) {
|
|
4752
|
+
const [address, prefixText] = cidr.split("/");
|
|
4753
|
+
const prefix = parseInt(prefixText, 10);
|
|
4754
|
+
const words = parseIPv6Address(address);
|
|
4755
|
+
if (words == null || !Number.isInteger(prefix) || prefix < 0 || prefix > 128) throw new Error(`Invalid IPv6 prefix: ${cidr}`);
|
|
4756
|
+
return {
|
|
4757
|
+
cidr,
|
|
4758
|
+
words,
|
|
4759
|
+
prefix,
|
|
4760
|
+
rfc
|
|
4761
|
+
};
|
|
4762
|
+
}
|
|
4763
|
+
function parseIPv4Address(address) {
|
|
4764
|
+
const parts = address.split(".").map((part) => {
|
|
4765
|
+
if (!/^\d+$/.test(part)) return NaN;
|
|
4766
|
+
return parseInt(part, 10);
|
|
4767
|
+
});
|
|
4768
|
+
if (parts.length !== 4 || parts.some((part) => !Number.isInteger(part) || part < 0 || part > 255)) return null;
|
|
4769
|
+
return parts;
|
|
4770
|
+
}
|
|
4771
|
+
function parseIPv6Address(address) {
|
|
4772
|
+
const parts = expandIPv6Address(address).split(":");
|
|
4773
|
+
if (parts.length !== 8) return null;
|
|
4774
|
+
const words = parts.map((part) => {
|
|
4775
|
+
if (!/^[0-9a-f]{1,4}$/i.test(part)) return NaN;
|
|
4776
|
+
return parseInt(part, 16);
|
|
4777
|
+
});
|
|
4778
|
+
if (words.some((word) => !Number.isInteger(word) || word < 0 || word > 65535)) return null;
|
|
4779
|
+
return words;
|
|
4780
|
+
}
|
|
4781
|
+
function ipv4PartsToNumber(parts) {
|
|
4782
|
+
return parts[0] * 2 ** 24 + parts[1] * 2 ** 16 + parts[2] * 2 ** 8 + parts[3];
|
|
4783
|
+
}
|
|
4784
|
+
function ipv4FromWords(highWord, lowWord) {
|
|
4785
|
+
return [
|
|
4786
|
+
highWord >> 8,
|
|
4787
|
+
highWord & 255,
|
|
4788
|
+
lowWord >> 8,
|
|
4789
|
+
lowWord & 255
|
|
4790
|
+
].join(".");
|
|
4791
|
+
}
|
|
4792
|
+
function matchesIPv4Prefix(address, prefixBase, prefixLength) {
|
|
4793
|
+
const blockSize = 2 ** (32 - prefixLength);
|
|
4794
|
+
return Math.floor(address / blockSize) === Math.floor(prefixBase / blockSize);
|
|
4795
|
+
}
|
|
4796
|
+
function matchesIPv6Prefix(address, prefixWords, prefixLength) {
|
|
4797
|
+
let remaining = prefixLength;
|
|
4798
|
+
for (let i = 0; i < 8 && remaining > 0; i++) if (remaining >= 16) {
|
|
4799
|
+
if (address[i] !== prefixWords[i]) return false;
|
|
4800
|
+
remaining -= 16;
|
|
4801
|
+
} else {
|
|
4802
|
+
const mask = 65535 << 16 - remaining & 65535;
|
|
4803
|
+
if ((address[i] & mask) !== (prefixWords[i] & mask)) return false;
|
|
4804
|
+
remaining = 0;
|
|
4805
|
+
}
|
|
4806
|
+
return true;
|
|
4807
|
+
}
|
|
4700
4808
|
//#endregion
|
|
4701
4809
|
//#region src/docloader.ts
|
|
4702
4810
|
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-DesvQ4hK.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
|
//#region src/contexts/activitystreams.json
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
require("./chunk-Do9eywBl.cjs");
|
|
2
|
-
const require_request = require("./request-
|
|
2
|
+
const require_request = require("./request-BqFu2ecV.cjs");
|
|
3
3
|
const require_link = require("./link-FguCydMA.cjs");
|
|
4
|
-
const require_url = require("./url-
|
|
4
|
+
const require_url = require("./url-Ds8K8vxN.cjs");
|
|
5
5
|
let _logtape_logtape = require("@logtape/logtape");
|
|
6
6
|
let _opentelemetry_api = require("@opentelemetry/api");
|
|
7
7
|
//#region src/contexts/activitystreams.json
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const require_chunk = require("./chunk-Do9eywBl.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-C3WXn7tr.cjs");
|
|
3
|
+
const require_request = require("./request-BqFu2ecV.cjs");
|
|
4
|
+
const require_url = require("./url-Ds8K8vxN.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-BOdfIE36.mjs";
|
|
2
|
+
import { t as FetchError } from "./request-DesvQ4hK.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);
|
|
4
4
|
//#region deno.json
|
|
5
5
|
var name = "@fedify/vocab-runtime";
|
|
6
|
-
var version = "2.2.
|
|
6
|
+
var version = "2.2.4";
|
|
7
7
|
//#endregion
|
|
8
8
|
//#region src/request.ts
|
|
9
9
|
/**
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const require_chunk = require("./chunk-Do9eywBl.cjs");
|
|
2
|
-
const require_request = require("./request-
|
|
2
|
+
const require_request = require("./request-BqFu2ecV.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-DesvQ4hK.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-Do9eywBl.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
|
+
});
|