[pac-resolver] Remove ip dependency (#281)

viktor-urbanas-qatalog · web-flow · commit a954da3800cd · 2024-02-12T10:14:12.000-08:00
diff --git a/.changeset/heavy-planets-stare.md b/.changeset/heavy-planets-stare.md
@@ -0,0 +1,5 @@
+---
+'pac-resolver': patch
+---
+
+fix [GHSA-78xj-cgh5-2h22](https://github.com/advisories/GHSA-78xj-cgh5-2h22) vulnerability
diff --git a/packages/pac-resolver/package.json b/packages/pac-resolver/package.json
@@ -9,12 +9,10 @@
   ],
   "dependencies": {
     "degenerator": "^5.0.0",
-    "ip": "^1.1.8",
     "netmask": "^2.0.2"
   },
   "devDependencies": {
     "@tootallnate/quickjs-emscripten": "^0.23.0",
-    "@types/ip": "^1.1.0",
     "@types/jest": "^29.5.2",
     "@types/netmask": "^1.0.30",
     "@types/node": "^14.18.52",
diff --git a/packages/pac-resolver/src/ip.ts b/packages/pac-resolver/src/ip.ts
@@ -0,0 +1,57 @@
+import os from 'os';
+
+export const ip = {
+	address(): string {
+		const interfaces = os.networkInterfaces();
+
+		// Default to `ipv4`
+		const family = normalizeFamily();
+
+		const all = Object.values(interfaces).map((addrs = []) => {
+			const addresses = addrs.filter((details) => {
+				const detailsFamily = normalizeFamily(details.family);
+				if (detailsFamily !== family || ip.isLoopback(details.address)) {
+					return false;
+				}
+				return true;
+
+			});
+
+			return addresses.length ? addresses[0].address : undefined;
+		}).filter(Boolean);
+
+		return !all.length ? ip.loopback(family) : all[0] as string;
+	},
+
+	isLoopback(addr: string): boolean {
+		return /^(::f{4}:)?127\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})/
+			.test(addr)
+			|| /^fe80::1$/.test(addr)
+			|| /^::1$/.test(addr)
+			|| /^::$/.test(addr);
+	},
+
+	loopback(family: IpFamily): string {
+		// Default to `ipv4`
+		family = normalizeFamily(family);
+
+		if (family !== 'ipv4' && family !== 'ipv6') {
+			throw new Error('family must be ipv4 or ipv6');
+		}
+
+		return family === 'ipv4' ? '127.0.0.1' : 'fe80::1';
+	}
+
+};
+
+function normalizeFamily(family?: unknown): IpFamily {
+	if (family === 4) {
+		return 'ipv4';
+	}
+	if (family === 6) {
+		return 'ipv6';
+	}
+	return family ? (family as string).toLowerCase() as IpFamily : 'ipv4';
+}
+
+type IpFamily = 'ipv4' | 'ipv6'
diff --git a/packages/pac-resolver/src/myIpAddress.ts b/packages/pac-resolver/src/myIpAddress.ts
@@ -1,4 +1,4 @@
-import ip from 'ip';
+import { ip } from './ip';
 import net, { AddressInfo } from 'net';
 
 /**
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import ip from 'ip';`
	`1`	`+import { ip } from './ip';`
`2`	`2`	`import net, { AddressInfo } from 'net';`
`3`	`3`
`4`	`4`	`/**`