miracle091/dnscrypt-proxy
miracle091
/
dnscrypt-proxy
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: xtransport: Ensure we strip [] from host/ip before net.ParseIP

This commit is contained in:
Markus Linnala 2019-10-20 22:30:16 +03:00 committed by Frank Denis
parent ac4843b460
commit 890dcca270
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dnscrypt-proxy/xtransport.go
View File

@ -68,6 +68,10 @@ func NewXTransport() *XTransport {
return &xTransport return &xTransport
} }
func ParseIP(ipStr string) net.IP {
return net.ParseIP(strings.TrimRight(strings.TrimLeft(ipStr, "["), "]"))
}
func (xTransport *XTransport) clearCache() { func (xTransport *XTransport) clearCache() {
xTransport.cachedIPs.Lock() xTransport.cachedIPs.Lock()
xTransport.cachedIPs.cache = make(map[string]string) xTransport.cachedIPs.cache = make(map[string]string)
@ -232,7 +236,7 @@ func (xTransport *XTransport) Fetch(method string, url *url.URL, accept string,
resolveByProxy = true resolveByProxy = true
} }
var foundIP *string var foundIP *string
if !resolveByProxy && net.ParseIP(host) == nil { if !resolveByProxy && ParseIP(host) == nil {
xTransport.cachedIPs.RLock() xTransport.cachedIPs.RLock()
cachedIP := xTransport.cachedIPs.cache[host] cachedIP := xTransport.cachedIPs.cache[host]
xTransport.cachedIPs.RUnlock() xTransport.cachedIPs.RUnlock()