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

Update captive portal detection to work without server

Browse Source
This commit is contained in:
Daniel
2020-07-21 14:56:06 +02:00
parent b87ba37d4c
commit 811516eec8
4 changed files with 128 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resolver/resolver-env.go
View File

@@ -44,15 +44,17 @@ func (er *envResolverConn) Query(ctx context.Context, q *Query) (*RRCache, error
return nil, ErrNotFound
case netenv.SpecialCaptivePortalDomain:
if portal.IP != nil {
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, records), nil
portalIP := portal.IP
if portal.IP == nil {
portalIP = netenv.PortalTestIP
}
return nil, ErrNotFound
records, err := netutils.IPsToRRs(q.FQDN, []net.IP{portalIP})
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, records), nil
case "router.local.":
routers := netenv.Gateways()