github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Implement review suggestions

Browse Source 
Fix local. resolving in Firefox
This commit is contained in:
Daniel
2020-07-15 13:59:56 +02:00
parent e369a9484a
commit 047352f9b5
9 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resolver/main.go
View File

@@ -24,6 +24,10 @@ func init() {
func prep() error {
intel.SetReverseResolver(ResolveIPAndValidate)
if err := prepEnvResolver(); err != nil {
return err
}
return prepConfig()
}

2
resolver/resolve.go
View File

@@ -261,6 +261,8 @@ resolveLoop:
case errors.Is(err, ErrBlocked):
// some resolvers might also block
return nil, err
case errors.Is(err, ErrContinue):
continue
case netenv.GetOnlineStatus() == netenv.StatusOffline &&
!netenv.IsConnectivityDomain(q.FQDN):
log.Tracer(ctx).Debugf("resolver: not resolving %s, device is offline", q.FQDN)

42
resolver/resolver-env.go
View File

@@ -2,7 +2,6 @@ package resolver
import (
"context"
"fmt"
"net"
"github.com/miekg/dns"
@@ -19,8 +18,15 @@ var (
Source: ServerSourceEnv,
Conn: &envResolverConn{},
}
localSOA dns.RR
)
func prepEnvResolver() (err error) {
localSOA, err = dns.NewRR("local. 17 IN SOA localhost. none.localhost. 17 17 17 17 17")
return err
}
type envResolverConn struct{}
func (er *envResolverConn) Query(ctx context.Context, q *Query) (*RRCache, error) {
@@ -29,14 +35,22 @@ func (er *envResolverConn) Query(ctx context.Context, q *Query) (*RRCache, error
// check for matching name
switch q.FQDN {
case "local.":
// Firefox requests the SOA request for local. before resolving any local. domains.
// Others might be doing this too. We guessed this behaviour, weren't able to find docs.
if q.QType == dns.Type(dns.TypeSOA) {
return er.makeRRCache(q, []dns.RR{localSOA}), nil
}
return nil, ErrNotFound
case netenv.SpecialCaptivePortalDomain:
if portal.IP != nil {
rr, err := portal.IPasRR()
records, err := netutils.IPsToRRs(q.FQDN, []net.IP{portal.IP})
if err != nil {
log.Warningf("nameserver: failed to create captive portal response to %s: %s", q.FQDN, err)
return nil, ErrNotFound
}
return er.makeRRCache(q, []dns.RR{rr}), nil
return er.makeRRCache(q, records), nil
}
return nil, ErrNotFound
@@ -45,7 +59,7 @@ func (er *envResolverConn) Query(ctx context.Context, q *Query) (*RRCache, error
if len(routers) == 0 {
return nil, ErrNotFound
}
records, err := ipsToRRs(q.FQDN, routers)
records, err := netutils.IPsToRRs(q.FQDN, routers)
if err != nil {
log.Warningf("nameserver: failed to create gateway response to %s: %s", q.FQDN, err)
return nil, ErrNotFound
@@ -73,23 +87,3 @@ func (er *envResolverConn) ReportFailure() {}
func (er *envResolverConn) IsFailing() bool {
return false
}
func ipsToRRs(domain string, ips []net.IP) ([]dns.RR, error) {
var records []dns.RR
var rr dns.RR
var err error
for _, ip := range ips {
if ip.To4() != nil {
rr, err = dns.NewRR(domain + " 17 IN A " + ip.String())
} else {
rr, err = dns.NewRR(domain + " 17 IN AAAA " + ip.String())
}
if err != nil {
return nil, fmt.Errorf("failed to create record for %s: %w", ip, err)
}
records = append(records, rr)
}
return records, nil
}

4
resolver/reverse_test.go
View File

@@ -32,6 +32,6 @@ func TestResolveIPAndValidate(t *testing.T) {
testReverse(t, "1.1.1.1", "one.one.one.one.", "")
testReverse(t, "2606:4700:4700::1111", "one.one.one.one.", "")
testReverse(t, "93.184.216.34", "example.com.", "record does not exist: 34.216.184.93.in-addr.arpa.PTR")
testReverse(t, "185.199.109.153", "sites.github.io.", "record does not exist: 153.109.199.185.in-addr.arpa.PTR")
testReverse(t, "93.184.216.34", "example.com.", "record could not be found: 34.216.184.93.in-addr.arpa.PTR")
testReverse(t, "185.199.109.153", "sites.github.io.", "record could not be found: 153.109.199.185.in-addr.arpa.PTR")
}