mirrors/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2025-04-05 22:27:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Filter relays by compatible type before selecting them

Browse source 
Fixes #1739
This commit is contained in:
Frank Denis 2021-06-08 10:52:06 +02:00
parent 5a9a6467df
commit a85a003d2b
1 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

38
dnscrypt-proxy/serversInfo.go
View file

@ -360,7 +360,18 @@ func findFarthestRoute(proxy *Proxy, name string, relayStamps []stamps.ServerSta
return &relayStamps[bestRelayIdxs[rand.Intn(len(bestRelayIdxs))]] return &relayStamps[bestRelayIdxs[rand.Intn(len(bestRelayIdxs))]]
} }
func route(proxy *Proxy, name string) (*Relay, error) { func relayProtoForServerProto(proto stamps.StampProtoType) (stamps.StampProtoType, error) {
switch proto {
case stamps.StampProtoTypeDNSCrypt:
return stamps.StampProtoTypeDNSCryptRelay, nil
case stamps.StampProtoTypeODoHTarget:
return stamps.StampProtoTypeODoHRelay, nil
default:
return 0, errors.New("protocol cannot be anonymized")
}
}
func route(proxy *Proxy, name string, serverProto stamps.StampProtoType) (*Relay, error) {
routes := proxy.routes routes := proxy.routes
if routes == nil { if routes == nil {
return nil, nil return nil, nil
@ -374,14 +385,24 @@ func route(proxy *Proxy, name string) (*Relay, error) {
if !ok || len(relayNames) == 0 { if !ok || len(relayNames) == 0 {
return nil, nil return nil, nil
} }
relayProto, err := relayProtoForServerProto(serverProto)
if err != nil {
dlog.Errorf("Server [%v]'s protocol doesn't support anonymization", name)
return nil, nil
}
relayStamps := make([]stamps.ServerStamp, 0) relayStamps := make([]stamps.ServerStamp, 0)
for _, relayName := range relayNames { for _, relayName := range relayNames {
if relayStamp, err := stamps.NewServerStampFromString(relayName); err == nil { if relayStamp, err := stamps.NewServerStampFromString(relayName); err == nil {
relayStamps = append(relayStamps, relayStamp) if relayStamp.Proto == relayProto {
relayStamps = append(relayStamps, relayStamp)
}
} else if relayName == "*" { } else if relayName == "*" {
proxy.serversInfo.RLock() proxy.serversInfo.RLock()
for _, registeredServer := range proxy.serversInfo.registeredRelays { for _, registeredServer := range proxy.serversInfo.registeredRelays {
relayStamps = append(relayStamps, registeredServer.stamp) if registeredServer.stamp.Proto == relayProto {
relayStamps = append(relayStamps, registeredServer.stamp)
}
} }
proxy.serversInfo.RUnlock() proxy.serversInfo.RUnlock()
wildcard = true wildcard = true
@ -389,13 +410,13 @@ func route(proxy *Proxy, name string) (*Relay, error) {
} else { } else {
proxy.serversInfo.RLock() proxy.serversInfo.RLock()
for _, registeredServer := range proxy.serversInfo.registeredRelays { for _, registeredServer := range proxy.serversInfo.registeredRelays {
if registeredServer.name == relayName { if registeredServer.name == relayName && registeredServer.stamp.Proto == relayProto {
relayStamps = append(relayStamps, registeredServer.stamp) relayStamps = append(relayStamps, registeredServer.stamp)
break break
} }
} }
for _, registeredServer := range proxy.serversInfo.registeredServers { for _, registeredServer := range proxy.serversInfo.registeredServers {
if registeredServer.name == relayName { if registeredServer.name == relayName && registeredServer.stamp.Proto == relayProto {
relayStamps = append(relayStamps, registeredServer.stamp) relayStamps = append(relayStamps, registeredServer.stamp)
break break
} }
@ -404,7 +425,8 @@ func route(proxy *Proxy, name string) (*Relay, error) {
} }
} }
if len(relayStamps) == 0 { if len(relayStamps) == 0 {
return nil, fmt.Errorf("Empty relay set for [%v]", name) dlog.Warnf("Empty relay set for [%v]", name)
return nil, nil
} }
var relayCandidateStamp *stamps.ServerStamp var relayCandidateStamp *stamps.ServerStamp
if !wildcard || len(relayStamps) == 1 { if !wildcard || len(relayStamps) == 1 {
@ -488,7 +510,7 @@ func fetchDNSCryptServerInfo(proxy *Proxy, name string, stamp stamps.ServerStamp
break break
} }
} }
relay, err := route(proxy, name) relay, err := route(proxy, name, stamp.Proto)
if err != nil { if err != nil {
return ServerInfo{}, err return ServerInfo{}, err
} }
@ -698,7 +720,7 @@ func _fetchODoHTargetInfo(proxy *Proxy, name string, stamp stamps.ServerStamp, i
return ServerInfo{}, fmt.Errorf("[%s] has an empty ODoH configuration", name) return ServerInfo{}, fmt.Errorf("[%s] has an empty ODoH configuration", name)
} }
relay, err := route(proxy, name) relay, err := route(proxy, name, stamp.Proto)
if err != nil { if err != nil {
return ServerInfo{}, err return ServerInfo{}, err
} }