mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-22 13:05:36 +03:00
3c0d2a9253
Updates #4890.
Squashed commit of the following:
commit 20c8f3348125672403c3968b8e08b15eba69347d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Sep 6 16:55:11 2022 +0300
dnsforward: imp names
commit 2c21644623c321df46a5c386ec00ca532b7603b6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Sep 6 16:36:46 2022 +0300
dnsforward: imp validations; refactor more
commit 221e8c5ebbd0b64e5c554cddb683d116212e5901
Merge: e5f5b76e 58512c3a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Sep 6 14:57:31 2022 +0300
Merge branch 'master' into 4890-panic-internal-proxy
commit e5f5b76e3e2b43656af9939a52a9e46e5d9b5a40
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Sep 6 14:51:48 2022 +0300
dnsforward: fix panic; refactor
594 lines
14 KiB
JSON
594 lines
14 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": "default",
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"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": "default",
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"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": "default",
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"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": "default",
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"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": "default",
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"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": "default",
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"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": "default",
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"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": "default",
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"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": "default",
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"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": "default",
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"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": "default",
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"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": "default",
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"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": "default",
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"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": "default",
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": [
|
|
"123.123.123.123"
|
|
]
|
|
}
|
|
},
|
|
"local_ptr_upstreams_bad": {
|
|
"req": {
|
|
"local_ptr_upstreams": [
|
|
"123.123.123.123",
|
|
"[/non.arpa/]#"
|
|
]
|
|
},
|
|
"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": "default",
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
},
|
|
"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": "default",
|
|
"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,
|
|
"cache_optimistic": false,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": []
|
|
}
|
|
}
|
|
}
|