@ever-works/bluesky-connector-plugin 1.0.1 → 1.0.3

package/dist/index.cjs

@@ -40847,6 +40847,7 @@ function isSafeWebhookUrl(rawUrl) {
   if (host.startsWith("[") && host.endsWith("]")) {
     host = host.slice(1, -1);
   }
+  host = host.replace(/\.+$/, "");
   if (CLOUD_METADATA_HOSTNAMES.has(host)) {
     return false;
   }
@@ -40876,23 +40877,69 @@ function isPrivateIPv4(ip) {
   if (a === 172 && b >= 16 && b <= 31) return true;
   if (a === 192 && b === 168) return true;
   if (a === 192 && b === 0 && parts[2] === 0) return true;
+  if (a === 198 && (b === 18 || b === 19)) return true;
+  if (a === 192 && b === 0 && parts[2] === 2) return true;
+  if (a === 198 && b === 51 && parts[2] === 100) return true;
+  if (a === 203 && b === 0 && parts[2] === 113) return true;
   if (a === 100 && b >= 64 && b <= 127) return true;
   if (a >= 224) return true;
   return false;
 }
-function isPrivateIPv6(ip) {
-  const lower = ip.toLowerCase();
-  if (lower === "::1" || lower === "::") return true;
-  if (lower.startsWith("fc") || lower.startsWith("fd")) return true;
-  const firstHextet = lower.split(":", 1)[0];
-  if (/^[0-9a-f]{1,4}$/.test(firstHextet)) {
-    const group0 = parseInt(firstHextet, 16);
-    if ((group0 & 65472) === 65152) return true;
-  }
-  if (lower.startsWith("::ffff:")) {
-    const v4 = lower.slice("::ffff:".length);
-    if (net.isIP(v4) === 4) return isPrivateIPv4(v4);
+function parseIPv6Groups(ip) {
+  let text = ip.trim().toLowerCase();
+  const zone = text.indexOf("%");
+  if (zone >= 0) text = text.slice(0, zone);
+  if (net.isIP(text) !== 6) return null;
+  const lastColon = text.lastIndexOf(":");
+  const tail = text.slice(lastColon + 1);
+  if (tail.includes(".")) {
+    if (net.isIP(tail) !== 4) return null;
+    const [a, b, c, d] = tail.split(".").map((part) => Number(part));
+    text = `${text.slice(0, lastColon + 1)}${(a << 8 | b).toString(16)}:${(c << 8 | d).toString(16)}`;
+  }
+  const halves = text.split("::");
+  if (halves.length > 2) return null;
+  const head = halves[0] ? halves[0].split(":") : [];
+  const rest = halves.length === 2 && halves[1] ? halves[1].split(":") : [];
+  const fill = halves.length === 2 ? 8 - head.length - rest.length : 0;
+  if (fill < 0) return null;
+  const groups = [...head, ...new Array(fill).fill("0"), ...rest].map((group) => parseInt(group, 16));
+  if (groups.length !== 8 || groups.some((group) => Number.isNaN(group) || group < 0 || group > 65535)) {
+    return null;
   }
+  return groups;
+}
+function ipv4FromGroups(high, low) {
+  return `${high >> 8}.${high & 255}.${low >> 8}.${low & 255}`;
+}
+function embeddedIPv4(ip) {
+  const g = parseIPv6Groups(ip);
+  if (!g) return null;
+  const zeros = (from3, to) => g.slice(from3, to).every((group) => group === 0);
+  if (zeros(0, 5) && g[5] === 65535) return ipv4FromGroups(g[6], g[7]);
+  if (zeros(0, 4) && g[4] === 65535 && g[5] === 0) return ipv4FromGroups(g[6], g[7]);
+  if (zeros(0, 6) && (g[6] !== 0 || g[7] > 1)) return ipv4FromGroups(g[6], g[7]);
+  if (g[0] === 100 && g[1] === 65435 && zeros(2, 6)) return ipv4FromGroups(g[6], g[7]);
+  if (g[0] === 8194) return ipv4FromGroups(g[1], g[2]);
+  if (g[0] === 8193 && g[1] === 0) return ipv4FromGroups(g[6] ^ 65535, g[7] ^ 65535);
+  return null;
+}
+function isPrivateIPv6(ip) {
+  const g = parseIPv6Groups(ip);
+  if (!g) {
+    const lower = ip.toLowerCase();
+    return lower === "::1" || lower === "::" || lower.startsWith("fc") || lower.startsWith("fd");
+  }
+  if (g.every((group) => group === 0)) return true;
+  if (g.slice(0, 7).every((group) => group === 0) && g[7] === 1) return true;
+  if ((g[0] & 65024) === 64512) return true;
+  if ((g[0] & 65472) === 65152) return true;
+  if ((g[0] & 65472) === 65216) return true;
+  if ((g[0] & 65280) === 65280) return true;
+  if (g[0] === 8193 && g[1] === 3512) return true;
+  if (g[0] === 100 && g[1] === 65435 && g[2] === 1) return true;
+  const v4 = embeddedIPv4(ip);
+  if (v4 && isPrivateIPv4(v4)) return true;
   return false;
 }
 

package/dist/index.js

@@ -40839,6 +40839,7 @@ function isSafeWebhookUrl(rawUrl) {
   if (host.startsWith("[") && host.endsWith("]")) {
     host = host.slice(1, -1);
   }
+  host = host.replace(/\.+$/, "");
   if (CLOUD_METADATA_HOSTNAMES.has(host)) {
     return false;
   }
@@ -40868,23 +40869,69 @@ function isPrivateIPv4(ip) {
   if (a === 172 && b >= 16 && b <= 31) return true;
   if (a === 192 && b === 168) return true;
   if (a === 192 && b === 0 && parts[2] === 0) return true;
+  if (a === 198 && (b === 18 || b === 19)) return true;
+  if (a === 192 && b === 0 && parts[2] === 2) return true;
+  if (a === 198 && b === 51 && parts[2] === 100) return true;
+  if (a === 203 && b === 0 && parts[2] === 113) return true;
   if (a === 100 && b >= 64 && b <= 127) return true;
   if (a >= 224) return true;
   return false;
 }
-function isPrivateIPv6(ip) {
-  const lower = ip.toLowerCase();
-  if (lower === "::1" || lower === "::") return true;
-  if (lower.startsWith("fc") || lower.startsWith("fd")) return true;
-  const firstHextet = lower.split(":", 1)[0];
-  if (/^[0-9a-f]{1,4}$/.test(firstHextet)) {
-    const group0 = parseInt(firstHextet, 16);
-    if ((group0 & 65472) === 65152) return true;
-  }
-  if (lower.startsWith("::ffff:")) {
-    const v4 = lower.slice("::ffff:".length);
-    if (isIP(v4) === 4) return isPrivateIPv4(v4);
+function parseIPv6Groups(ip) {
+  let text = ip.trim().toLowerCase();
+  const zone = text.indexOf("%");
+  if (zone >= 0) text = text.slice(0, zone);
+  if (isIP(text) !== 6) return null;
+  const lastColon = text.lastIndexOf(":");
+  const tail = text.slice(lastColon + 1);
+  if (tail.includes(".")) {
+    if (isIP(tail) !== 4) return null;
+    const [a, b, c, d] = tail.split(".").map((part) => Number(part));
+    text = `${text.slice(0, lastColon + 1)}${(a << 8 | b).toString(16)}:${(c << 8 | d).toString(16)}`;
+  }
+  const halves = text.split("::");
+  if (halves.length > 2) return null;
+  const head = halves[0] ? halves[0].split(":") : [];
+  const rest = halves.length === 2 && halves[1] ? halves[1].split(":") : [];
+  const fill = halves.length === 2 ? 8 - head.length - rest.length : 0;
+  if (fill < 0) return null;
+  const groups = [...head, ...new Array(fill).fill("0"), ...rest].map((group) => parseInt(group, 16));
+  if (groups.length !== 8 || groups.some((group) => Number.isNaN(group) || group < 0 || group > 65535)) {
+    return null;
   }
+  return groups;
+}
+function ipv4FromGroups(high, low) {
+  return `${high >> 8}.${high & 255}.${low >> 8}.${low & 255}`;
+}
+function embeddedIPv4(ip) {
+  const g = parseIPv6Groups(ip);
+  if (!g) return null;
+  const zeros = (from3, to) => g.slice(from3, to).every((group) => group === 0);
+  if (zeros(0, 5) && g[5] === 65535) return ipv4FromGroups(g[6], g[7]);
+  if (zeros(0, 4) && g[4] === 65535 && g[5] === 0) return ipv4FromGroups(g[6], g[7]);
+  if (zeros(0, 6) && (g[6] !== 0 || g[7] > 1)) return ipv4FromGroups(g[6], g[7]);
+  if (g[0] === 100 && g[1] === 65435 && zeros(2, 6)) return ipv4FromGroups(g[6], g[7]);
+  if (g[0] === 8194) return ipv4FromGroups(g[1], g[2]);
+  if (g[0] === 8193 && g[1] === 0) return ipv4FromGroups(g[6] ^ 65535, g[7] ^ 65535);
+  return null;
+}
+function isPrivateIPv6(ip) {
+  const g = parseIPv6Groups(ip);
+  if (!g) {
+    const lower = ip.toLowerCase();
+    return lower === "::1" || lower === "::" || lower.startsWith("fc") || lower.startsWith("fd");
+  }
+  if (g.every((group) => group === 0)) return true;
+  if (g.slice(0, 7).every((group) => group === 0) && g[7] === 1) return true;
+  if ((g[0] & 65024) === 64512) return true;
+  if ((g[0] & 65472) === 65152) return true;
+  if ((g[0] & 65472) === 65216) return true;
+  if ((g[0] & 65280) === 65280) return true;
+  if (g[0] === 8193 && g[1] === 3512) return true;
+  if (g[0] === 100 && g[1] === 65435 && g[2] === 1) return true;
+  const v4 = embeddedIPv4(ip);
+  if (v4 && isPrivateIPv4(v4)) return true;
   return false;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ever-works/bluesky-connector-plugin",
-	"version": "1.0.1",
+	"version": "1.0.3",
 	"description": "Bluesky social connector plugin for Ever Works platform (outbound posts via the official @atproto/api SDK, and event-source pull of mentions/replies plus the account's own timeline into the event-ingest pipeline, with opt-in historical backfill)",
 	"author": {
 		"name": "Ever Co. LTD",
@@ -33,14 +33,14 @@
 	},
 	"dependencies": {
 		"@atproto/api": "^0.20.34",
-		"@ever-works/contracts": "^1.0.3",
-		"@ever-works/plugin": "^1.2.3"
+		"@ever-works/contracts": "^1.0.12",
+		"@ever-works/plugin": "^1.2.9"
 	},
 	"devDependencies": {
 		"@types/node": "^26.6.4",
 		"tsup": "^8.0.0",
 		"typescript": "^5.9.3",
-		"vitest": "^4.1.0"
+		"vitest": "^5.0.5"
 	},
 	"everworks": {
 		"plugin": {
@@ -101,8 +101,8 @@
 		"url": "https://github.com/ever-works/ever-works/issues"
 	},
 	"everworksRelease": {
-		"contentHash": "sha256:e429cf16c7cbb4c55826ea986048bbf1e8469fdf23b0abc8d8e4bd239a37b267",
-		"commit": "481654e1181e43571ceb71e50ec465d9df360cb2",
-		"source": "https://github.com/ever-works/ever-works/tree/481654e1181e43571ceb71e50ec465d9df360cb2/packages/plugins/bluesky-connector"
+		"contentHash": "sha256:640762359a0729f9584674df4b78c59fc72c3bcb6d516a7f499f79d6edef350e",
+		"commit": "5b5a17e1cdc02e06383d508a6424a863521fc3e0",
+		"source": "https://github.com/ever-works/ever-works/tree/5b5a17e1cdc02e06383d508a6424a863521fc3e0/packages/plugins/bluesky-connector"
 	}
 }