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

cmd/cli: write auto split rule for AD to config file

Browse Source
This commit is contained in:
Cuong Manh Le
2024-09-24 15:09:05 +07:00
committed by Cuong Manh Le
parent 4befd33866
commit ce353cd4d9
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cli/ad_others.go
View File

@@ -7,4 +7,4 @@ import (
)
// addExtraSplitDnsRule adds split DNS rule if present.
func addExtraSplitDnsRule(_ *ctrld.ListenerConfig) {}
func addExtraSplitDnsRule(_ *ctrld.Config) {}

24
cmd/cli/ad_windows.go
View File

@@ -8,10 +8,7 @@ import (
)
// addExtraSplitDnsRule adds split DNS rule for domain if it's part of active directory.
func addExtraSplitDnsRule(lc *ctrld.ListenerConfig) {
if lc.Policy == nil {
lc.Policy = &ctrld.ListenerPolicyConfig{}
}
func addExtraSplitDnsRule(cfg *ctrld.Config) {
domain, err := getActiveDirectoryDomain()
if err != nil {
mainLog.Load().Debug().Msgf("unable to get active directory domain: %v", err)
@@ -21,15 +18,20 @@ func addExtraSplitDnsRule(lc *ctrld.ListenerConfig) {
mainLog.Load().Debug().Msg("no active directory domain found")
return
}
domainRule := "*." + strings.TrimPrefix(domain, ".")
for _, rule := range lc.Policy.Rules {
if _, ok := rule[domainRule]; ok {
mainLog.Load().Debug().Msg("domain rule already exist")
return
for n, lc := range cfg.Listener {
if lc.Policy == nil {
lc.Policy = &ctrld.ListenerPolicyConfig{}
}
domainRule := "*." + strings.TrimPrefix(domain, ".")
for _, rule := range lc.Policy.Rules {
if _, ok := rule[domainRule]; ok {
mainLog.Load().Debug().Msgf("domain rule already exist for listener.%s", n)
return
}
}
mainLog.Load().Debug().Msgf("adding active directory domain for listener.%s", n)
lc.Policy.Rules = append(lc.Policy.Rules, ctrld.Rule{domainRule: []string{}})
}
mainLog.Load().Debug().Msg("adding active directory domain")
lc.Policy.Rules = append(lc.Policy.Rules, ctrld.Rule{domainRule: []string{}})
}
// getActiveDirectoryDomain returns AD domain name of this computer.

1
cmd/cli/cli.go
View File

@@ -1383,6 +1383,7 @@ func run(appCallback *AppCallback, stopCh chan struct{}) {
}
func writeConfigFile(cfg *ctrld.Config) error {
addExtraSplitDnsRule(cfg)
if cfu := v.ConfigFileUsed(); cfu != "" {
defaultConfigFile = cfu
} else if configPath != "" {

1
cmd/cli/prog.go
View File

@@ -439,7 +439,6 @@ func (p *prog) run(reload bool, reloadCh chan struct{}) {
for listenerNum := range p.cfg.Listener {
p.cfg.Listener[listenerNum].Init()
addExtraSplitDnsRule(p.cfg.Listener[listenerNum])
if !reload {
go func(listenerNum string) {
listenerConfig := p.cfg.Listener[listenerNum]