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

Respect proxy.mainProto in forward plugin (#1259)

Browse source 
* Respect proxy.mainProto in forward plugin

* Make the serverProtocol part of pluginsState instead
This commit is contained in:
Kiril Angov 2020-04-05 14:49:30 -04:00 • committed by GitHub
parent f4631b9121
commit d2602fd142
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dnscrypt-proxy/plugin_forward.go
View file

@ -41,7 +41,10 @@ func (plugin *PluginForward) Init(proxy *Proxy) error {
} }
domain, serversStr, ok := StringTwoFields(line) domain, serversStr, ok := StringTwoFields(line)
if !ok { if !ok {
return fmt.Errorf("Syntax error for a forwarding rule at line %d. Expected syntax: example.com: 9.9.9.9,8.8.8.8", 1+lineNo) return fmt.Errorf(
"syntax error for a forwarding rule at line %d. Expected syntax: example.com 9.9.9.9,8.8.8.8",
1+lineNo,
)
} }
domain = strings.ToLower(domain) domain = strings.ToLower(domain)
var servers []string var servers []string
@ -56,7 +59,8 @@ func (plugin *PluginForward) Init(proxy *Proxy) error {
continue continue
} }
plugin.forwardMap = append(plugin.forwardMap, PluginForwardEntry{ plugin.forwardMap = append(plugin.forwardMap, PluginForwardEntry{
domain: domain, servers: servers, domain: domain,
servers: servers,
}) })
} }
return nil return nil
@ -89,7 +93,7 @@ func (plugin *PluginForward) Eval(pluginsState *PluginsState, msg *dns.Msg) erro
} }
server := servers[rand.Intn(len(servers))] server := servers[rand.Intn(len(servers))]
pluginsState.serverName = server pluginsState.serverName = server
client := dns.Client{Net: "udp"} client := dns.Client{Net: pluginsState.serverProto}
respMsg, _, err := client.Exchange(msg, server) respMsg, _, err := client.Exchange(msg, server)
if err != nil { if err != nil {
return err return err

4
dnscrypt-proxy/plugins.go
View file

@ -86,6 +86,7 @@ type PluginsState struct {
cacheHit bool cacheHit bool
returnCode PluginsReturnCode returnCode PluginsReturnCode
serverName string serverName string
serverProto string
} }
func (proxy *Proxy) InitPluginsGlobals() error { func (proxy *Proxy) InitPluginsGlobals() error {
@ -222,7 +223,7 @@ type Plugin interface {
Eval(pluginsState *PluginsState, msg *dns.Msg) error Eval(pluginsState *PluginsState, msg *dns.Msg) error
} }
func NewPluginsState(proxy *Proxy, clientProto string, clientAddr *net.Addr, start time.Time) PluginsState { func NewPluginsState(proxy *Proxy, clientProto string, clientAddr *net.Addr, serverProto string, start time.Time) PluginsState {
return PluginsState{ return PluginsState{
action: PluginsActionContinue, action: PluginsActionContinue,
returnCode: PluginsReturnCodePass, returnCode: PluginsReturnCodePass,
@ -238,6 +239,7 @@ func NewPluginsState(proxy *Proxy, clientProto string, clientAddr *net.Addr, sta
questionMsg: nil, questionMsg: nil,
qName: "", qName: "",
serverName: "-", serverName: "-",
serverProto: serverProto,
requestStart: start, requestStart: start,
maxUnencryptedUDPSafePayloadSize: MaxDNSUDPSafePacketSize, maxUnencryptedUDPSafePayloadSize: MaxDNSUDPSafePacketSize,
sessionData: make(map[string]interface{}), sessionData: make(map[string]interface{}),

2
dnscrypt-proxy/proxy.go
View file

@ -443,7 +443,7 @@ func (proxy *Proxy) processIncomingQuery(clientProto string, serverProto string,
if len(query) < MinDNSPacketSize { if len(query) < MinDNSPacketSize {
return return
} }
pluginsState := NewPluginsState(proxy, clientProto, clientAddr, start) pluginsState := NewPluginsState(proxy, clientProto, clientAddr, serverProto, start)
serverName := "-" serverName := "-"
needsEDNS0Padding := false needsEDNS0Padding := false
serverInfo := proxy.serversInfo.getOne() serverInfo := proxy.serversInfo.getOne()