@fedify/fedify 2.0.0-pr.445.1694 → 2.0.0-pr.451.1730

package/dist/{ld-Isot0tiW.js → ld-CcsryBo0.js}

@@ -3,8 +3,9 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Activity, CryptographicKey, Object as Object$1, deno_default, getDocumentLoader, getTypeId } from "./type-DaUr3Il7.js";
-import { fetchKey, validateCryptoKey } from "./key-DnqhSgAv.js";
+import { Activity, CryptographicKey, Object as Object$1, deno_default, getTypeId } from "./lookup-BbEekiru.js";
+import { fetchKey, validateCryptoKey } from "./key-jSvnymAk.js";
+import { getDocumentLoader } from "@fedify/vocab-runtime";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";

package/dist/{lookup-Dhm78GlK.js → lookup-BV3A9Zbc.js}

@@ -2,10 +2,71 @@
           import { Temporal } from "@js-temporal/polyfill";
           import { URLPattern } from "urlpattern-polyfill";
         
-import { UrlError, deno_default, getUserAgent, validatePublicUrl } from "./docloader-Czl3xV10.js";
+import { deno_default, getUserAgent } from "./request-DKGQaofB.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
+import { lookup } from "node:dns/promises";
+import { isIP } from "node:net";
 
+//#region src/utils/url.ts
+var UrlError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "UrlError";
+	}
+};
+/**
+* Validates a URL to prevent SSRF attacks.
+*/
+async function validatePublicUrl(url) {
+	const parsed = new URL(url);
+	if (parsed.protocol !== "http:" && parsed.protocol !== "https:") throw new UrlError(`Unsupported protocol: ${parsed.protocol}`);
+	let hostname = parsed.hostname;
+	if (hostname.startsWith("[") && hostname.endsWith("]")) hostname = hostname.substring(1, hostname.length - 2);
+	if (hostname === "localhost") throw new UrlError("Localhost is not allowed");
+	if ("Deno" in globalThis && !isIP(hostname)) {
+		const netPermission = await Deno.permissions.query({ name: "net" });
+		if (netPermission.state !== "granted") return;
+	}
+	if ("Bun" in globalThis) {
+		if (hostname === "example.com" || hostname.endsWith(".example.com")) return;
+		else if (hostname === "fedify-test.internal") throw new UrlError("Invalid or private address: fedify-test.internal");
+	}
+	let addresses;
+	try {
+		addresses = await lookup(hostname, { all: true });
+	} catch {
+		addresses = [];
+	}
+	for (const { address, family } of addresses) if (family === 4 && !isValidPublicIPv4Address(address) || family === 6 && !isValidPublicIPv6Address(address) || family < 4 || family === 5 || family > 6) throw new UrlError(`Invalid or private address: ${address}`);
+}
+function isValidPublicIPv4Address(address) {
+	const parts = address.split(".");
+	const first = parseInt(parts[0]);
+	if (first === 0 || first === 10 || first === 127) return false;
+	const second = parseInt(parts[1]);
+	if (first === 169 && second === 254) return false;
+	if (first === 172 && second >= 16 && second <= 31) return false;
+	if (first === 192 && second === 168) return false;
+	return true;
+}
+function isValidPublicIPv6Address(address) {
+	address = expandIPv6Address(address);
+	if (address.at(4) !== ":") return false;
+	const firstWord = parseInt(address.substring(0, 4), 16);
+	return !(firstWord >= 64512 && firstWord <= 65023 || firstWord >= 65152 && firstWord <= 65215 || firstWord === 0 || firstWord >= 65280);
+}
+function expandIPv6Address(address) {
+	address = address.toLowerCase();
+	if (address === "::") return "0000:0000:0000:0000:0000:0000:0000:0000";
+	if (address.startsWith("::")) address = "0000" + address;
+	if (address.endsWith("::")) address = address + "0000";
+	address = address.replace("::", ":0000".repeat(8 - (address.match(/:/g) || []).length) + ":");
+	const parts = address.split(":");
+	return parts.map((part) => part.padStart(4, "0")).join(":");
+}
+
+//#endregion
 //#region src/webfinger/lookup.ts
 const logger = getLogger([
 	"fedify",
@@ -128,4 +189,4 @@ async function lookupWebFingerInternal(resource, options = {}) {
 }
 
 //#endregion
-export { lookupWebFinger };
+export { UrlError, lookupWebFinger, validatePublicUrl };