CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-02-03 22:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: add UpstreamConfig.VerifyDomain

Browse Source 
So the self-check process is only done for ControlD upstream, and can be
distinguished between .com and .dev resolvers.
This commit is contained in:
Cuong Manh Le
2023-05-26 21:33:24 +07:00
committed by Cuong Manh Le
parent 54e63ccf9b
commit 8fda856e24
4 changed files with 76 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/ctrld/cli.go
View File

@@ -36,8 +36,6 @@ import (
"github.com/Control-D-Inc/ctrld/internal/router"
)
const selfCheckFQDN = "verify.controld.com"
var (
version = "dev"
commit = "none"
@@ -289,6 +287,10 @@ func initCLI() {
processCDFlags()
if err := ctrld.ValidateConfig(validator.New(), &cfg); err != nil {
mainLog.Fatal().Msgf("invalid config: %v", err)
}
// Explicitly passing config, so on system where home directory could not be obtained,
// or sub-process env is different with the parent, we still behave correctly and use
// the expected config file.
@@ -320,7 +322,8 @@ func initCLI() {
return
}
status = selfCheckStatus(status)
domain := cfg.Upstream["0"].VerifyDomain()
status = selfCheckStatus(status, domain)
switch status {
case service.StatusRunning:
mainLog.Notice().Msg("Service started")
@@ -855,7 +858,11 @@ func defaultIfaceName() string {
return dri
}
func selfCheckStatus(status service.Status) service.Status {
func selfCheckStatus(status service.Status, domain string) service.Status {
if domain == "" {
// Nothing to do, return the status as-is.
return status
}
c := new(dns.Client)
bo := backoff.NewBackoff("self-check", logf, 10*time.Second)
bo.LogLongerThan = 500 * time.Millisecond
@@ -883,16 +890,16 @@ func selfCheckStatus(status service.Status) service.Status {
}
mu.Unlock()
m := new(dns.Msg)
m.SetQuestion(selfCheckFQDN+".", dns.TypeA)
m.SetQuestion(domain+".", dns.TypeA)
m.RecursionDesired = true
r, _, err := c.ExchangeContext(ctx, m, net.JoinHostPort(lc.IP, strconv.Itoa(lc.Port)))
if r != nil && r.Rcode == dns.RcodeSuccess && len(r.Answer) > 0 {
mainLog.Debug().Msgf("self-check against %q succeeded", selfCheckFQDN)
mainLog.Debug().Msgf("self-check against %q succeeded", domain)
return status
}
bo.BackOff(ctx, fmt.Errorf("ExchangeContext: %w", err))
}
mainLog.Debug().Msgf("self-check against %q failed", selfCheckFQDN)
mainLog.Debug().Msgf("self-check against %q failed", domain)
return service.StatusUnknown
}

2
cmd/ctrld/dns_proxy_test.go
View File

@@ -174,7 +174,7 @@ func Test_macFromMsg(t *testing.T) {
t.Fatal(err)
}
m := new(dns.Msg)
m.SetQuestion(selfCheckFQDN+".", dns.TypeA)
m.SetQuestion("example.com.", dns.TypeA)
o := &dns.OPT{Hdr: dns.RR_Header{Name: ".", Rrtype: dns.TypeOPT}}
if tc.wantMac {
ec1 := &dns.EDNS0_LOCAL{Code: EDNS0_OPTION_MAC, Data: hw}