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

On overflow, only respond to cached/synthesized queries

This commit is contained in:
Frank Denis 2021-08-04 14:25:56 +02:00
parent da69583bd2
commit e64425b5e7
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dnscrypt-proxy/local-doh.go
View File

@ -52,7 +52,7 @@ func (handler localDoHHandler) ServeHTTP(writer http.ResponseWriter, request *ht
writer.WriteHeader(400) writer.WriteHeader(400)
return return
} }
response := proxy.processIncomingQuery("local_doh", proxy.mainProto, packet, &xClientAddr, nil, start) response := proxy.processIncomingQuery("local_doh", proxy.mainProto, packet, &xClientAddr, nil, start, false)
if len(response) == 0 { if len(response) == 0 {
writer.WriteHeader(500) writer.WriteHeader(500)
return return

2
dnscrypt-proxy/plugin_dns64.go
View File

@ -87,7 +87,7 @@ func (plugin *PluginDNS64) Eval(pluginsState *PluginsState, msg *dns.Msg) error
if !plugin.proxy.clientsCountInc() { if !plugin.proxy.clientsCountInc() {
return errors.New("Too many concurrent connections to handle DNS64 subqueries") return errors.New("Too many concurrent connections to handle DNS64 subqueries")
} }
respPacket := plugin.proxy.processIncomingQuery("trampoline", plugin.proxy.mainProto, msgAPacket, nil, nil, time.Now()) respPacket := plugin.proxy.processIncomingQuery("trampoline", plugin.proxy.mainProto, msgAPacket, nil, nil, time.Now(), false)
plugin.proxy.clientsCountDec() plugin.proxy.clientsCountDec()
resp := dns.Msg{} resp := dns.Msg{}
if err := resp.Unpack(respPacket); err != nil { if err := resp.Unpack(respPacket); err != nil {

11
dnscrypt-proxy/proxy.go
View File

@ -371,12 +371,12 @@ func (proxy *Proxy) udpListener(clientPc *net.UDPConn) {
packet := buffer[:length] packet := buffer[:length]
if !proxy.clientsCountInc() { if !proxy.clientsCountInc() {
dlog.Warnf("Too many incoming connections (max=%d)", proxy.maxClients) dlog.Warnf("Too many incoming connections (max=%d)", proxy.maxClients)
proxy.processIncomingQuery("udp", proxy.mainProto, packet, &clientAddr, clientPc, time.Now()) // handle synchronously proxy.processIncomingQuery("udp", proxy.mainProto, packet, &clientAddr, clientPc, time.Now(), true) // handle synchronously
continue continue
} }
go func() { go func() {
defer proxy.clientsCountDec() defer proxy.clientsCountDec()
proxy.processIncomingQuery("udp", proxy.mainProto, packet, &clientAddr, clientPc, time.Now()) proxy.processIncomingQuery("udp", proxy.mainProto, packet, &clientAddr, clientPc, time.Now(), false)
}() }()
} }
} }
@ -405,7 +405,7 @@ func (proxy *Proxy) tcpListener(acceptPc *net.TCPListener) {
return return
} }
clientAddr := clientPc.RemoteAddr() clientAddr := clientPc.RemoteAddr()
proxy.processIncomingQuery("tcp", "tcp", packet, &clientAddr, clientPc, start) proxy.processIncomingQuery("tcp", "tcp", packet, &clientAddr, clientPc, start, false)
}() }()
} }
} }
@ -573,7 +573,7 @@ func (proxy *Proxy) clientsCountDec() {
} }
} }
func (proxy *Proxy) processIncomingQuery(clientProto string, serverProto string, query []byte, clientAddr *net.Addr, clientPc net.Conn, start time.Time) (response []byte) { func (proxy *Proxy) processIncomingQuery(clientProto string, serverProto string, query []byte, clientAddr *net.Addr, clientPc net.Conn, start time.Time, onlyCached bool) (response []byte) {
if len(query) < MinDNSPacketSize { if len(query) < MinDNSPacketSize {
return return
} }
@ -603,6 +603,9 @@ func (proxy *Proxy) processIncomingQuery(clientProto string, serverProto string,
return return
} }
} }
if onlyCached && len(response) == 0 {
return
}
if len(response) == 0 && serverInfo != nil { if len(response) == 0 && serverInfo != nil {
var ttl *uint32 var ttl *uint32
pluginsState.serverName = serverName pluginsState.serverName = serverName