From a06390a078a33a0e7943859ffd27f3656b62da2a Mon Sep 17 00:00:00 2001 From: Adam Chalmers Date: Wed, 4 Sep 2019 13:21:45 -0500 Subject: [PATCH] TUN-2201: change SRV records used by cloudflared This changes cloudflarewarp.com to argotunnel.com and _warp to _origintunneld. We've changed which zone we host the SRV records for Argo Tunnel on. --- cmd/cloudflared/transfer/transfer.go | 2 +- cmd/cloudflared/tunnel/login.go | 2 +- connection/discovery.go | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmd/cloudflared/transfer/transfer.go b/cmd/cloudflared/transfer/transfer.go index 3e3a4d5f..10be1a04 100644 --- a/cmd/cloudflared/transfer/transfer.go +++ b/cmd/cloudflared/transfer/transfer.go @@ -18,7 +18,7 @@ import ( ) const ( - baseStoreURL = "https://login.cloudflarewarp.com/" + baseStoreURL = "https://login.argotunnel.com/" clientTimeout = time.Second * 60 ) diff --git a/cmd/cloudflared/tunnel/login.go b/cmd/cloudflared/tunnel/login.go index 375d39cb..1eb94936 100644 --- a/cmd/cloudflared/tunnel/login.go +++ b/cmd/cloudflared/tunnel/login.go @@ -15,7 +15,7 @@ import ( const ( baseLoginURL = "https://dash.cloudflare.com/argotunnel" - callbackStoreURL = "https://login.cloudflarewarp.com/" + callbackStoreURL = "https://login.argotunnel.com/" ) func login(c *cli.Context) error { diff --git a/connection/discovery.go b/connection/discovery.go index 7170f760..8a9ac3fa 100644 --- a/connection/discovery.go +++ b/connection/discovery.go @@ -13,13 +13,13 @@ import ( ) const ( - // Used to discover HA Warp servers - srvService = "warp" + // Used to discover HA origintunneld servers + srvService = "origintunneld" srvProto = "tcp" - srvName = "cloudflarewarp.com" + srvName = "argotunnel.com" // Used to fallback to DoT when we can't use the default resolver to - // discover HA Warp servers (GitHub issue #75). + // discover HA origintunneld servers (GitHub issue #75). dotServerName = "cloudflare-dns.com" dotServerAddr = "1.1.1.1:853" dotTimeout = time.Duration(15 * time.Second) @@ -30,8 +30,8 @@ const ( var friendlyDNSErrorLines = []string{ `Please try the following things to diagnose this issue:`, - ` 1. ensure that cloudflarewarp.com is returning "warp" service records.`, - ` Run your system's equivalent of: dig srv _warp._tcp.cloudflarewarp.com`, + ` 1. ensure that argotunnel.com is returning "origintunneld" service records.`, + ` Run your system's equivalent of: dig srv _origintunneld._tcp.argotunnel.com`, ` 2. ensure that your DNS resolver is not returning compressed SRV records.`, ` See GitHub issue https://github.com/golang/go/issues/27546`, ` For example, you could use Cloudflare's 1.1.1.1 as your resolver:`, @@ -102,7 +102,7 @@ func EdgeDiscovery(logger *logrus.Entry) ([]*net.TCPAddr, error) { // Try to fall back to DoT from Cloudflare directly. // // Note: Instead of DoT, we could also have used DoH. Either of these: - // - directly via the JSON API (https://1.1.1.1/dns-query?ct=application/dns-json&name=_warp._tcp.cloudflarewarp.com&type=srv) + // - directly via the JSON API (https://1.1.1.1/dns-query?ct=application/dns-json&name=_origintunneld._tcp.argotunnel.com&type=srv) // - indirectly via `tunneldns.NewUpstreamHTTPS()` // But both of these cases miss out on a key feature from the stdlib: // "The returned records are sorted by priority and randomized by weight within a priority." @@ -119,7 +119,7 @@ func EdgeDiscovery(logger *logrus.Entry) ([]*net.TCPAddr, error) { for _, s := range friendlyDNSErrorLines { logger.Errorln(s) } - return nil, errors.Wrap(err, "Could not lookup srv records on _warp._tcp.cloudflarewarp.com") + return nil, errors.Wrap(err, "Could not lookup srv records on _origintunneld._tcp.argotunnel.com") } // Accept the fallback results and keep going addrs = fallbackAddrs