Fix checks for local development DNS name (#474)

microsoft · Aug 22, 2024 · 5df299d · 5df299d
1 parent 3679192
commit 5df299d
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 10 deletions.
diff --git a/cs/src/Management/TunnelManagementClient.cs b/cs/src/Management/TunnelManagementClient.cs
@@ -785,7 +785,9 @@ private Uri BuildUri(
             if (!string.IsNullOrEmpty(clusterId) &&
                 baseAddress.HostNameType == UriHostNameType.Dns)
             {
-                if (baseAddress.Host != "localhost" && !baseAddress.Host.Contains(".local") &&
+                // tunnels.local.api.visualstudio.com resolves to localhost (for local development).
+                if (baseAddress.Host != "localhost" &&
+                    baseAddress.Host != "tunnels.local.api.visualstudio.com" &&
                     !baseAddress.Host.StartsWith($"{clusterId}."))
                 {
                     // A specific cluster ID was specified (while not running on localhost).

diff --git a/go/tunnels/manager.go b/go/tunnels/manager.go
@@ -108,7 +108,8 @@ func NewManager(userAgents []UserAgent, tp tokenProviderfn, tunnelServiceUrl *ur
 
 	var client *http.Client
 	if httpHandler == nil {
-		if strings.Contains(tunnelServiceUrl.Host, "localhost") || strings.Contains(tunnelServiceUrl.Host, ".local") {
+		// tunnels.local.api.visualstudio.com resolves to localhost (for local development).
+		if tunnelServiceUrl.Host == "localhost" || tunnelServiceUrl.Host == "tunnels.local.api.visualstudio.com" {
 			client = &http.Client{Transport: &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}}
 		} else {
 			client = &http.Client{}
@@ -825,8 +826,9 @@ func (m *Manager) getAccessToken(tunnel *Tunnel, tunnelRequestOptions *TunnelReq
 func (m *Manager) buildUri(clusterId string, path string, options *TunnelRequestOptions, query string) *url.URL {
 	baseAddress := m.uri
 	if clusterId != "" {
-		if !strings.HasPrefix(baseAddress.Host, "localhost") &&
-			!strings.Contains(baseAddress.Host, ".local") &&
+		// tunnels.local.api.visualstudio.com resolves to localhost (for local development).
+		if baseAddress.Host != "localhost" &&
+			baseAddress.Host != "tunnels.local.api.visualstudio.com" &&
 			!strings.HasPrefix(baseAddress.Host, clusterId) {
 			// A specific cluster ID was specified (while not running on localhost).
 			// Prepend the cluster ID to the hostname, and optionally strip a global prefix.

diff --git a/go/tunnels/tunnels.go b/go/tunnels/tunnels.go
@@ -10,7 +10,7 @@ import (
 	"github.com/rodaine/table"
 )
 
-const PackageVersion = "0.1.11"
+const PackageVersion = "0.1.12"
 
 func (tunnel *Tunnel) requestObject() (*Tunnel, error) {
 	convertedTunnel := &Tunnel{

diff --git a/java/src/main/java/com/microsoft/tunnels/management/TunnelManagementClient.java b/java/src/main/java/com/microsoft/tunnels/management/TunnelManagementClient.java
@@ -300,9 +300,10 @@ private URI buildUri(String clusterId,
     String host = null;
     int port = baseAddress.getPort();
 
+		// tunnels.local.api.visualstudio.com resolves to localhost (for local development).
     if (StringUtils.isNotBlank(clusterId)) {
       if (!baseAddress.getHost().equals("localhost")
-          && !baseAddress.getHost().contains(".local")
+          && !baseAddress.getHost().equals("tunnels.local.api.visualstudio.com")
           && !baseAddress.getHost().startsWith(clusterId + ".")) {
         host = (clusterId + "." + baseAddress.getHost()).replace("global.", "");
       } else if (baseAddress.getScheme().equals("https")

diff --git a/ts/src/connections/package.json b/ts/src/connections/package.json
@@ -18,8 +18,8 @@
 		"buffer": "^5.2.1",
 		"debug": "^4.1.1",
 		"vscode-jsonrpc": "^4.0.0",
-		"@microsoft/dev-tunnels-contracts": ">1.1.32",
-		"@microsoft/dev-tunnels-management": ">1.1.32",
+		"@microsoft/dev-tunnels-contracts": ">1.1.37",
+		"@microsoft/dev-tunnels-management": ">1.1.37",
 		"@microsoft/dev-tunnels-ssh": "^3.11.36",
 		"@microsoft/dev-tunnels-ssh-tcp": "^3.11.36",
 		"uuid": "^3.3.3",

diff --git a/ts/src/management/package.json b/ts/src/management/package.json
@@ -18,7 +18,7 @@
 		"buffer": "^5.2.1",
 		"debug": "^4.1.1",
 		"vscode-jsonrpc": "^4.0.0",
-		"@microsoft/dev-tunnels-contracts": ">1.1.32",
+		"@microsoft/dev-tunnels-contracts": ">1.1.37",
 		"axios": "^1.6.6"
 	}
 }
diff --git a/ts/src/management/tunnelManagementHttpClient.ts b/ts/src/management/tunnelManagementHttpClient.ts
@@ -875,8 +875,10 @@ export class TunnelManagementHttpClient implements TunnelManagementClient {
         if (clusterId) {
             const url = new URL(baseAddress);
             const portNumber = parseInt(url.port, 10);
+
+            // tunnels.local.api.visualstudio.com resolves to localhost (for local development).
             if (url.hostname !== 'localhost' &&
-                !url.hostname.includes('.local') &&
+                url.hostname !== 'tunnels.local.api.visualstudio.com' &&
                 !url.hostname.startsWith(`${clusterId}.`)
             ) {
                 // A specific cluster ID was specified (while not running on localhost).