From 4eb9cda012391c6ba501d67d02268c77f3f3f346 Mon Sep 17 00:00:00 2001
From: Curt Tudor <curt@rentallect.com>
Date: Mon, 26 Aug 2024 11:38:06 -0600
Subject: [PATCH] feat: Cert chain parsing support (#340)

---
 package.json         |  2 +-
 src/http/ziti-xhr.js |  2 +-
 yarn.lock            | 31 +++++++++++++++++++++----------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 4f3c08b..7e0d532 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "@auth0/auth0-spa-js": "^2.0.4",
     "@azure/msal-browser": "^2.38.0",
     "@babel/runtime": "^7.17.9",
-    "@openziti/ziti-browzer-core": "^0.42.0",
+    "@openziti/ziti-browzer-core": "^0.43.0",
     "bowser": "^2.11.0",
     "cookie-interceptor": "^1.0.0",
     "core-js": "^3.22.8",
diff --git a/src/http/ziti-xhr.js b/src/http/ziti-xhr.js
index 1245495..2b1ef35 100644
--- a/src/http/ziti-xhr.js
+++ b/src/http/ziti-xhr.js
@@ -314,7 +314,7 @@ function ZitiXMLHttpRequest () {
     } else {
       url = new URL(`${this.settings.url}`);
       let service = await window.zitiBrowzerRuntime.zitiContext.getServiceNameByHostNameAndPort(url.hostname, null);
-      if (!isNull(service)) {
+      if (!isNull(service) && !isUndefined(service)) {
         url = new URL(`https://${service}${url.pathname}${url.search}`);
         this.settings.url = url.toString();
       }
diff --git a/yarn.lock b/yarn.lock
index 1dd4003..005ba56 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1171,6 +1171,11 @@
   resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b"
   integrity sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==
 
+"@noble/hashes@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.4.0.tgz#45814aa329f30e4fe0ba49426f49dfccdd066426"
+  integrity sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -1200,10 +1205,10 @@
     "@types/emscripten" "^1.39.6"
     "@wasmer/wasi" "^1.0.2"
 
-"@openziti/ziti-browzer-core@^0.42.0":
-  version "0.42.0"
-  resolved "https://registry.yarnpkg.com/@openziti/ziti-browzer-core/-/ziti-browzer-core-0.42.0.tgz#87ae3644a4050e51f4dec83cffd6d97444d2f4c7"
-  integrity sha512-KJm0VjJvWin3qWIF48rGdLeBGWaOBB7RTjbjJyEhInfZcr0rBvG8Wb6ZmOD+cbErL7F6zcC123GWwSDFjwEbyg==
+"@openziti/ziti-browzer-core@^0.43.0":
+  version "0.43.0"
+  resolved "https://registry.yarnpkg.com/@openziti/ziti-browzer-core/-/ziti-browzer-core-0.43.0.tgz#cf6074a50fb69d6ad4273d4441c3417918baf701"
+  integrity sha512-+e2Uc/TE8Pk6+PNYIXDm1vBTbayj3VYp3CqSvneckv6kx5SmkMAnlDjNcODavgbXwCP0eSjxO3+C5/+BOeMfCA==
   dependencies:
     "@openziti/libcrypto-js" "^0.20.0"
     "@openziti/ziti-browzer-edge-client" "^0.6.2"
@@ -1229,7 +1234,7 @@
     mime-types "^2.1.35"
     multistream "^4.1.0"
     pako "^2.1.0"
-    pkijs "^3.1.0"
+    pkijs "^3.2.4"
     process "^0.11.10"
     promise-controller "^1.0.0"
     promise.prototype.finally "^3.1.8"
@@ -5228,16 +5233,17 @@ pkg-dir@^4.1.0:
   dependencies:
     find-up "^4.0.0"
 
-pkijs@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pkijs/-/pkijs-3.1.0.tgz#ea7b84e2b3870582cc38d41473433bbe8b5c3c3c"
-  integrity sha512-N+OCWUp6xrg7OkG+4DIiZUOsp3qMztjq8RGCc1hSY92dsUG8cTlAo7pEkfRGjcdyBv2c1Y9bjAzqdTJAlctuNg==
+pkijs@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/pkijs/-/pkijs-3.2.4.tgz#55ed72b363a20fbd42b139ee3b72e54483635171"
+  integrity sha512-Et9V5QpvBilPFgagJcaKBqXjKrrgF5JL2mSDELk1vvbOTt4fuBhSSsGn9Tcz0TQTfS5GCpXQ31Whrpqeqp0VRg==
   dependencies:
+    "@noble/hashes" "^1.4.0"
     asn1js "^3.0.5"
     bytestreamjs "^2.0.0"
     pvtsutils "^1.3.2"
     pvutils "^1.1.3"
-    tslib "^2.4.0"
+    tslib "^2.6.3"
 
 possible-typed-array-names@^1.0.0:
   version "1.0.0"
@@ -6330,6 +6336,11 @@ tslib@^2.4.0, tslib@^2.6.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
   integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
 
+tslib@^2.6.3:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
+  integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==
+
 tty-browserify@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"