Merge branch 'master' into lj-tokenMinting

firebase · Apr 27, 2022 · 11670a0 · 11670a0
2 parents 0dec725 + 28b3467
commit 11670a0
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 2 deletions.
diff --git a/src/emulator/functionsEmulatorRuntime.ts b/src/emulator/functionsEmulatorRuntime.ts
@@ -19,7 +19,7 @@ import {
   HttpConstants,
   SignatureType,
 } from "./functionsEmulatorShared";
-import { compareVersionStrings } from "./functionsEmulatorUtils";
+import { compareVersionStrings, isLocalHost } from "./functionsEmulatorUtils";
 
 let functionModule: any;
 let FUNCTION_TARGET_NAME: string;
@@ -365,7 +365,7 @@ function initializeNetworkFiltering(frb: FunctionsRuntimeBundle): void {
         .filter((v) => v);
       const href = (hrefs.length && hrefs[0]) || "";
 
-      if (href && !history[href] && !href.startsWith("http://localhost")) {
+      if (href && !history[href] && !isLocalHost(href)) {
         history[href] = true;
         if (href.indexOf("googleapis.com") !== -1) {
           new EmulatorLog("SYSTEM", "googleapis-network-access", "", {

diff --git a/src/emulator/functionsEmulatorUtils.ts b/src/emulator/functionsEmulatorUtils.ts
@@ -131,3 +131,10 @@ export function compareVersionStrings(a?: string, b?: string) {
 
   return 0;
 }
+
+/**
+ * Check if a url is localhost
+ */
+export function isLocalHost(href: string): boolean {
+  return !!href.match(/^(http(s)?:\/\/)?(localhost|127.0.0.1|\[::1])/);
+}
diff --git a/src/test/emulators/functionsEmulatorUtils.spec.ts b/src/test/emulators/functionsEmulatorUtils.spec.ts
@@ -5,6 +5,7 @@ import {
   trimSlashes,
   compareVersionStrings,
   parseRuntimeVersion,
+  isLocalHost,
 } from "../../emulator/functionsEmulatorUtils";
 
 describe("FunctionsEmulatorUtils", () => {
@@ -138,4 +139,48 @@ describe("FunctionsEmulatorUtils", () => {
       expect(parseRuntimeVersion("banana")).to.eql(undefined);
     });
   });
+
+  describe("isLocalHost", () => {
+    const testCases: {
+      desc: string;
+      href: string;
+      expected: boolean;
+    }[] = [
+      {
+        desc: "should return true for localhost",
+        href: "http://localhost:4000",
+        expected: true,
+      },
+      {
+        desc: "should return true for 127.0.0.1",
+        href: "127.0.0.1:5001/firestore",
+        expected: true,
+      },
+      {
+        desc: "should return true for ipv6 loopback",
+        href: "[::1]:5001/firestore",
+        expected: true,
+      },
+      {
+        desc: "should work with https",
+        href: "https://127.0.0.1:5001/firestore",
+        expected: true,
+      },
+      {
+        desc: "should return false for external uri",
+        href: "http://google.com/what-is-localhost",
+        expected: false,
+      },
+      {
+        desc: "should return false for external ip",
+        href: "123:100:99:12",
+        expected: false,
+      },
+    ];
+    for (const t of testCases) {
+      it(t.desc, () => {
+        expect(isLocalHost(t.href)).to.eq(t.expected);
+      });
+    }
+  });
 });