@ever-works/make-plugin 1.0.11 → 1.0.12

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.cjs CHANGED
@@ -2372,6 +2372,7 @@ function isSafeWebhookUrl(rawUrl) {
2372
2372
  if (host.startsWith("[") && host.endsWith("]")) {
2373
2373
  host = host.slice(1, -1);
2374
2374
  }
2375
+ host = host.replace(/\.+$/, "");
2375
2376
  if (CLOUD_METADATA_HOSTNAMES.has(host)) {
2376
2377
  return false;
2377
2378
  }
@@ -2401,23 +2402,69 @@ function isPrivateIPv4(ip) {
2401
2402
  if (a === 172 && b >= 16 && b <= 31) return true;
2402
2403
  if (a === 192 && b === 168) return true;
2403
2404
  if (a === 192 && b === 0 && parts[2] === 0) return true;
2405
+ if (a === 198 && (b === 18 || b === 19)) return true;
2406
+ if (a === 192 && b === 0 && parts[2] === 2) return true;
2407
+ if (a === 198 && b === 51 && parts[2] === 100) return true;
2408
+ if (a === 203 && b === 0 && parts[2] === 113) return true;
2404
2409
  if (a === 100 && b >= 64 && b <= 127) return true;
2405
2410
  if (a >= 224) return true;
2406
2411
  return false;
2407
2412
  }
2408
- function isPrivateIPv6(ip) {
2409
- const lower = ip.toLowerCase();
2410
- if (lower === "::1" || lower === "::") return true;
2411
- if (lower.startsWith("fc") || lower.startsWith("fd")) return true;
2412
- const firstHextet = lower.split(":", 1)[0];
2413
- if (/^[0-9a-f]{1,4}$/.test(firstHextet)) {
2414
- const group0 = parseInt(firstHextet, 16);
2415
- if ((group0 & 65472) === 65152) return true;
2416
- }
2417
- if (lower.startsWith("::ffff:")) {
2418
- const v4 = lower.slice("::ffff:".length);
2419
- if ((0, import_net.isIP)(v4) === 4) return isPrivateIPv4(v4);
2413
+ function parseIPv6Groups(ip) {
2414
+ let text = ip.trim().toLowerCase();
2415
+ const zone = text.indexOf("%");
2416
+ if (zone >= 0) text = text.slice(0, zone);
2417
+ if ((0, import_net.isIP)(text) !== 6) return null;
2418
+ const lastColon = text.lastIndexOf(":");
2419
+ const tail = text.slice(lastColon + 1);
2420
+ if (tail.includes(".")) {
2421
+ if ((0, import_net.isIP)(tail) !== 4) return null;
2422
+ const [a, b, c, d] = tail.split(".").map((part) => Number(part));
2423
+ text = `${text.slice(0, lastColon + 1)}${(a << 8 | b).toString(16)}:${(c << 8 | d).toString(16)}`;
2424
+ }
2425
+ const halves = text.split("::");
2426
+ if (halves.length > 2) return null;
2427
+ const head = halves[0] ? halves[0].split(":") : [];
2428
+ const rest = halves.length === 2 && halves[1] ? halves[1].split(":") : [];
2429
+ const fill = halves.length === 2 ? 8 - head.length - rest.length : 0;
2430
+ if (fill < 0) return null;
2431
+ const groups = [...head, ...new Array(fill).fill("0"), ...rest].map((group) => parseInt(group, 16));
2432
+ if (groups.length !== 8 || groups.some((group) => Number.isNaN(group) || group < 0 || group > 65535)) {
2433
+ return null;
2420
2434
  }
2435
+ return groups;
2436
+ }
2437
+ function ipv4FromGroups(high, low) {
2438
+ return `${high >> 8}.${high & 255}.${low >> 8}.${low & 255}`;
2439
+ }
2440
+ function embeddedIPv4(ip) {
2441
+ const g = parseIPv6Groups(ip);
2442
+ if (!g) return null;
2443
+ const zeros = (from, to) => g.slice(from, to).every((group) => group === 0);
2444
+ if (zeros(0, 5) && g[5] === 65535) return ipv4FromGroups(g[6], g[7]);
2445
+ if (zeros(0, 4) && g[4] === 65535 && g[5] === 0) return ipv4FromGroups(g[6], g[7]);
2446
+ if (zeros(0, 6) && (g[6] !== 0 || g[7] > 1)) return ipv4FromGroups(g[6], g[7]);
2447
+ if (g[0] === 100 && g[1] === 65435 && zeros(2, 6)) return ipv4FromGroups(g[6], g[7]);
2448
+ if (g[0] === 8194) return ipv4FromGroups(g[1], g[2]);
2449
+ if (g[0] === 8193 && g[1] === 0) return ipv4FromGroups(g[6] ^ 65535, g[7] ^ 65535);
2450
+ return null;
2451
+ }
2452
+ function isPrivateIPv6(ip) {
2453
+ const g = parseIPv6Groups(ip);
2454
+ if (!g) {
2455
+ const lower = ip.toLowerCase();
2456
+ return lower === "::1" || lower === "::" || lower.startsWith("fc") || lower.startsWith("fd");
2457
+ }
2458
+ if (g.every((group) => group === 0)) return true;
2459
+ if (g.slice(0, 7).every((group) => group === 0) && g[7] === 1) return true;
2460
+ if ((g[0] & 65024) === 64512) return true;
2461
+ if ((g[0] & 65472) === 65152) return true;
2462
+ if ((g[0] & 65472) === 65216) return true;
2463
+ if ((g[0] & 65280) === 65280) return true;
2464
+ if (g[0] === 8193 && g[1] === 3512) return true;
2465
+ if (g[0] === 100 && g[1] === 65435 && g[2] === 1) return true;
2466
+ const v4 = embeddedIPv4(ip);
2467
+ if (v4 && isPrivateIPv4(v4)) return true;
2421
2468
  return false;
2422
2469
  }
2423
2470
 
package/dist/index.js CHANGED
@@ -2345,6 +2345,7 @@ function isSafeWebhookUrl(rawUrl) {
2345
2345
  if (host.startsWith("[") && host.endsWith("]")) {
2346
2346
  host = host.slice(1, -1);
2347
2347
  }
2348
+ host = host.replace(/\.+$/, "");
2348
2349
  if (CLOUD_METADATA_HOSTNAMES.has(host)) {
2349
2350
  return false;
2350
2351
  }
@@ -2374,23 +2375,69 @@ function isPrivateIPv4(ip) {
2374
2375
  if (a === 172 && b >= 16 && b <= 31) return true;
2375
2376
  if (a === 192 && b === 168) return true;
2376
2377
  if (a === 192 && b === 0 && parts[2] === 0) return true;
2378
+ if (a === 198 && (b === 18 || b === 19)) return true;
2379
+ if (a === 192 && b === 0 && parts[2] === 2) return true;
2380
+ if (a === 198 && b === 51 && parts[2] === 100) return true;
2381
+ if (a === 203 && b === 0 && parts[2] === 113) return true;
2377
2382
  if (a === 100 && b >= 64 && b <= 127) return true;
2378
2383
  if (a >= 224) return true;
2379
2384
  return false;
2380
2385
  }
2381
- function isPrivateIPv6(ip) {
2382
- const lower = ip.toLowerCase();
2383
- if (lower === "::1" || lower === "::") return true;
2384
- if (lower.startsWith("fc") || lower.startsWith("fd")) return true;
2385
- const firstHextet = lower.split(":", 1)[0];
2386
- if (/^[0-9a-f]{1,4}$/.test(firstHextet)) {
2387
- const group0 = parseInt(firstHextet, 16);
2388
- if ((group0 & 65472) === 65152) return true;
2389
- }
2390
- if (lower.startsWith("::ffff:")) {
2391
- const v4 = lower.slice("::ffff:".length);
2392
- if (isIP(v4) === 4) return isPrivateIPv4(v4);
2386
+ function parseIPv6Groups(ip) {
2387
+ let text = ip.trim().toLowerCase();
2388
+ const zone = text.indexOf("%");
2389
+ if (zone >= 0) text = text.slice(0, zone);
2390
+ if (isIP(text) !== 6) return null;
2391
+ const lastColon = text.lastIndexOf(":");
2392
+ const tail = text.slice(lastColon + 1);
2393
+ if (tail.includes(".")) {
2394
+ if (isIP(tail) !== 4) return null;
2395
+ const [a, b, c, d] = tail.split(".").map((part) => Number(part));
2396
+ text = `${text.slice(0, lastColon + 1)}${(a << 8 | b).toString(16)}:${(c << 8 | d).toString(16)}`;
2397
+ }
2398
+ const halves = text.split("::");
2399
+ if (halves.length > 2) return null;
2400
+ const head = halves[0] ? halves[0].split(":") : [];
2401
+ const rest = halves.length === 2 && halves[1] ? halves[1].split(":") : [];
2402
+ const fill = halves.length === 2 ? 8 - head.length - rest.length : 0;
2403
+ if (fill < 0) return null;
2404
+ const groups = [...head, ...new Array(fill).fill("0"), ...rest].map((group) => parseInt(group, 16));
2405
+ if (groups.length !== 8 || groups.some((group) => Number.isNaN(group) || group < 0 || group > 65535)) {
2406
+ return null;
2393
2407
  }
2408
+ return groups;
2409
+ }
2410
+ function ipv4FromGroups(high, low) {
2411
+ return `${high >> 8}.${high & 255}.${low >> 8}.${low & 255}`;
2412
+ }
2413
+ function embeddedIPv4(ip) {
2414
+ const g = parseIPv6Groups(ip);
2415
+ if (!g) return null;
2416
+ const zeros = (from, to) => g.slice(from, to).every((group) => group === 0);
2417
+ if (zeros(0, 5) && g[5] === 65535) return ipv4FromGroups(g[6], g[7]);
2418
+ if (zeros(0, 4) && g[4] === 65535 && g[5] === 0) return ipv4FromGroups(g[6], g[7]);
2419
+ if (zeros(0, 6) && (g[6] !== 0 || g[7] > 1)) return ipv4FromGroups(g[6], g[7]);
2420
+ if (g[0] === 100 && g[1] === 65435 && zeros(2, 6)) return ipv4FromGroups(g[6], g[7]);
2421
+ if (g[0] === 8194) return ipv4FromGroups(g[1], g[2]);
2422
+ if (g[0] === 8193 && g[1] === 0) return ipv4FromGroups(g[6] ^ 65535, g[7] ^ 65535);
2423
+ return null;
2424
+ }
2425
+ function isPrivateIPv6(ip) {
2426
+ const g = parseIPv6Groups(ip);
2427
+ if (!g) {
2428
+ const lower = ip.toLowerCase();
2429
+ return lower === "::1" || lower === "::" || lower.startsWith("fc") || lower.startsWith("fd");
2430
+ }
2431
+ if (g.every((group) => group === 0)) return true;
2432
+ if (g.slice(0, 7).every((group) => group === 0) && g[7] === 1) return true;
2433
+ if ((g[0] & 65024) === 64512) return true;
2434
+ if ((g[0] & 65472) === 65152) return true;
2435
+ if ((g[0] & 65472) === 65216) return true;
2436
+ if ((g[0] & 65280) === 65280) return true;
2437
+ if (g[0] === 8193 && g[1] === 3512) return true;
2438
+ if (g[0] === 100 && g[1] === 65435 && g[2] === 1) return true;
2439
+ const v4 = embeddedIPv4(ip);
2440
+ if (v4 && isPrivateIPv4(v4)) return true;
2394
2441
  return false;
2395
2442
  }
2396
2443
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ever-works/make-plugin",
3
- "version": "1.0.11",
3
+ "version": "1.0.12",
4
4
  "description": "Make.com Workflow Pipeline Plugin - Delegates Work generation to Make.com scenarios and webhooks",
5
5
  "author": {
6
6
  "name": "Ever Co. LTD",
@@ -33,10 +33,10 @@
33
33
  "test:coverage": "vitest run --coverage"
34
34
  },
35
35
  "peerDependencies": {
36
- "@ever-works/plugin": "^1.2.8"
36
+ "@ever-works/plugin": "^1.2.9"
37
37
  },
38
38
  "devDependencies": {
39
- "@ever-works/plugin": "^1.2.8",
39
+ "@ever-works/plugin": "^1.2.9",
40
40
  "@types/node": "^26.6.4",
41
41
  "tsup": "^8.0.0",
42
42
  "typescript": "^5.9.3",
@@ -76,8 +76,8 @@
76
76
  "url": "https://github.com/ever-works/ever-works/issues"
77
77
  },
78
78
  "everworksRelease": {
79
- "contentHash": "sha256:399657f9195573c29de11e5b00963c52951b8acab946867d362e55f2f8e7e6d3",
80
- "commit": "efd11a2282ea3e514e93f754b9b008543a7cff60",
81
- "source": "https://github.com/ever-works/ever-works/tree/efd11a2282ea3e514e93f754b9b008543a7cff60/packages/plugins/make"
79
+ "contentHash": "sha256:c37968b3bde4e2df97aa42d3e5bd1d39b6dd02057e712790fc11337b608fe8f3",
80
+ "commit": "5b5a17e1cdc02e06383d508a6424a863521fc3e0",
81
+ "source": "https://github.com/ever-works/ever-works/tree/5b5a17e1cdc02e06383d508a6424a863521fc3e0/packages/plugins/make"
82
82
  }
83
83
  }