CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-08-10 13:20:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

internal/router/dnsmasq: always include client's mac/ip

Browse Source 
Since ctrld now supports MAC rules, the client's mac and ip must always
be sent to ctrld. Otherwise, the mac policy won't work when ctrld is an
upstream of dnsmasq.
This commit is contained in:
Cuong Manh Le
2024-01-22 23:13:31 +07:00
committed by Cuong Manh Le
parent 28984090e5
commit e42554f892
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/router/dnsmasq/dnsmasq.go
+7 -13
View File
@@ -15,10 +15,8 @@ no-resolv
{{- range .Upstreams}} {{- range .Upstreams}}
server={{ .IP }}#{{ .Port }} server={{ .IP }}#{{ .Port }}
{{- end}} {{- end}}
{{- if .SendClientInfo}}
add-mac add-mac
add-subnet=32,128 add-subnet=32,128
{{- end}}
{{- if .CacheDisabled}} {{- if .CacheDisabled}}
cache-size=0 cache-size=0
{{- else}} {{- else}}
@@ -44,12 +42,10 @@ if [ -n "$pid" ] && [ -f "/proc/${pid}/cmdline" ]; then
{{- range .Upstreams}} {{- range .Upstreams}}
pc_append "server={{ .IP }}#{{ .Port }}" "$config_file" pc_append "server={{ .IP }}#{{ .Port }}" "$config_file"
{{- end}} {{- end}}
{{- if .SendClientInfo}}
pc_delete "add-mac" "$config_file" pc_delete "add-mac" "$config_file"
pc_delete "add-subnet" "$config_file" pc_delete "add-subnet" "$config_file"
pc_append "add-mac" "$config_file" # add client mac pc_append "add-mac" "$config_file" # add client mac
pc_append "add-subnet=32,128" "$config_file" # add client ip pc_append "add-subnet=32,128" "$config_file" # add client ip
{{- end}}
pc_delete "dnssec" "$config_file" # disable DNSSEC pc_delete "dnssec" "$config_file" # disable DNSSEC
pc_delete "trust-anchor=" "$config_file" # disable DNSSEC pc_delete "trust-anchor=" "$config_file" # disable DNSSEC
pc_delete "cache-size=" "$config_file" pc_delete "cache-size=" "$config_file"
@@ -92,29 +88,27 @@ func ConfTmplWithCacheDisabled(tmplText string, cfg *ctrld.Config, cacheDisabled
ip = "127.0.0.1" ip = "127.0.0.1"
} }
upstreams := []Upstream{{IP: ip, Port: listener.Port}} upstreams := []Upstream{{IP: ip, Port: listener.Port}}
return confTmpl(tmplText, upstreams, cfg.HasUpstreamSendClientInfo(), cacheDisabled) return confTmpl(tmplText, upstreams, cacheDisabled)
} }
// FirewallaConfTmpl generates dnsmasq config for Firewalla routers. // FirewallaConfTmpl generates dnsmasq config for Firewalla routers.
func FirewallaConfTmpl(tmplText string, cfg *ctrld.Config) (string, error) { func FirewallaConfTmpl(tmplText string, cfg *ctrld.Config) (string, error) {
// If ctrld listen on all interfaces, generating config for all of them. // If ctrld listen on all interfaces, generating config for all of them.
if lc := cfg.FirstListener(); lc != nil && (lc.IP == "0.0.0.0" || lc.IP == "") { if lc := cfg.FirstListener(); lc != nil && (lc.IP == "0.0.0.0" || lc.IP == "") {
return confTmpl(tmplText, firewallaUpstreams(lc.Port), cfg.HasUpstreamSendClientInfo(), false) return confTmpl(tmplText, firewallaUpstreams(lc.Port), false)
} }
// Otherwise, generating config for the specific listener from ctrld's config. // Otherwise, generating config for the specific listener from ctrld's config.
return ConfTmplWithCacheDisabled(tmplText, cfg, false) return ConfTmplWithCacheDisabled(tmplText, cfg, false)
} }
func confTmpl(tmplText string, upstreams []Upstream, sendClientInfo, cacheDisabled bool) (string, error) { func confTmpl(tmplText string, upstreams []Upstream, cacheDisabled bool) (string, error) {
tmpl := template.Must(template.New("").Parse(tmplText)) tmpl := template.Must(template.New("").Parse(tmplText))
var to = &struct { var to = &struct {
SendClientInfo bool Upstreams []Upstream
Upstreams []Upstream CacheDisabled bool
CacheDisabled bool
}{ }{
SendClientInfo: sendClientInfo, Upstreams: upstreams,
Upstreams: upstreams, CacheDisabled: cacheDisabled,
CacheDisabled: cacheDisabled,
} }
var sb strings.Builder var sb strings.Builder
if err := tmpl.Execute(&sb, to); err != nil { if err := tmpl.Execute(&sb, to); err != nil {