curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Adam Chalmers 2019-09-04 13:21:45 -05:00
parent 2cac1f0f78
commit a06390a078
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cloudflared/transfer/transfer.go
View File

@ -18,7 +18,7 @@ import (
) )
const ( const (
baseStoreURL = "https://login.cloudflarewarp.com/" baseStoreURL = "https://login.argotunnel.com/"
clientTimeout = time.Second * 60 clientTimeout = time.Second * 60
) )

2
cmd/cloudflared/tunnel/login.go
View File

@ -15,7 +15,7 @@ import (
const ( const (
baseLoginURL = "https://dash.cloudflare.com/argotunnel" baseLoginURL = "https://dash.cloudflare.com/argotunnel"
callbackStoreURL = "https://login.cloudflarewarp.com/" callbackStoreURL = "https://login.argotunnel.com/"
) )
func login(c *cli.Context) error { func login(c *cli.Context) error {

16
connection/discovery.go
View File

@ -13,13 +13,13 @@ import (
) )
const ( const (
// Used to discover HA Warp servers // Used to discover HA origintunneld servers
srvService = "warp" srvService = "origintunneld"
srvProto = "tcp" srvProto = "tcp"
srvName = "cloudflarewarp.com" srvName = "argotunnel.com"
// Used to fallback to DoT when we can't use the default resolver to // 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" dotServerName = "cloudflare-dns.com"
dotServerAddr = "1.1.1.1:853" dotServerAddr = "1.1.1.1:853"
dotTimeout = time.Duration(15 * time.Second) dotTimeout = time.Duration(15 * time.Second)
@ -30,8 +30,8 @@ const (
var friendlyDNSErrorLines = []string{ var friendlyDNSErrorLines = []string{
`Please try the following things to diagnose this issue:`, `Please try the following things to diagnose this issue:`,
` 1. ensure that cloudflarewarp.com is returning "warp" service records.`, ` 1. ensure that argotunnel.com is returning "origintunneld" service records.`,
` Run your system's equivalent of: dig srv _warp._tcp.cloudflarewarp.com`, ` Run your system's equivalent of: dig srv _origintunneld._tcp.argotunnel.com`,
` 2. ensure that your DNS resolver is not returning compressed SRV records.`, ` 2. ensure that your DNS resolver is not returning compressed SRV records.`,
` See GitHub issue https://github.com/golang/go/issues/27546`, ` See GitHub issue https://github.com/golang/go/issues/27546`,
` For example, you could use Cloudflare's 1.1.1.1 as your resolver:`, ` 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. // Try to fall back to DoT from Cloudflare directly.
// //
// Note: Instead of DoT, we could also have used DoH. Either of these: // 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()` // - indirectly via `tunneldns.NewUpstreamHTTPS()`
// But both of these cases miss out on a key feature from the stdlib: // 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." // "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 { for _, s := range friendlyDNSErrorLines {
logger.Errorln(s) 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 // Accept the fallback results and keep going
addrs = fallbackAddrs addrs = fallbackAddrs