mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-25 22:45:46 +03:00
557bbcbf37
Merge in DNS/adguard-home from 3184-disable-ptr to master Updates #3184. Squashed commit of the following: commit b78ac2eeb1b408586808ddbd1c87107f373b11b0 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed May 26 17:20:34 2021 +0300 all: rename dns config field commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26 Author: Ildar Kamalov <ik@adguard.com> Date: Wed May 26 15:55:44 2021 +0300 client: handle local ips rdns commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed May 26 14:43:13 2021 +0300 all: imp naming commit 771b7a3d5d25f91408dd97ba3287efb641028ccf Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed May 26 14:24:38 2021 +0300 all: imp docs, code commit be960893e8bbb7375a944ca0345b50c857a2d7cf Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed May 26 13:23:56 2021 +0300 all: imp docs & log changes commit 4e645a520f6bb584ef951435ee833ad30769af98 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed May 26 12:49:44 2021 +0300 all: add the field into structs commit 22b5b6163f086560a3189234532ba877be7ba940 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue May 25 15:10:31 2021 +0300 dnsforward: entitle lock, imp code
541 lines
12 KiB
JSON
541 lines
12 KiB
JSON
{
|
|
"upstream_dns": {
|
|
"req": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:77",
|
|
"8.8.4.4:77"
|
|
]
|
|
},
|
|
"want": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:77",
|
|
"8.8.4.4:77"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"protection_enabled": true,
|
|
"ratelimit": 0,
|
|
"blocking_mode": "",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
},
|
|
"bootstraps": {
|
|
"req": {
|
|
"bootstrap_dns": [
|
|
"9.9.9.10"
|
|
]
|
|
},
|
|
"want": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10"
|
|
],
|
|
"protection_enabled": true,
|
|
"ratelimit": 0,
|
|
"blocking_mode": "",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
},
|
|
"blocking_mode_good": {
|
|
"req": {
|
|
"blocking_mode": "refused"
|
|
},
|
|
"want": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"protection_enabled": true,
|
|
"ratelimit": 0,
|
|
"blocking_mode": "refused",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
},
|
|
"blocking_mode_bad": {
|
|
"req": {
|
|
"blocking_mode": "custom_ip"
|
|
},
|
|
"want": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"protection_enabled": true,
|
|
"ratelimit": 0,
|
|
"blocking_mode": "",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
},
|
|
"ratelimit": {
|
|
"req": {
|
|
"ratelimit": 6
|
|
},
|
|
"want": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"protection_enabled": true,
|
|
"ratelimit": 6,
|
|
"blocking_mode": "",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
},
|
|
"edns_cs_enabled": {
|
|
"req": {
|
|
"edns_cs_enabled": true
|
|
},
|
|
"want": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"protection_enabled": true,
|
|
"ratelimit": 0,
|
|
"blocking_mode": "",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"edns_cs_enabled": true,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
},
|
|
"dnssec_enabled": {
|
|
"req": {
|
|
"dnssec_enabled": true
|
|
},
|
|
"want": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"protection_enabled": true,
|
|
"ratelimit": 0,
|
|
"blocking_mode": "",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": true,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
},
|
|
"cache_size": {
|
|
"req": {
|
|
"cache_size": 1024
|
|
},
|
|
"want": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"protection_enabled": true,
|
|
"ratelimit": 0,
|
|
"blocking_mode": "",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "",
|
|
"cache_size": 1024,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
},
|
|
"upstream_mode_parallel": {
|
|
"req": {
|
|
"upstream_mode": "parallel"
|
|
},
|
|
"want": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"protection_enabled": true,
|
|
"ratelimit": 0,
|
|
"blocking_mode": "",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "parallel",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
},
|
|
"upstream_mode_fastest_addr": {
|
|
"req": {
|
|
"upstream_mode": "fastest_addr"
|
|
},
|
|
"want": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"protection_enabled": true,
|
|
"ratelimit": 0,
|
|
"blocking_mode": "",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "fastest_addr",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
},
|
|
"upstream_dns_bad": {
|
|
"req": {
|
|
"upstream_dns": [
|
|
"!!!"
|
|
]
|
|
},
|
|
"want": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"protection_enabled": true,
|
|
"ratelimit": 0,
|
|
"blocking_mode": "",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
},
|
|
"bootstraps_bad": {
|
|
"req": {
|
|
"bootstrap_dns": [
|
|
"a"
|
|
]
|
|
},
|
|
"want": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"protection_enabled": true,
|
|
"ratelimit": 0,
|
|
"blocking_mode": "",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
},
|
|
"cache_bad_ttl": {
|
|
"req": {
|
|
"cache_ttl_min": 1024,
|
|
"cache_ttl_max": 512
|
|
},
|
|
"want": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"protection_enabled": true,
|
|
"ratelimit": 0,
|
|
"blocking_mode": "",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
},
|
|
"upstream_mode_bad": {
|
|
"req": {
|
|
"upstream_mode": "somethingelse"
|
|
},
|
|
"want": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"protection_enabled": true,
|
|
"ratelimit": 0,
|
|
"blocking_mode": "",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
},
|
|
"local_ptr_upstreams_good": {
|
|
"req": {
|
|
"local_ptr_upstreams": [
|
|
"123.123.123.123"
|
|
]
|
|
},
|
|
"want": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"protection_enabled": true,
|
|
"ratelimit": 0,
|
|
"blocking_mode": "",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": [
|
|
"123.123.123.123"
|
|
]
|
|
}
|
|
},
|
|
"local_ptr_upstreams_null": {
|
|
"req": {
|
|
"local_ptr_upstreams": null
|
|
},
|
|
"want": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"protection_enabled": true,
|
|
"ratelimit": 0,
|
|
"blocking_mode": "",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
}
|
|
}
|