mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-16 18:38:52 -07:00
2c2c0d445b
Merge in DNS/adguard-home from 4463-ddr-support to master
Squashed commit of the following:
commit 99a149e9024354ad0341739c3c9b08cefbd74468
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 12 14:13:17 2022 +0200
imp docs
commit 26150be8df8b35e47c108f6e3319c57b39fb8e38
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 11 20:36:18 2022 +0200
imp code docs
commit 5a4607f71abba83a9ac8753abd74c9fb97e4a545
Merge: 00f0abf5 9f0fdc5e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 11 16:14:49 2022 +0200
Merge remote-tracking branch 'origin/master' into 4463-ddr-support
# Conflicts:
# internal/dnsforward/svcbmsg.go
commit 00f0abf5eea07aeeebc2a856a958215021a51ab7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 11 16:06:42 2022 +0200
svcb dohpath support
commit ace81ce1ea2fb96c4434c6c1fded4a79427cf17e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Apr 7 14:31:32 2022 +0200
svcb dohpath support
commit a1b5df4fb2e87dab265d6ca55928610a6acc1c00
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Apr 6 16:53:17 2022 +0200
svcb dohpath support
199 lines
4.7 KiB
Go
199 lines
4.7 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"encoding/base64"
|
|
"net"
|
|
"strconv"
|
|
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/AdguardTeam/urlfilter/rules"
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
// genAnswerHTTPS returns a properly initialized HTTPS resource record.
|
|
//
|
|
// See the comment on genAnswerSVCB for a list of current restrictions on
|
|
// parameter values.
|
|
func (s *Server) genAnswerHTTPS(req *dns.Msg, svcb *rules.DNSSVCB) (ans *dns.HTTPS) {
|
|
ans = &dns.HTTPS{
|
|
SVCB: *s.genAnswerSVCB(req, svcb),
|
|
}
|
|
|
|
ans.Hdr.Rrtype = dns.TypeHTTPS
|
|
|
|
return ans
|
|
}
|
|
|
|
// strToSVCBKey is the string-to-svcb-key mapping.
|
|
//
|
|
// See https://github.com/miekg/dns/blob/23c4faca9d32b0abbb6e179aa1aadc45ac53a916/svcb.go#L27.
|
|
//
|
|
// TODO(a.garipov): Propose exporting this API or something similar in the
|
|
// github.com/miekg/dns module.
|
|
var strToSVCBKey = map[string]dns.SVCBKey{
|
|
"alpn": dns.SVCB_ALPN,
|
|
"ech": dns.SVCB_ECHCONFIG,
|
|
"ipv4hint": dns.SVCB_IPV4HINT,
|
|
"ipv6hint": dns.SVCB_IPV6HINT,
|
|
"mandatory": dns.SVCB_MANDATORY,
|
|
"no-default-alpn": dns.SVCB_NO_DEFAULT_ALPN,
|
|
"port": dns.SVCB_PORT,
|
|
|
|
// TODO(a.garipov): This is the previous name for the parameter that has
|
|
// since been changed. Remove this in v0.109.0.
|
|
"echconfig": dns.SVCB_ECHCONFIG,
|
|
}
|
|
|
|
// svcbKeyHandler is a handler for one SVCB parameter key.
|
|
type svcbKeyHandler func(valStr string) (val dns.SVCBKeyValue)
|
|
|
|
// svcbKeyHandlers are the supported SVCB parameters handlers.
|
|
var svcbKeyHandlers = map[string]svcbKeyHandler{
|
|
"alpn": func(valStr string) (val dns.SVCBKeyValue) {
|
|
return &dns.SVCBAlpn{
|
|
Alpn: []string{valStr},
|
|
}
|
|
},
|
|
|
|
"ech": func(valStr string) (val dns.SVCBKeyValue) {
|
|
ech, err := base64.StdEncoding.DecodeString(valStr)
|
|
if err != nil {
|
|
log.Debug("can't parse svcb/https ech: %s; ignoring", err)
|
|
|
|
return nil
|
|
}
|
|
|
|
return &dns.SVCBECHConfig{
|
|
ECH: ech,
|
|
}
|
|
},
|
|
|
|
"ipv4hint": func(valStr string) (val dns.SVCBKeyValue) {
|
|
ip := net.ParseIP(valStr)
|
|
if ip4 := ip.To4(); ip == nil || ip4 == nil {
|
|
log.Debug("can't parse svcb/https ipv4 hint %q; ignoring", valStr)
|
|
|
|
return nil
|
|
}
|
|
|
|
return &dns.SVCBIPv4Hint{
|
|
Hint: []net.IP{ip},
|
|
}
|
|
},
|
|
|
|
"ipv6hint": func(valStr string) (val dns.SVCBKeyValue) {
|
|
ip := net.ParseIP(valStr)
|
|
if ip == nil {
|
|
log.Debug("can't parse svcb/https ipv6 hint %q; ignoring", valStr)
|
|
|
|
return nil
|
|
}
|
|
|
|
return &dns.SVCBIPv6Hint{
|
|
Hint: []net.IP{ip},
|
|
}
|
|
},
|
|
|
|
"mandatory": func(valStr string) (val dns.SVCBKeyValue) {
|
|
code, ok := strToSVCBKey[valStr]
|
|
if !ok {
|
|
log.Debug("unknown svcb/https mandatory key %q, ignoring", valStr)
|
|
|
|
return nil
|
|
}
|
|
|
|
return &dns.SVCBMandatory{
|
|
Code: []dns.SVCBKey{code},
|
|
}
|
|
},
|
|
|
|
"no-default-alpn": func(_ string) (val dns.SVCBKeyValue) {
|
|
return &dns.SVCBNoDefaultAlpn{}
|
|
},
|
|
|
|
"port": func(valStr string) (val dns.SVCBKeyValue) {
|
|
port64, err := strconv.ParseUint(valStr, 10, 16)
|
|
if err != nil {
|
|
log.Debug("can't parse svcb/https port: %s; ignoring", err)
|
|
|
|
return nil
|
|
}
|
|
|
|
return &dns.SVCBPort{
|
|
Port: uint16(port64),
|
|
}
|
|
},
|
|
|
|
// TODO(a.garipov): This is the previous name for the parameter that has
|
|
// since been changed. Remove this in v0.109.0.
|
|
"echconfig": func(valStr string) (val dns.SVCBKeyValue) {
|
|
log.Info(
|
|
`warning: svcb/https record parameter name "echconfig" is deprecated; ` +
|
|
`use "ech" instead`,
|
|
)
|
|
|
|
ech, err := base64.StdEncoding.DecodeString(valStr)
|
|
if err != nil {
|
|
log.Debug("can't parse svcb/https ech: %s; ignoring", err)
|
|
|
|
return nil
|
|
}
|
|
|
|
return &dns.SVCBECHConfig{
|
|
ECH: ech,
|
|
}
|
|
},
|
|
|
|
"dohpath": func(valStr string) (val dns.SVCBKeyValue) {
|
|
return &dns.SVCBDoHPath{
|
|
Template: valStr,
|
|
}
|
|
},
|
|
}
|
|
|
|
// genAnswerSVCB returns a properly initialized SVCB resource record.
|
|
//
|
|
// Currently, there are several restrictions on how the parameters are parsed.
|
|
// Firstly, the parsing of non-contiguous values isn't supported. Secondly, the
|
|
// parsing of value-lists is not supported either.
|
|
//
|
|
// ipv4hint=127.0.0.1 // Supported.
|
|
// ipv4hint="127.0.0.1" // Unsupported.
|
|
// ipv4hint=127.0.0.1,127.0.0.2 // Unsupported.
|
|
// ipv4hint="127.0.0.1,127.0.0.2" // Unsupported.
|
|
//
|
|
// TODO(a.garipov): Support all of these.
|
|
func (s *Server) genAnswerSVCB(req *dns.Msg, svcb *rules.DNSSVCB) (ans *dns.SVCB) {
|
|
ans = &dns.SVCB{
|
|
Hdr: s.hdr(req, dns.TypeSVCB),
|
|
Priority: svcb.Priority,
|
|
Target: dns.Fqdn(svcb.Target),
|
|
}
|
|
if len(svcb.Params) == 0 {
|
|
return ans
|
|
}
|
|
|
|
values := make([]dns.SVCBKeyValue, 0, len(svcb.Params))
|
|
for k, valStr := range svcb.Params {
|
|
handler, ok := svcbKeyHandlers[k]
|
|
if !ok {
|
|
log.Debug("unknown svcb/https key %q, ignoring", k)
|
|
|
|
continue
|
|
}
|
|
|
|
val := handler(valStr)
|
|
if val == nil {
|
|
continue
|
|
}
|
|
|
|
values = append(values, val)
|
|
}
|
|
|
|
if len(values) > 0 {
|
|
ans.Value = values
|
|
}
|
|
|
|
return ans
|
|
}
|