diff --git a/go.mod b/go.mod index b20be722..d99b0e1f 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 github.com/jedisct1/dlog v0.0.0-20201201133931-57e17ecd14f1 github.com/jedisct1/go-clocksmith v0.0.0-20190707124905-73e087c7979c - github.com/jedisct1/go-dnsstamps v0.0.0-20201129203013-2c136bd66b10 + github.com/jedisct1/go-dnsstamps v0.0.0-20201210214355-8114706e4f2a github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e github.com/jedisct1/xsecretbox v0.0.0-20200921000858-23f5ec706e6a github.com/k-sone/critbitgo v1.4.0 diff --git a/go.sum b/go.sum index f961d50f..29f93a46 100644 --- a/go.sum +++ b/go.sum @@ -53,8 +53,8 @@ github.com/jedisct1/dlog v0.0.0-20201201133931-57e17ecd14f1 h1:glnf1FFQoM6G8Z9i2 github.com/jedisct1/dlog v0.0.0-20201201133931-57e17ecd14f1/go.mod h1:+vbxop6USWgBLUajqc/ak72bH24IpH+HqVy/jiUndSY= github.com/jedisct1/go-clocksmith v0.0.0-20190707124905-73e087c7979c h1:a/NQUT7AXkEfhaZ+nb7Uzqijo1Qc7C7SZpRrv+6UQDA= github.com/jedisct1/go-clocksmith v0.0.0-20190707124905-73e087c7979c/go.mod h1:SAINchklztk2jcLWJ4bpNF4KnwDUSUTX+cJbspWC2Rw= -github.com/jedisct1/go-dnsstamps v0.0.0-20201129203013-2c136bd66b10 h1:PlCvCebUh0sSBYBmLjpyq0jcsDMQfQr5p/pjNw6FeM0= -github.com/jedisct1/go-dnsstamps v0.0.0-20201129203013-2c136bd66b10/go.mod h1:t35n6rsPE3nD3RXbc5hI5Ax1ci/SSYTpx0BdMXh/1aE= +github.com/jedisct1/go-dnsstamps v0.0.0-20201210214355-8114706e4f2a h1:XXNdV/wI5aLjCEWiYHZEIArB81lHHDcNpfXndq/52aA= +github.com/jedisct1/go-dnsstamps v0.0.0-20201210214355-8114706e4f2a/go.mod h1:t35n6rsPE3nD3RXbc5hI5Ax1ci/SSYTpx0BdMXh/1aE= github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e h1:UvSe12bq+Uj2hWd8aOlwPmoZ+CITRFrdit+sDGfAg8U= github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= github.com/jedisct1/xsecretbox v0.0.0-20200921000858-23f5ec706e6a h1:poHGyVo1+BCg7ngkrgq1h8xr2MDZHBwD6l2uG2GEMDI= diff --git a/vendor/github.com/jedisct1/go-dnsstamps/dnsstamps.go b/vendor/github.com/jedisct1/go-dnsstamps/dnsstamps.go index 904253a4..d77315f4 100644 --- a/vendor/github.com/jedisct1/go-dnsstamps/dnsstamps.go +++ b/vendor/github.com/jedisct1/go-dnsstamps/dnsstamps.go @@ -16,9 +16,11 @@ const DefaultPort = 443 type ServerInformalProperties uint64 const ( - ServerInformalPropertyDNSSEC = ServerInformalProperties(1) << 0 - ServerInformalPropertyNoLog = ServerInformalProperties(1) << 1 - ServerInformalPropertyNoFilter = ServerInformalProperties(1) << 2 + ServerInformalPropertyDNSSEC = ServerInformalProperties(1) << 0 + ServerInformalPropertyNoLog = ServerInformalProperties(1) << 1 + ServerInformalPropertyNoFilter = ServerInformalProperties(1) << 2 + ServerInformalPropertyRelay = ServerInformalProperties(1) << 3 + ServerInformalPropertyODoHTarget = ServerInformalProperties(1) << 4 ) type StampProtoType uint8 @@ -28,6 +30,8 @@ const ( StampProtoTypeDNSCrypt = StampProtoType(0x01) StampProtoTypeDoH = StampProtoType(0x02) StampProtoTypeTLS = StampProtoType(0x03) + StampProtoTypeDoQ = StampProtoType(0x04) + StampProtoTypeODoH = StampProtoType(0x05) StampProtoTypeDNSCryptRelay = StampProtoType(0x81) ) @@ -39,6 +43,12 @@ func (stampProtoType *StampProtoType) String() string { return "DNSCrypt" case StampProtoTypeDoH: return "DoH" + case StampProtoTypeTLS: + return "TLS" + case StampProtoTypeDoQ: + return "QUIC" + case StampProtoTypeODoH: + return "oDoH" case StampProtoTypeDNSCryptRelay: return "Anonymized DNSCrypt" default: @@ -90,6 +100,8 @@ func NewServerStampFromString(stampStr string) (ServerStamp, error) { return newDNSCryptServerStamp(bin) } else if bin[0] == uint8(StampProtoTypeDoH) { return newDoHServerStamp(bin) + } else if bin[0] == uint8(StampProtoTypeODoH) { + return newODoHServerStamp(bin) } else if bin[0] == uint8(StampProtoTypeDNSCryptRelay) { return newDNSCryptRelayStamp(bin) } @@ -158,7 +170,7 @@ func newDNSCryptServerStamp(bin []byte) (ServerStamp, error) { return stamp, nil } -// id(u8)=0x02 props addrLen(1) serverAddr hashLen(1) hash providerNameLen(1) providerName pathLen(1) path +// id(u8)=0x02 props addrLen(1) serverAddr hashLen(1) hash hostNameLen(1) hostName pathLen(1) path func newDoHServerStamp(bin []byte) (ServerStamp, error) { stamp := ServerStamp{Proto: StampProtoTypeDoH} @@ -239,6 +251,71 @@ func newDoHServerStamp(bin []byte) (ServerStamp, error) { return stamp, nil } +// id(u8)=0x05 props addrLen(1) serverAddr hostNameLen(1) hostName pathLen(1) path + +func newODoHServerStamp(bin []byte) (ServerStamp, error) { + stamp := ServerStamp{Proto: StampProtoTypeODoH} + if len(bin) < 22 { + return stamp, errors.New("Stamp is too short") + } + stamp.Props = ServerInformalProperties(binary.LittleEndian.Uint64(bin[1:9])) + binLen := len(bin) + pos := 9 + + length := int(bin[pos]) + if 1+length >= binLen-pos { + return stamp, errors.New("Invalid stamp") + } + pos++ + stamp.ServerAddrStr = string(bin[pos : pos+length]) + pos += length + + length = int(bin[pos]) + if 1+length >= binLen-pos { + return stamp, errors.New("Invalid stamp") + } + pos++ + stamp.ProviderName = string(bin[pos : pos+length]) + pos += length + + length = int(bin[pos]) + if length >= binLen-pos { + return stamp, errors.New("Invalid stamp") + } + pos++ + stamp.Path = string(bin[pos : pos+length]) + pos += length + + if pos != binLen { + return stamp, errors.New("Invalid stamp (garbage after end)") + } + + if len(stamp.ServerAddrStr) > 0 { + colIndex := strings.LastIndex(stamp.ServerAddrStr, ":") + bracketIndex := strings.LastIndex(stamp.ServerAddrStr, "]") + if colIndex < bracketIndex { + colIndex = -1 + } + if colIndex < 0 { + colIndex = len(stamp.ServerAddrStr) + stamp.ServerAddrStr = fmt.Sprintf("%s:%d", stamp.ServerAddrStr, DefaultPort) + } + if colIndex >= len(stamp.ServerAddrStr)-1 { + return stamp, errors.New("Invalid stamp (empty port)") + } + ipOnly := stamp.ServerAddrStr[:colIndex] + portOnly := stamp.ServerAddrStr[colIndex+1:] + if _, err := strconv.ParseUint(portOnly, 10, 16); err != nil { + return stamp, errors.New("Invalid stamp (port range)") + } + if net.ParseIP(strings.TrimRight(strings.TrimLeft(ipOnly, "["), "]")) == nil { + return stamp, errors.New("Invalid stamp (IP address)") + } + } + + return stamp, nil +} + // id(u8)=0x81 addrLen(1) serverAddr func newDNSCryptRelayStamp(bin []byte) (ServerStamp, error) { @@ -287,6 +364,8 @@ func (stamp *ServerStamp) String() string { return stamp.dnsCryptString() } else if stamp.Proto == StampProtoTypeDoH { return stamp.dohString() + } else if stamp.Proto == StampProtoTypeODoH { + return stamp.oDohString() } else if stamp.Proto == StampProtoTypeDNSCryptRelay { return stamp.dnsCryptRelayString() } @@ -353,6 +432,29 @@ func (stamp *ServerStamp) dohString() string { return "sdns://" + str } +func (stamp *ServerStamp) oDohString() string { + bin := make([]uint8, 9) + bin[0] = uint8(StampProtoTypeODoH) + binary.LittleEndian.PutUint64(bin[1:9], uint64(stamp.Props)) + + serverAddrStr := stamp.ServerAddrStr + if strings.HasSuffix(serverAddrStr, ":"+strconv.Itoa(DefaultPort)) { + serverAddrStr = serverAddrStr[:len(serverAddrStr)-1-len(strconv.Itoa(DefaultPort))] + } + bin = append(bin, uint8(len(serverAddrStr))) + bin = append(bin, []uint8(serverAddrStr)...) + + bin = append(bin, uint8(len(stamp.ProviderName))) + bin = append(bin, []uint8(stamp.ProviderName)...) + + bin = append(bin, uint8(len(stamp.Path))) + bin = append(bin, []uint8(stamp.Path)...) + + str := base64.RawURLEncoding.EncodeToString(bin) + + return "sdns://" + str +} + func (stamp *ServerStamp) dnsCryptRelayString() string { bin := make([]uint8, 1) bin[0] = uint8(StampProtoTypeDNSCryptRelay) diff --git a/vendor/modules.txt b/vendor/modules.txt index e9a707f1..281bbf97 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -42,7 +42,7 @@ github.com/jedisct1/dlog # github.com/jedisct1/go-clocksmith v0.0.0-20190707124905-73e087c7979c ## explicit github.com/jedisct1/go-clocksmith -# github.com/jedisct1/go-dnsstamps v0.0.0-20201129203013-2c136bd66b10 +# github.com/jedisct1/go-dnsstamps v0.0.0-20201210214355-8114706e4f2a ## explicit github.com/jedisct1/go-dnsstamps # github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e