miracle091/dnscrypt-proxy
miracle091/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2024-12-12 22:36:32 +01:00
Code Issues Releases Wiki Activity

Move captive portals config to a dedicated section

Browse Source 
Add examples
This commit is contained in:
Frank Denis 2021-01-02 15:10:04 +01:00
parent dfee2aa546
commit a713e1a517
7 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dnscrypt-proxy/coldstart.go
View File

@ -59,11 +59,13 @@ func HandleCaptivePortalQuery(msg *dns.Msg, question *dns.Question, ips *Captive
} }
} else if question.Qtype == dns.TypeAAAA { } else if question.Qtype == dns.TypeAAAA {
for _, xip := range *ips { for _, xip := range *ips {
if ip := xip.To16(); ip != nil { if xip.To4() == nil {
rr := new(dns.AAAA) if ip := xip.To16(); ip != nil {
rr.Hdr = dns.RR_Header{Name: question.Name, Rrtype: dns.TypeAAAA, Class: dns.ClassINET, Ttl: ttl} rr := new(dns.AAAA)
rr.AAAA = ip rr.Hdr = dns.RR_Header{Name: question.Name, Rrtype: dns.TypeAAAA, Class: dns.ClassINET, Ttl: ttl}
respMsg.Answer = append(respMsg.Answer, rr) rr.AAAA = ip
respMsg.Answer = append(respMsg.Answer, rr)
}
} }
} }
} else if question.Qtype == dns.TypeHTTPS { } else if question.Qtype == dns.TypeHTTPS {
@ -154,10 +156,10 @@ func addColdStartListener(proxy *Proxy, ipsMap *CaptivePortalMap, listenAddrStr
} }
func ColdStart(proxy *Proxy) (*CaptivePortalHandler, error) { func ColdStart(proxy *Proxy) (*CaptivePortalHandler, error) {
if len(proxy.captivePortalFile) == 0 { if len(proxy.captivePortalMapFile) == 0 {
return nil, nil return nil, nil
} }
bin, err := ReadTextFile(proxy.captivePortalFile) bin, err := ReadTextFile(proxy.captivePortalMapFile)
if err != nil { if err != nil {
dlog.Warn(err) dlog.Warn(err)
return nil, err return nil, err

8
dnscrypt-proxy/config.go
View File

@ -70,7 +70,7 @@ type Config struct {
AllowIP AllowIPConfig `toml:"allowed_ips"` AllowIP AllowIPConfig `toml:"allowed_ips"`
ForwardFile string `toml:"forwarding_rules"` ForwardFile string `toml:"forwarding_rules"`
CloakFile string `toml:"cloaking_rules"` CloakFile string `toml:"cloaking_rules"`
CaptivePortalFile string `toml:"captive_portal_handler"` CaptivePortals CaptivePortalsConfig `toml:"captive_portals"`
StaticsConfig map[string]StaticConfig `toml:"static"` StaticsConfig map[string]StaticConfig `toml:"static"`
SourcesConfig map[string]SourceConfig `toml:"sources"` SourcesConfig map[string]SourceConfig `toml:"sources"`
BrokenImplementations BrokenImplementationsConfig `toml:"broken_implementations"` BrokenImplementations BrokenImplementationsConfig `toml:"broken_implementations"`
@ -272,6 +272,10 @@ type DNS64Config struct {
Resolvers []string `toml:"resolver"` Resolvers []string `toml:"resolver"`
} }
type CaptivePortalsConfig struct {
MapFile string `toml:"map_file"`
}
type ConfigFlags struct { type ConfigFlags struct {
List *bool List *bool
ListAll *bool ListAll *bool
@ -579,7 +583,7 @@ func ConfigLoad(proxy *Proxy, flags *ConfigFlags) error {
proxy.forwardFile = config.ForwardFile proxy.forwardFile = config.ForwardFile
proxy.cloakFile = config.CloakFile proxy.cloakFile = config.CloakFile
proxy.captivePortalFile = config.CaptivePortalFile proxy.captivePortalMapFile = config.CaptivePortals.MapFile
allWeeklyRanges, err := ParseAllWeeklyRanges(config.AllWeeklyRanges) allWeeklyRanges, err := ParseAllWeeklyRanges(config.AllWeeklyRanges)
if err != nil { if err != nil {

7
dnscrypt-proxy/example-captive-portal-handler.txt
View File

@ -1,7 +0,0 @@
captive.apple.com 17.253.109.201,17.253.113.202
connectivitycheck.gstatic.com 64.233.165.94
connectivitycheck.android.com 172.217.20.110
www.msftncsi.com 2.19.98.8,2.19.98.59
dns.msftncsi.com 131.107.255.255
www.msftconnecttest.com 13.107.4.52
ipv4only.arpa 192.0.0.170,192.0.0.171

15
dnscrypt-proxy/example-dnscrypt-proxy.toml
View File

@ -346,6 +346,7 @@ reject_ttl = 600
# cloak_ttl = 600 # cloak_ttl = 600
########################### ###########################
# DNS cache # # DNS cache #
########################### ###########################
@ -381,6 +382,20 @@ cache_neg_max_ttl = 600
########################################
# Captive portal handling #
########################################
[captive_portals]
## A file that contains a set of names used by operating systems to
## check for connectivity and captive portals, along with hard-coded
## IP addresses to return.
map_file = "example-captive-portals.txt"
################################## ##################################
# Local DoH server # # Local DoH server #
################################## ##################################

2
dnscrypt-proxy/main.go
View File

@ -15,7 +15,7 @@ import (
) )
const ( const (
AppVersion = "2.0.44" AppVersion = "2.0.45"
DefaultConfigFileName = "dnscrypt-proxy.toml" DefaultConfigFileName = "dnscrypt-proxy.toml"
) )

1
dnscrypt-proxy/plugin_captive_portal.go
View File

@ -19,6 +19,7 @@ func (plugin *PluginCaptivePortal) Description() string {
func (plugin *PluginCaptivePortal) Init(proxy *Proxy) error { func (plugin *PluginCaptivePortal) Init(proxy *Proxy) error {
plugin.captivePortalMap = proxy.captivePortalMap plugin.captivePortalMap = proxy.captivePortalMap
dlog.Notice("Captive portals handler enabled")
return nil return nil
} }

2
dnscrypt-proxy/proxy.go
View File

@ -44,7 +44,7 @@ type Proxy struct {
nxLogFormat string nxLogFormat string
localDoHCertFile string localDoHCertFile string
localDoHCertKeyFile string localDoHCertKeyFile string
captivePortalFile string captivePortalMapFile string
localDoHPath string localDoHPath string
mainProto string mainProto string
cloakFile string cloakFile string