@ever-works/hermes-agent-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
@@ -3773,6 +3773,7 @@ function isSafeWebhookUrl(rawUrl) {
3773
3773
  if (host.startsWith("[") && host.endsWith("]")) {
3774
3774
  host = host.slice(1, -1);
3775
3775
  }
3776
+ host = host.replace(/\.+$/, "");
3776
3777
  if (CLOUD_METADATA_HOSTNAMES.has(host)) {
3777
3778
  return false;
3778
3779
  }
@@ -3802,23 +3803,69 @@ function isPrivateIPv4(ip) {
3802
3803
  if (a === 172 && b >= 16 && b <= 31) return true;
3803
3804
  if (a === 192 && b === 168) return true;
3804
3805
  if (a === 192 && b === 0 && parts[2] === 0) return true;
3806
+ if (a === 198 && (b === 18 || b === 19)) return true;
3807
+ if (a === 192 && b === 0 && parts[2] === 2) return true;
3808
+ if (a === 198 && b === 51 && parts[2] === 100) return true;
3809
+ if (a === 203 && b === 0 && parts[2] === 113) return true;
3805
3810
  if (a === 100 && b >= 64 && b <= 127) return true;
3806
3811
  if (a >= 224) return true;
3807
3812
  return false;
3808
3813
  }
3809
- function isPrivateIPv6(ip) {
3810
- const lower = ip.toLowerCase();
3811
- if (lower === "::1" || lower === "::") return true;
3812
- if (lower.startsWith("fc") || lower.startsWith("fd")) return true;
3813
- const firstHextet = lower.split(":", 1)[0];
3814
- if (/^[0-9a-f]{1,4}$/.test(firstHextet)) {
3815
- const group0 = parseInt(firstHextet, 16);
3816
- if ((group0 & 65472) === 65152) return true;
3814
+ function parseIPv6Groups(ip) {
3815
+ let text = ip.trim().toLowerCase();
3816
+ const zone = text.indexOf("%");
3817
+ if (zone >= 0) text = text.slice(0, zone);
3818
+ if ((0, import_net.isIP)(text) !== 6) return null;
3819
+ const lastColon = text.lastIndexOf(":");
3820
+ const tail = text.slice(lastColon + 1);
3821
+ if (tail.includes(".")) {
3822
+ if ((0, import_net.isIP)(tail) !== 4) return null;
3823
+ const [a, b, c, d] = tail.split(".").map((part) => Number(part));
3824
+ text = `${text.slice(0, lastColon + 1)}${(a << 8 | b).toString(16)}:${(c << 8 | d).toString(16)}`;
3825
+ }
3826
+ const halves = text.split("::");
3827
+ if (halves.length > 2) return null;
3828
+ const head = halves[0] ? halves[0].split(":") : [];
3829
+ const rest = halves.length === 2 && halves[1] ? halves[1].split(":") : [];
3830
+ const fill = halves.length === 2 ? 8 - head.length - rest.length : 0;
3831
+ if (fill < 0) return null;
3832
+ const groups = [...head, ...new Array(fill).fill("0"), ...rest].map((group) => parseInt(group, 16));
3833
+ if (groups.length !== 8 || groups.some((group) => Number.isNaN(group) || group < 0 || group > 65535)) {
3834
+ return null;
3817
3835
  }
3818
- if (lower.startsWith("::ffff:")) {
3819
- const v4 = lower.slice("::ffff:".length);
3820
- if ((0, import_net.isIP)(v4) === 4) return isPrivateIPv4(v4);
3836
+ return groups;
3837
+ }
3838
+ function ipv4FromGroups(high, low) {
3839
+ return `${high >> 8}.${high & 255}.${low >> 8}.${low & 255}`;
3840
+ }
3841
+ function embeddedIPv4(ip) {
3842
+ const g = parseIPv6Groups(ip);
3843
+ if (!g) return null;
3844
+ const zeros = (from, to) => g.slice(from, to).every((group) => group === 0);
3845
+ if (zeros(0, 5) && g[5] === 65535) return ipv4FromGroups(g[6], g[7]);
3846
+ if (zeros(0, 4) && g[4] === 65535 && g[5] === 0) return ipv4FromGroups(g[6], g[7]);
3847
+ if (zeros(0, 6) && (g[6] !== 0 || g[7] > 1)) return ipv4FromGroups(g[6], g[7]);
3848
+ if (g[0] === 100 && g[1] === 65435 && zeros(2, 6)) return ipv4FromGroups(g[6], g[7]);
3849
+ if (g[0] === 8194) return ipv4FromGroups(g[1], g[2]);
3850
+ if (g[0] === 8193 && g[1] === 0) return ipv4FromGroups(g[6] ^ 65535, g[7] ^ 65535);
3851
+ return null;
3852
+ }
3853
+ function isPrivateIPv6(ip) {
3854
+ const g = parseIPv6Groups(ip);
3855
+ if (!g) {
3856
+ const lower = ip.toLowerCase();
3857
+ return lower === "::1" || lower === "::" || lower.startsWith("fc") || lower.startsWith("fd");
3821
3858
  }
3859
+ if (g.every((group) => group === 0)) return true;
3860
+ if (g.slice(0, 7).every((group) => group === 0) && g[7] === 1) return true;
3861
+ if ((g[0] & 65024) === 64512) return true;
3862
+ if ((g[0] & 65472) === 65152) return true;
3863
+ if ((g[0] & 65472) === 65216) return true;
3864
+ if ((g[0] & 65280) === 65280) return true;
3865
+ if (g[0] === 8193 && g[1] === 3512) return true;
3866
+ if (g[0] === 100 && g[1] === 65435 && g[2] === 1) return true;
3867
+ const v4 = embeddedIPv4(ip);
3868
+ if (v4 && isPrivateIPv4(v4)) return true;
3822
3869
  return false;
3823
3870
  }
3824
3871
 
package/dist/index.js CHANGED
@@ -3734,6 +3734,7 @@ function isSafeWebhookUrl(rawUrl) {
3734
3734
  if (host.startsWith("[") && host.endsWith("]")) {
3735
3735
  host = host.slice(1, -1);
3736
3736
  }
3737
+ host = host.replace(/\.+$/, "");
3737
3738
  if (CLOUD_METADATA_HOSTNAMES.has(host)) {
3738
3739
  return false;
3739
3740
  }
@@ -3763,23 +3764,69 @@ function isPrivateIPv4(ip) {
3763
3764
  if (a === 172 && b >= 16 && b <= 31) return true;
3764
3765
  if (a === 192 && b === 168) return true;
3765
3766
  if (a === 192 && b === 0 && parts[2] === 0) return true;
3767
+ if (a === 198 && (b === 18 || b === 19)) return true;
3768
+ if (a === 192 && b === 0 && parts[2] === 2) return true;
3769
+ if (a === 198 && b === 51 && parts[2] === 100) return true;
3770
+ if (a === 203 && b === 0 && parts[2] === 113) return true;
3766
3771
  if (a === 100 && b >= 64 && b <= 127) return true;
3767
3772
  if (a >= 224) return true;
3768
3773
  return false;
3769
3774
  }
3770
- function isPrivateIPv6(ip) {
3771
- const lower = ip.toLowerCase();
3772
- if (lower === "::1" || lower === "::") return true;
3773
- if (lower.startsWith("fc") || lower.startsWith("fd")) return true;
3774
- const firstHextet = lower.split(":", 1)[0];
3775
- if (/^[0-9a-f]{1,4}$/.test(firstHextet)) {
3776
- const group0 = parseInt(firstHextet, 16);
3777
- if ((group0 & 65472) === 65152) return true;
3775
+ function parseIPv6Groups(ip) {
3776
+ let text = ip.trim().toLowerCase();
3777
+ const zone = text.indexOf("%");
3778
+ if (zone >= 0) text = text.slice(0, zone);
3779
+ if (isIP(text) !== 6) return null;
3780
+ const lastColon = text.lastIndexOf(":");
3781
+ const tail = text.slice(lastColon + 1);
3782
+ if (tail.includes(".")) {
3783
+ if (isIP(tail) !== 4) return null;
3784
+ const [a, b, c, d] = tail.split(".").map((part) => Number(part));
3785
+ text = `${text.slice(0, lastColon + 1)}${(a << 8 | b).toString(16)}:${(c << 8 | d).toString(16)}`;
3786
+ }
3787
+ const halves = text.split("::");
3788
+ if (halves.length > 2) return null;
3789
+ const head = halves[0] ? halves[0].split(":") : [];
3790
+ const rest = halves.length === 2 && halves[1] ? halves[1].split(":") : [];
3791
+ const fill = halves.length === 2 ? 8 - head.length - rest.length : 0;
3792
+ if (fill < 0) return null;
3793
+ const groups = [...head, ...new Array(fill).fill("0"), ...rest].map((group) => parseInt(group, 16));
3794
+ if (groups.length !== 8 || groups.some((group) => Number.isNaN(group) || group < 0 || group > 65535)) {
3795
+ return null;
3778
3796
  }
3779
- if (lower.startsWith("::ffff:")) {
3780
- const v4 = lower.slice("::ffff:".length);
3781
- if (isIP(v4) === 4) return isPrivateIPv4(v4);
3797
+ return groups;
3798
+ }
3799
+ function ipv4FromGroups(high, low) {
3800
+ return `${high >> 8}.${high & 255}.${low >> 8}.${low & 255}`;
3801
+ }
3802
+ function embeddedIPv4(ip) {
3803
+ const g = parseIPv6Groups(ip);
3804
+ if (!g) return null;
3805
+ const zeros = (from, to) => g.slice(from, to).every((group) => group === 0);
3806
+ if (zeros(0, 5) && g[5] === 65535) return ipv4FromGroups(g[6], g[7]);
3807
+ if (zeros(0, 4) && g[4] === 65535 && g[5] === 0) return ipv4FromGroups(g[6], g[7]);
3808
+ if (zeros(0, 6) && (g[6] !== 0 || g[7] > 1)) return ipv4FromGroups(g[6], g[7]);
3809
+ if (g[0] === 100 && g[1] === 65435 && zeros(2, 6)) return ipv4FromGroups(g[6], g[7]);
3810
+ if (g[0] === 8194) return ipv4FromGroups(g[1], g[2]);
3811
+ if (g[0] === 8193 && g[1] === 0) return ipv4FromGroups(g[6] ^ 65535, g[7] ^ 65535);
3812
+ return null;
3813
+ }
3814
+ function isPrivateIPv6(ip) {
3815
+ const g = parseIPv6Groups(ip);
3816
+ if (!g) {
3817
+ const lower = ip.toLowerCase();
3818
+ return lower === "::1" || lower === "::" || lower.startsWith("fc") || lower.startsWith("fd");
3782
3819
  }
3820
+ if (g.every((group) => group === 0)) return true;
3821
+ if (g.slice(0, 7).every((group) => group === 0) && g[7] === 1) return true;
3822
+ if ((g[0] & 65024) === 64512) return true;
3823
+ if ((g[0] & 65472) === 65152) return true;
3824
+ if ((g[0] & 65472) === 65216) return true;
3825
+ if ((g[0] & 65280) === 65280) return true;
3826
+ if (g[0] === 8193 && g[1] === 3512) return true;
3827
+ if (g[0] === 100 && g[1] === 65435 && g[2] === 1) return true;
3828
+ const v4 = embeddedIPv4(ip);
3829
+ if (v4 && isPrivateIPv4(v4)) return true;
3783
3830
  return false;
3784
3831
  }
3785
3832
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ever-works/hermes-agent-plugin",
3
- "version": "1.0.11",
3
+ "version": "1.0.12",
4
4
  "description": "Hermes Agent pipeline plugin for Ever Works",
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",
@@ -73,8 +73,8 @@
73
73
  "url": "https://github.com/ever-works/ever-works/issues"
74
74
  },
75
75
  "everworksRelease": {
76
- "contentHash": "sha256:455aff0fea56e1eb8b2fa6fc9e7b8f5b9b240ff17eab81824467e7a8ba00f1d2",
77
- "commit": "efd11a2282ea3e514e93f754b9b008543a7cff60",
78
- "source": "https://github.com/ever-works/ever-works/tree/efd11a2282ea3e514e93f754b9b008543a7cff60/packages/plugins/hermes-agent"
76
+ "contentHash": "sha256:36d5a45a53d2a55ffd25bf420ef367c90aac6f33d10aea6a65b314d2f0039cfd",
77
+ "commit": "5b5a17e1cdc02e06383d508a6424a863521fc3e0",
78
+ "source": "https://github.com/ever-works/ever-works/tree/5b5a17e1cdc02e06383d508a6424a863521fc3e0/packages/plugins/hermes-agent"
79
79
  }
80
80
  }