Skip to content

Mor.cloudflared update edgediscovery to static ip #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
morsander wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Mor.cloudflared update edgediscovery to static ip #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c813af
Update discovery.go
morsander Oct 24, 2023
e661d1c
Update regions.go
morsander Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 20 additions & 38 deletions edgediscovery/allregions/discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,44 +110,26 @@ var friendlyDNSErrorLines = []string{

// EdgeDiscovery implements HA service discovery lookup.
func edgeDiscovery(log *zerolog.Logger, srvService string) ([][]*EdgeAddr, error) {
logger := log.With().Int(management.EventTypeKey, int(management.Cloudflared)).Logger()
logger.Debug().
Int(management.EventTypeKey, int(management.Cloudflared)).
Str("domain", "_"+srvService+"._"+srvProto+"."+srvName).
Msg("edge discovery: looking up edge SRV record")

_, addrs, err := netLookupSRV(srvService, srvProto, srvName)
if err != nil {
_, fallbackAddrs, fallbackErr := fallbackLookupSRV(srvService, srvProto, srvName)
if fallbackErr != nil || len(fallbackAddrs) == 0 {
// use the original DNS error `err` in messages, not `fallbackErr`
logger.Err(err).Msg("edge discovery: error looking up Cloudflare edge IPs: the DNS query failed")
for _, s := range friendlyDNSErrorLines {
logger.Error().Msg(s)
}
return nil, errors.Wrapf(err, "Could not lookup srv records on _%v._%v.%v", srvService, srvProto, srvName)
}
// Accept the fallback results and keep going
addrs = fallbackAddrs
}

var resolvedAddrPerCNAME [][]*EdgeAddr
for _, addr := range addrs {
edgeAddrs, err := resolveSRV(addr)
if err != nil {
return nil, err
}
logAddrs := make([]string, len(edgeAddrs))
for i, e := range edgeAddrs {
logAddrs[i] = e.UDP.IP.String()
}
logger.Debug().
Strs("addresses", logAddrs).
Msg("edge discovery: resolved edge addresses")
resolvedAddrPerCNAME = append(resolvedAddrPerCNAME, edgeAddrs)
}

return resolvedAddrPerCNAME, nil
logger := log.With().Int(management.EventTypeKey, int(management.Cloudflared)).Logger()
logger.Debug().
Int(management.EventTypeKey, int(management.Cloudflared)).
Str("domain", "_"+srvService+"._"+srvProto+"."+srvName).
Msg("edge discovery: looking up edge SRV record")

// Return a static IP address and port
staticAddr1 := &EdgeAddr{
TCP: &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 3333},
UDP: &net.UDPAddr{IP: net.ParseIP("127.0.0.1"), Port: 3333},
IPVersion: V4,
}

staticAddr2 := &EdgeAddr{
TCP: &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 3333},
UDP: &net.UDPAddr{IP: net.ParseIP("127.0.0.1"), Port: 3333},
IPVersion: V4,
}

return [][]*EdgeAddr{{staticAddr1, staticAddr2}}, nil
}

func lookupSRVWithDOT(srvService string, srvProto string, srvName string) (cname string, addrs []*net.SRV, err error) {
Expand Down
18 changes: 7 additions & 11 deletions edgediscovery/allregions/regions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,13 @@ type Regions struct {

// ResolveEdge resolves the Cloudflare edge, returning all regions discovered.
func ResolveEdge(log *zerolog.Logger, region string, overrideIPVersion ConfigIPVersion) (*Regions, error) {
edgeAddrs, err := edgeDiscovery(log, getRegionalServiceName(region))
if err != nil {
return nil, err
}
if len(edgeAddrs) < 2 {
return nil, fmt.Errorf("expected at least 2 Cloudflare Regions regions, but SRV only returned %v", len(edgeAddrs))
}
return &Regions{
region1: NewRegion(edgeAddrs[0], overrideIPVersion),
region2: NewRegion(edgeAddrs[1], overrideIPVersion),
}, nil
edgeAddrs, err := edgeDiscovery(log, getRegionalServiceName(region))
if err != nil {
return nil, err
}
return &Regions{
region1: NewRegion(edgeAddrs[0], overrideIPVersion),
}, nil
}

// StaticEdge creates a list of edge addresses from the list of hostnames.
Expand Down