fix: Correct sub-domain Service-routing issue (#238)

openziti · Jan 16, 2025 · d2e0999 · d2e0999
1 parent 62e645c
commit d2e0999
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/src/ZitiFirstStrategy.ts b/src/ZitiFirstStrategy.ts
@@ -608,14 +608,21 @@ class ZitiFirstStrategy extends CacheFirst /* NetworkFirst */ {
         }  
         else {
 
-          newUrl.hostname = this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.browzer.bootstrapper.target.service;
-          newUrl.port = this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.browzer.bootstrapper.target.port;
-
-          if (
-            isEqual(newUrl.port, this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.browzer.bootstrapper.self.port) ||
-            isEqual(newUrl.port, this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.browzer.loadbalancer.port)
-          ) {
-            newUrl.port = '';
+          // Don't muck with URL only because top-level domain of target matches the top-level domain of the load-balancer. 
+          // Only do that if the entire hostname matches, or else sub-domains represented by different Services will be routed 
+          // to the wrong place.
+          if (!isEqual(newUrl.hostname, this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.browzer.bootstrapper.self.host)) {
+
+            newUrl.hostname = this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.browzer.bootstrapper.target.service;
+            newUrl.port = this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.browzer.bootstrapper.target.port;
+
+            if (
+              isEqual(newUrl.port, this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.browzer.bootstrapper.self.port) ||
+              isEqual(newUrl.port, this._zitiBrowzerServiceWorkerGlobalScope._zitiConfig.browzer.loadbalancer.port)
+            ) {
+              newUrl.port = '';
+            }
+
           }
 
           var pathnameArray = newUrl.pathname.split('/');