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

Nits
Some checks are pending
CodeQL scan / Analyze (push) Waiting to run
Details
GitHub CI / Build (push) Waiting to run
Details
ShiftLeft Scan / Scan-Build (push) Waiting to run
Details

Browse source
This commit is contained in:
Frank Denis 2025-02-21 18:16:33 +01:00
parent 3f3cd1e67d
commit 45a4df8df5
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dnscrypt-proxy/coldstart.go
View file

@ -170,7 +170,7 @@ func ColdStart(proxy *Proxy) (*CaptivePortalHandler, error) {
if err != nil { if err != nil {
continue continue
} }
if strings.Index(ipsStr, "*") != -1 { if strings.Contains(ipsStr, "*") {
return nil, fmt.Errorf( return nil, fmt.Errorf(
"A captive portal rule must use an exact host name at line %d", "A captive portal rule must use an exact host name at line %d",
1+lineNo, 1+lineNo,

8
dnscrypt-proxy/plugin_forward.go
View file

@ -60,10 +60,8 @@ func (plugin *PluginForward) Init(proxy *Proxy) error {
continue continue
} }
domain, serversStr, ok := StringTwoFields(line) domain, serversStr, ok := StringTwoFields(line)
if strings.HasPrefix(domain, "*.") { domain = strings.TrimPrefix(domain, "*.")
domain = domain[2:] if strings.Contains(domain, "*") {
}
if strings.Index(domain, "*") != -1 {
ok = false ok = false
} }
if !ok { if !ok {
@ -205,7 +203,7 @@ func (plugin *PluginForward) Eval(pluginsState *PluginsState, msg *dns.Msg) erro
dlog.Infof("No response from the DHCP server while resolving [%s]", qName) dlog.Infof("No response from the DHCP server while resolving [%s]", qName)
continue continue
} }
if dhcpDNS != nil && len(dhcpDNS) > 0 { if len(dhcpDNS) > 0 {
server = net.JoinHostPort(dhcpDNS[rand.Intn(len(dhcpDNS))].String(), "53") server = net.JoinHostPort(dhcpDNS[rand.Intn(len(dhcpDNS))].String(), "53")
break break
} }

2
dnscrypt-proxy/xtransport.go
View file

@ -234,7 +234,7 @@ func (xTransport *XTransport) rebuildTransport() {
tlsClientConfig.Certificates = []tls.Certificate{cert} tlsClientConfig.Certificates = []tls.Certificate{cert}
} }
overrideCipherSuite := xTransport.tlsCipherSuite != nil && len(xTransport.tlsCipherSuite) > 0 overrideCipherSuite := len(xTransport.tlsCipherSuite) > 0
if xTransport.tlsDisableSessionTickets || overrideCipherSuite { if xTransport.tlsDisableSessionTickets || overrideCipherSuite {
tlsClientConfig.SessionTicketsDisabled = xTransport.tlsDisableSessionTickets tlsClientConfig.SessionTicketsDisabled = xTransport.tlsDisableSessionTickets
if !xTransport.tlsDisableSessionTickets { if !xTransport.tlsDisableSessionTickets {