docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
<mask> "client_id_placeholder": "Enter client ID",
<mask> "client_id_desc": "Different clients can be identified by a special client ID. <a>Here</a> you can learn more about how to identify clients.",
<mask> "download_mobileconfig_doh": "Download .mobileconfig for DNS-over-HTTPS",
<mask> "download_mobileconfig_dot": "Download .mobileconfig for DNS-over-TLS",
<mask> "download_mobileconfig": "Download configuration file",
<mask> "plain_dns": "Plain DNS",
<mask> "form_enter_rate_limit": "Enter rate limit",
<mask> "rate_limit": "Rate limit",
<mask> "edns_enable": "Enable EDNS Client Subnet",
<mask> "edns_cs_desc": "If enabled, AdGuard Home will be sending clients' subnets to the DNS servers.",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "dns_over_quic": "DNS-over-QUIC",
"client_id": "Client ID",
"client_id_placeholder": "Enter client ID",
"client_id_desc": "Different clients can be identified by a special client ID. <a>Here</a> you can learn more about how to identify clients.",
</s> add </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>", </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.", </s> remove "setup_dns_privacy_ioc_mac": "iOS and macOS configuration",
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/en.json | |
"rule_label": "Rule", | <mask> "tracker_source": "Tracker source",
<mask> "source_label": "Source",
<mask> "found_in_known_domain_db": "Found in the known domains database.",
<mask> "category_label": "Category",
<mask> "rule_label": "Rule(s)",
<mask> "list_label": "List",
<mask> "unknown_filter": "Unknown filter {{filterId}}",
<mask> "known_tracker": "Known tracker",
<mask> "install_welcome_title": "Welcome to AdGuard Home!",
<mask> "install_welcome_desc": "AdGuard Home is a network-wide ad-and-tracker blocking DNS server. Its purpose is to let you control your entire network and all your devices, and it does not require using a client-side program.",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "install_welcome_desc": "AdGuard Home is een netwerk DNS server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.",
</s> add "install_welcome_desc": "AdGuard Home is een netwerk DNS-server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.", </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.", </s> remove "setup_dns_privacy_ioc_mac": "iOS and macOS configuration",
</s> add </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/en.json |
"encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.", | <mask> "encryption_desc": "Encryption (HTTPS/TLS) support for both DNS and admin web interface",
<mask> "encryption_config_saved": "Encryption config saved",
<mask> "encryption_server": "Server name",
<mask> "encryption_server_enter": "Enter your domain name",
<mask> "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.",
<mask> "encryption_redirect": "Redirect to HTTPS automatically",
<mask> "encryption_redirect_desc": "If checked, AdGuard Home will automatically redirect you from HTTP to HTTPS addresses.",
<mask> "encryption_https": "HTTPS port",
<mask> "encryption_https_desc": "If HTTPS port is configured, AdGuard Home admin interface will be accessible via HTTPS, and it will also provide DNS-over-HTTPS on '/dns-query' location.",
<mask> "encryption_dot": "DNS-over-TLS port",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "setup_dns_privacy_ioc_mac": "iOS and macOS configuration",
</s> add </s> remove "download_mobileconfig": "Download configuration file",
</s> add </s> remove "rule_label": "Rule(s)",
</s> add "rule_label": "Rule", </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/en.json |
"client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>", | <mask> "client_new": "New Client",
<mask> "client_edit": "Edit Client",
<mask> "client_identifier": "Identifier",
<mask> "ip_address": "IP address",
<mask> "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.",
<mask> "form_enter_ip": "Enter IP",
<mask> "form_enter_mac": "Enter MAC",
<mask> "form_enter_id": "Enter identifier",
<mask> "form_add_id": "Add identifier",
<mask> "form_client_name": "Enter client name",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "download_mobileconfig": "Download configuration file",
</s> add </s> remove "dns_over_quic": "DNS-over-QUIC",
"client_id": "Client ID",
"client_id_placeholder": "Enter client ID",
"client_id_desc": "Different clients can be identified by a special client ID. <a>Here</a> you can learn more about how to identify clients.",
</s> add </s> remove "form_error_server_name": "Invalid server name",
</s> add </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.", </s> remove "save_btn": "Bewaar",
</s> add "save_btn": "Opslaan", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/en.json |
<mask> "setup_dns_privacy_other_2": "<0>dnsproxy</0> supports all known secure DNS protocols.",
<mask> "setup_dns_privacy_other_3": "<0>dnscrypt-proxy</0> supports <1>DNS-over-HTTPS</1>.",
<mask> "setup_dns_privacy_other_4": "<0>Mozilla Firefox</0> supports <1>DNS-over-HTTPS</1>.",
<mask> "setup_dns_privacy_other_5": "You will find more implementations <0>here</0> and <1>here</1>.",
<mask> "setup_dns_privacy_ioc_mac": "iOS and macOS configuration",
<mask> "setup_dns_notice": "In order to use <1>DNS-over-HTTPS</1> or <1>DNS-over-TLS</1>, you need to <0>configure Encryption</0> in AdGuard Home settings.",
<mask> "rewrite_added": "DNS rewrite for \"{{key}}\" successfully added",
<mask> "rewrite_deleted": "DNS rewrite for \"{{key}}\" successfully deleted",
<mask> "rewrite_add": "Add DNS rewrite",
<mask> "rewrite_not_found": "No DNS rewrites found",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.", </s> remove "setup_dns_notice": "Om <1> DNS-over-HTTPS </1> of <1> DNS-over-TLS </1> te gebruiken, moet u <0> Codering </0> configureren in de AdGuard Home-instellingen.",
</s> add "setup_dns_notice": "Om <1>DNS-via-HTTPS</1> of <1>DNS-via-TLS</1> te gebruiken, moet je <0>Versleuteling configureren</0> in de AdGuard Home instellingen.", </s> remove "rule_label": "Rule(s)",
</s> add "rule_label": "Rule", </s> remove "download_mobileconfig": "Download configuration file",
</s> add </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/en.json | |
"check_rule": "Rule: {{rule}}", | <mask> "check_cname": "CNAME: {{cname}}",
<mask> "check_reason": "Reason: {{reason}}",
<mask> "check_service": "Service name: {{service}}",
<mask> "service_name": "Service name",
<mask> "check_not_found": "Not found in your filter lists",
<mask> "client_confirm_block": "Are you sure you want to block the client \"{{ip}}\"?",
<mask> "client_confirm_unblock": "Are you sure you want to unblock the client \"{{ip}}\"?",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.", </s> remove "rule_label": "Rule(s)",
</s> add "rule_label": "Rule", </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>", </s> remove "download_mobileconfig": "Download configuration file",
</s> add </s> remove "dns_over_quic": "DNS-over-QUIC",
"client_id": "Client ID",
"client_id_placeholder": "Enter client ID",
"client_id_desc": "Different clients can be identified by a special client ID. <a>Here</a> you can learn more about how to identify clients.",
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/en.json |
"dhcp_config_saved": "DHCP configuratie succesvol opgeslagen", | <mask> "dhcp_found": "Actieve DHCP server(s) gevonden op het netwerk. het is NIET veilig om de ingebouwde DHCP server in te schakelen.",
<mask> "dhcp_leases": "DHCP lease overzicht",
<mask> "dhcp_static_leases": "DHCP statische lease",
<mask> "dhcp_leases_not_found": "Geen DHCP lease gevonden",
<mask> "dhcp_config_saved": "DHCP server configuratie opgeslagen",
<mask> "dhcp_ipv4_settings": "DHCP IPv4 instellingen",
<mask> "dhcp_ipv6_settings": "DHCP IPv6 instellingen",
<mask> "form_error_required": "Vereist veld",
<mask> "form_error_ip4_format": "Ongeldig IPv4 formaat",
<mask> "form_error_ip6_format": "Ongeldig IPv6 formaat",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "upstream_dns": "Upstream DNS servers",
"upstream_dns_help": "Server adressen invoeren, een per regel. <a>Meer weten</a> over het configureren van upstream DNS servers.",
</s> add "upstream_dns": "Upstream DNS-servers",
"upstream_dns_help": "Server adressen invoeren, een per regel. <a>Meer weten</a> over het configureren van upstream DNS-servers.", </s> remove "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in uw AdGuard Home-serveradressen.",
</s> add "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in jouw AdGuard Home server adressen.", </s> remove "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer uw AdGuard Home-serveradressen in.",
</s> add "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer jouw AdGuard Home server adressen in.", </s> remove "form_error_server_name": "Invalid server name",
</s> add </s> remove "no_logs_found": "Geen log bestanden gevonden",
</s> add "no_logs_found": "Geen logboeken gevonden", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"upstream_dns": "Upstream DNS-servers",
"upstream_dns_help": "Server adressen invoeren, een per regel. <a>Meer weten</a> over het configureren van upstream DNS-servers.", | <mask> "dns_allowlists_desc": "Domeinen in de DNS toestemmingslijsten worden toegestaan zelfs al komen ze voor in de blokkeerlijsten.",
<mask> "custom_filtering_rules": "Aangepaste filter regels",
<mask> "encryption_settings": "Encryptie Instellingen",
<mask> "dhcp_settings": "DHCP Instellingen",
<mask> "upstream_dns": "Upstream DNS servers",
<mask> "upstream_dns_help": "Server adressen invoeren, een per regel. <a>Meer weten</a> over het configureren van upstream DNS servers.",
<mask> "upstream_dns_configured_in_file": "Geconfigureerd in {{path}}",
<mask> "test_upstream_btn": "Test upstream",
<mask> "upstreams": "Upstreams",
<mask> "apply_btn": "Toepassen",
<mask> "disabled_filtering_toast": "Filters uitgeschakeld",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "install_welcome_desc": "AdGuard Home is een netwerk DNS server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.",
</s> add "install_welcome_desc": "AdGuard Home is een netwerk DNS-server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.", </s> remove "dns_start": "DNS server aan het opstarten",
"dns_status_error": "Fout bij het oproepen van de DNS server status",
</s> add "dns_start": "DNS-server aan het opstarten",
"dns_status_error": "Fout bij het oproepen van de DNS-server status", </s> remove "dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of u het correct hebt geschreven",
</s> add "dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of je het correct hebt geschreven", </s> remove "install_devices_ios_list_4": "Voer in het DNS-veld uw AdGuard Home-serveradressen in.",
</s> add "install_devices_ios_list_4": "Voer in het DNS veld jouw AdGuard Home server adressen in.", </s> remove "example_upstream_sdns": "je kunt <0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-over-HTTPS</2> resolvers",
</s> add "example_upstream_sdns": "je kunt <0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-via-HTTPS</2> oplossingen gebruiken", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"example_upstream_dot": "versleutelde <0>DNS-via-TLS</0>",
"example_upstream_doh": "versleutelde <0>DNS-via-HTTPS</0>", | <mask> "example_comment_meaning": "zomaar een opmerking",
<mask> "example_comment_hash": "# Nog een opmerking",
<mask> "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de opgegeven reguliere expressie",
<mask> "example_upstream_regular": "standaard DNS (over UDP)",
<mask> "example_upstream_dot": "versleutelde <0>DNS_over_TLS</0>",
<mask> "example_upstream_doh": "versleutelde <0>DNS_over_HTTPS</0>",
<mask> "example_upstream_doq": "versleutelde <0>DNS-via-QUIC</0>",
<mask> "example_upstream_sdns": "je kunt <0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-over-HTTPS</2> resolvers",
<mask> "example_upstream_tcp": "standaard DNS (over TCP)",
<mask> "all_lists_up_to_date_toast": "Alle lijsten zijn reeds up-to-date",
<mask> "updated_upstream_dns_toast": "De upstream DNS-servers zijn bijgewerkt",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "example_upstream_sdns": "je kunt <0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-over-HTTPS</2> resolvers",
</s> add "example_upstream_sdns": "je kunt <0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-via-HTTPS</2> oplossingen gebruiken", </s> remove "dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of u het correct hebt geschreven",
</s> add "dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of je het correct hebt geschreven", </s> remove "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
</s> add "fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.", </s> remove "upstream_dns": "Upstream DNS servers",
"upstream_dns_help": "Server adressen invoeren, een per regel. <a>Meer weten</a> over het configureren van upstream DNS servers.",
</s> add "upstream_dns": "Upstream DNS-servers",
"upstream_dns_help": "Server adressen invoeren, een per regel. <a>Meer weten</a> over het configureren van upstream DNS-servers.", </s> remove "install_welcome_desc": "AdGuard Home is een netwerk DNS server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.",
</s> add "install_welcome_desc": "AdGuard Home is een netwerk DNS-server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"example_upstream_sdns": "je kunt <0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-via-HTTPS</2> oplossingen gebruiken", | <mask> "example_upstream_regular": "standaard DNS (over UDP)",
<mask> "example_upstream_dot": "versleutelde <0>DNS_over_TLS</0>",
<mask> "example_upstream_doh": "versleutelde <0>DNS_over_HTTPS</0>",
<mask> "example_upstream_doq": "versleutelde <0>DNS-via-QUIC</0>",
<mask> "example_upstream_sdns": "je kunt <0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-over-HTTPS</2> resolvers",
<mask> "example_upstream_tcp": "standaard DNS (over TCP)",
<mask> "all_lists_up_to_date_toast": "Alle lijsten zijn reeds up-to-date",
<mask> "updated_upstream_dns_toast": "De upstream DNS-servers zijn bijgewerkt",
<mask> "dns_test_ok_toast": "Opgegeven DNS-servers werken correct",
<mask> "dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of u het correct hebt geschreven",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "example_upstream_dot": "versleutelde <0>DNS_over_TLS</0>",
"example_upstream_doh": "versleutelde <0>DNS_over_HTTPS</0>",
</s> add "example_upstream_dot": "versleutelde <0>DNS-via-TLS</0>",
"example_upstream_doh": "versleutelde <0>DNS-via-HTTPS</0>", </s> remove "dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of u het correct hebt geschreven",
</s> add "dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of je het correct hebt geschreven", </s> remove "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
</s> add "fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.", </s> remove "upstream_dns": "Upstream DNS servers",
"upstream_dns_help": "Server adressen invoeren, een per regel. <a>Meer weten</a> over het configureren van upstream DNS servers.",
</s> add "upstream_dns": "Upstream DNS-servers",
"upstream_dns_help": "Server adressen invoeren, een per regel. <a>Meer weten</a> over het configureren van upstream DNS-servers.", </s> remove "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in uw AdGuard Home-serveradressen.",
</s> add "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in jouw AdGuard Home server adressen.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of je het correct hebt geschreven", | <mask> "example_upstream_tcp": "standaard DNS (over TCP)",
<mask> "all_lists_up_to_date_toast": "Alle lijsten zijn reeds up-to-date",
<mask> "updated_upstream_dns_toast": "De upstream DNS-servers zijn bijgewerkt",
<mask> "dns_test_ok_toast": "Opgegeven DNS-servers werken correct",
<mask> "dns_test_not_ok_toast": "Server \"{{key}}\": kon niet worden gebruikt, controleer of u het correct hebt geschreven",
<mask> "unblock": "Deblokkeren",
<mask> "block": "Blokkeren",
<mask> "disallow_this_client": "Toepassing/systeem niet toelaten",
<mask> "allow_this_client": "Toepassing/systeem toelaten",
<mask> "block_for_this_client_only": "Alleen voor deze toepassing/dit systeem blokkeren",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "example_upstream_sdns": "je kunt <0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-over-HTTPS</2> resolvers",
</s> add "example_upstream_sdns": "je kunt <0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-via-HTTPS</2> oplossingen gebruiken", </s> remove "example_upstream_dot": "versleutelde <0>DNS_over_TLS</0>",
"example_upstream_doh": "versleutelde <0>DNS_over_HTTPS</0>",
</s> add "example_upstream_dot": "versleutelde <0>DNS-via-TLS</0>",
"example_upstream_doh": "versleutelde <0>DNS-via-HTTPS</0>", </s> remove "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
</s> add "fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.", </s> remove "upstream_dns": "Upstream DNS servers",
"upstream_dns_help": "Server adressen invoeren, een per regel. <a>Meer weten</a> over het configureren van upstream DNS servers.",
</s> add "upstream_dns": "Upstream DNS-servers",
"upstream_dns_help": "Server adressen invoeren, een per regel. <a>Meer weten</a> over het configureren van upstream DNS-servers.", </s> remove "access_desc": "Hier kan je toegangsregels voor de AdGuard Home DNS server instellen.",
</s> add "access_desc": "Hier kan je toegangsregels voor de AdGuard Home DNS-server instellen.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"no_logs_found": "Geen logboeken gevonden", | <mask> "client_table_header": "Gebruiker",
<mask> "empty_response_status": "Leeg",
<mask> "show_all_filter_type": "Toon alles",
<mask> "show_filtered_type": "Toon gefilterde",
<mask> "no_logs_found": "Geen log bestanden gevonden",
<mask> "refresh_btn": "Verversen",
<mask> "previous_btn": "Vorige",
<mask> "next_btn": "Volgende",
<mask> "loading_table_status": "Laden...",
<mask> "page_table_footer_text": "Pagina",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "dhcp_config_saved": "DHCP server configuratie opgeslagen",
</s> add "dhcp_config_saved": "DHCP configuratie succesvol opgeslagen", </s> remove "setup_dns_notice": "Om <1> DNS-over-HTTPS </1> of <1> DNS-over-TLS </1> te gebruiken, moet u <0> Codering </0> configureren in de AdGuard Home-instellingen.",
</s> add "setup_dns_notice": "Om <1>DNS-via-HTTPS</1> of <1>DNS-via-TLS</1> te gebruiken, moet je <0>Versleuteling configureren</0> in de AdGuard Home instellingen.", </s> remove "save_btn": "Bewaar",
</s> add "save_btn": "Opslaan", </s> remove "install_devices_ios_list_4": "Voer in het DNS-veld uw AdGuard Home-serveradressen in.",
</s> add "install_devices_ios_list_4": "Voer in het DNS veld jouw AdGuard Home server adressen in.", </s> remove "version": "0.1.0",
</s> add "version": "0.2.0", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"install_welcome_desc": "AdGuard Home is een netwerk DNS-server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.", | <mask> "list_label": "Lijst",
<mask> "unknown_filter": "Onbekend filter {{filterId}}",
<mask> "known_tracker": "Bekende volger",
<mask> "install_welcome_title": "Welkom bij AdGuard Home!",
<mask> "install_welcome_desc": "AdGuard Home is een netwerk DNS server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.",
<mask> "install_settings_title": "Admin webinterface",
<mask> "install_settings_listen": "Luister interface",
<mask> "install_settings_port": "Poort",
<mask> "install_settings_interface_link": "De webinterface van AdGuard Home admin is beschikbaar op de volgende adressen:",
<mask> "form_error_port": "Voer geldige poortwaarde in",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "install_settings_dns": "DNS server",
"install_settings_dns_desc": "U moet uw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:",
</s> add "install_settings_dns": "DNS-server",
"install_settings_dns_desc": "Je moet jouw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:", </s> remove "rule_label": "Rule(s)",
</s> add "rule_label": "Rule", </s> remove "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer uw AdGuard Home-serveradressen in.",
</s> add "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer jouw AdGuard Home server adressen in.", </s> remove "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in uw AdGuard Home-serveradressen.",
</s> add "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in jouw AdGuard Home server adressen.", </s> remove "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
</s> add "fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"install_settings_dns": "DNS-server",
"install_settings_dns_desc": "Je moet jouw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:", | <mask> "install_settings_listen": "Luister interface",
<mask> "install_settings_port": "Poort",
<mask> "install_settings_interface_link": "De webinterface van AdGuard Home admin is beschikbaar op de volgende adressen:",
<mask> "form_error_port": "Voer geldige poortwaarde in",
<mask> "install_settings_dns": "DNS server",
<mask> "install_settings_dns_desc": "U moet uw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:",
<mask> "install_settings_all_interfaces": "Alle interfaces",
<mask> "install_auth_title": "Authenticatie",
<mask> "install_auth_desc": "Het wordt ten zeerste aanbevolen om wachtwoordverificatie te configureren voor de AdGuard Home admin webinterface. Zelfs als het alleen toegankelijk is in uw lokale netwerk, is het nog steeds belangrijk om het te beschermen tegen onbeperkte toegang.",
<mask> "install_auth_username": "Gebruikersnaam",
<mask> "install_auth_password": "Wachtwoord",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "install_welcome_desc": "AdGuard Home is een netwerk DNS server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.",
</s> add "install_welcome_desc": "AdGuard Home is een netwerk DNS-server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.", </s> remove "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer uw AdGuard Home-serveradressen in.",
</s> add "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer jouw AdGuard Home server adressen in.", </s> remove "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in uw AdGuard Home-serveradressen.",
</s> add "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in jouw AdGuard Home server adressen.", </s> remove "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
</s> add "fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.", </s> remove "install_devices_windows_list_6": "Kies Gebruik de volgende DNS-serveradressen en voer uw AdGuard Home-serveradressen in.",
</s> add "install_devices_windows_list_6": "Kies Gebruik de volgende DNS-server adressen en voer jouw AdGuard Home server adressen in.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"install_devices_windows_list_6": "Kies Gebruik de volgende DNS-server adressen en voer jouw AdGuard Home server adressen in.", | <mask> "install_devices_windows_list_2": "Ga naar de categorie Netwerk en Internet en vervolgens naar Netwerkcentrum.",
<mask> "install_devices_windows_list_3": "Zoek aan de linkerkant van het scherm Adapter-instellingen wijzigen en klik erop.",
<mask> "install_devices_windows_list_4": "Selecteer jouw actieve verbinding, klik er met de rechtermuisknop op en kies Eigenschappen.",
<mask> "install_devices_windows_list_5": "Zoek Internet Protocol versie 4 (TCP / IP) in de lijst, selecteer het en klik vervolgens opnieuw op Eigenschappen.",
<mask> "install_devices_windows_list_6": "Kies Gebruik de volgende DNS-serveradressen en voer uw AdGuard Home-serveradressen in.",
<mask> "install_devices_macos_list_1": "Klik op het Apple-pictogram en ga naar Systeemvoorkeuren.",
<mask> "install_devices_macos_list_2": "Klik op Netwerk.",
<mask> "install_devices_macos_list_3": "Selecteer de eerste verbinding in jouw lijst en klik op Geavanceerd.",
<mask> "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer uw AdGuard Home-serveradressen in.",
<mask> "install_devices_android_list_1": "Tik op het startscherm van het Android-menu op Instellingen.",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer uw AdGuard Home-serveradressen in.",
</s> add "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer jouw AdGuard Home server adressen in.", </s> remove "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in uw AdGuard Home-serveradressen.",
</s> add "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in jouw AdGuard Home server adressen.", </s> remove "install_devices_ios_list_4": "Voer in het DNS-veld uw AdGuard Home-serveradressen in.",
</s> add "install_devices_ios_list_4": "Voer in het DNS veld jouw AdGuard Home server adressen in.", </s> remove "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
</s> add "fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.", </s> remove "install_welcome_desc": "AdGuard Home is een netwerk DNS server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.",
</s> add "install_welcome_desc": "AdGuard Home is een netwerk DNS-server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"install_devices_macos_list_4": "Selecteer het tabblad DNS en voer jouw AdGuard Home server adressen in.", | <mask> "install_devices_windows_list_6": "Kies Gebruik de volgende DNS-serveradressen en voer uw AdGuard Home-serveradressen in.",
<mask> "install_devices_macos_list_1": "Klik op het Apple-pictogram en ga naar Systeemvoorkeuren.",
<mask> "install_devices_macos_list_2": "Klik op Netwerk.",
<mask> "install_devices_macos_list_3": "Selecteer de eerste verbinding in jouw lijst en klik op Geavanceerd.",
<mask> "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer uw AdGuard Home-serveradressen in.",
<mask> "install_devices_android_list_1": "Tik op het startscherm van het Android-menu op Instellingen.",
<mask> "install_devices_android_list_2": "Tik op wifi in het menu. Het scherm met alle beschikbare netwerken wordt getoond (het is niet mogelijk om een aangepaste DNS in te stellen voor een mobiele verbinding).",
<mask> "install_devices_android_list_3": "Druk lang op het netwerk waarmee je bent verbonden en tik op Netwerk instellingen aanpassen.",
<mask> "install_devices_android_list_4": "Op sommige apparaten moet u het vakje aanvinken voor Geavanceerd om verdere instellingen te bekijken. Om uw Android DNS-instellingen aan te passen, moet u de IP-instellingen wijzigen van DHCP in Statisch.",
<mask> "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in uw AdGuard Home-serveradressen.",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in uw AdGuard Home-serveradressen.",
</s> add "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in jouw AdGuard Home server adressen.", </s> remove "install_devices_windows_list_6": "Kies Gebruik de volgende DNS-serveradressen en voer uw AdGuard Home-serveradressen in.",
</s> add "install_devices_windows_list_6": "Kies Gebruik de volgende DNS-server adressen en voer jouw AdGuard Home server adressen in.", </s> remove "install_devices_ios_list_4": "Voer in het DNS-veld uw AdGuard Home-serveradressen in.",
</s> add "install_devices_ios_list_4": "Voer in het DNS veld jouw AdGuard Home server adressen in.", </s> remove "install_settings_dns": "DNS server",
"install_settings_dns_desc": "U moet uw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:",
</s> add "install_settings_dns": "DNS-server",
"install_settings_dns_desc": "Je moet jouw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:", </s> remove "install_welcome_desc": "AdGuard Home is een netwerk DNS server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.",
</s> add "install_welcome_desc": "AdGuard Home is een netwerk DNS-server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in jouw AdGuard Home server adressen.", | <mask> "install_devices_android_list_1": "Tik op het startscherm van het Android-menu op Instellingen.",
<mask> "install_devices_android_list_2": "Tik op wifi in het menu. Het scherm met alle beschikbare netwerken wordt getoond (het is niet mogelijk om een aangepaste DNS in te stellen voor een mobiele verbinding).",
<mask> "install_devices_android_list_3": "Druk lang op het netwerk waarmee je bent verbonden en tik op Netwerk instellingen aanpassen.",
<mask> "install_devices_android_list_4": "Op sommige apparaten moet u het vakje aanvinken voor Geavanceerd om verdere instellingen te bekijken. Om uw Android DNS-instellingen aan te passen, moet u de IP-instellingen wijzigen van DHCP in Statisch.",
<mask> "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in uw AdGuard Home-serveradressen.",
<mask> "install_devices_ios_list_1": "Tik op het startscherm op Instellingen.",
<mask> "install_devices_ios_list_2": "Kies Wi-Fi in het linkermenu (DNS kan niet worden geconfigureerd voor mobiele netwerken).",
<mask> "install_devices_ios_list_3": "Tik op de naam van het momenteel actieve netwerk.",
<mask> "install_devices_ios_list_4": "Voer in het DNS-veld uw AdGuard Home-serveradressen in.",
<mask> "get_started": "Beginnen",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer uw AdGuard Home-serveradressen in.",
</s> add "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer jouw AdGuard Home server adressen in.", </s> remove "install_devices_ios_list_4": "Voer in het DNS-veld uw AdGuard Home-serveradressen in.",
</s> add "install_devices_ios_list_4": "Voer in het DNS veld jouw AdGuard Home server adressen in.", </s> remove "install_devices_windows_list_6": "Kies Gebruik de volgende DNS-serveradressen en voer uw AdGuard Home-serveradressen in.",
</s> add "install_devices_windows_list_6": "Kies Gebruik de volgende DNS-server adressen en voer jouw AdGuard Home server adressen in.", </s> remove "install_settings_dns": "DNS server",
"install_settings_dns_desc": "U moet uw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:",
</s> add "install_settings_dns": "DNS-server",
"install_settings_dns_desc": "Je moet jouw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:", </s> remove "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
</s> add "fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"install_devices_ios_list_4": "Voer in het DNS veld jouw AdGuard Home server adressen in.", | <mask> "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in uw AdGuard Home-serveradressen.",
<mask> "install_devices_ios_list_1": "Tik op het startscherm op Instellingen.",
<mask> "install_devices_ios_list_2": "Kies Wi-Fi in het linkermenu (DNS kan niet worden geconfigureerd voor mobiele netwerken).",
<mask> "install_devices_ios_list_3": "Tik op de naam van het momenteel actieve netwerk.",
<mask> "install_devices_ios_list_4": "Voer in het DNS-veld uw AdGuard Home-serveradressen in.",
<mask> "get_started": "Beginnen",
<mask> "next": "Volgende",
<mask> "open_dashboard": "Open Dashboard",
<mask> "install_saved": "Succesvol opgeslagen",
<mask> "encryption_title": "Encryptie",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in uw AdGuard Home-serveradressen.",
</s> add "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in jouw AdGuard Home server adressen.", </s> remove "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer uw AdGuard Home-serveradressen in.",
</s> add "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer jouw AdGuard Home server adressen in.", </s> remove "install_devices_windows_list_6": "Kies Gebruik de volgende DNS-serveradressen en voer uw AdGuard Home-serveradressen in.",
</s> add "install_devices_windows_list_6": "Kies Gebruik de volgende DNS-server adressen en voer jouw AdGuard Home server adressen in.", </s> remove "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
</s> add "fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.", </s> remove "install_settings_dns": "DNS server",
"install_settings_dns_desc": "U moet uw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:",
</s> add "install_settings_dns": "DNS-server",
"install_settings_dns_desc": "Je moet jouw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"dns_start": "DNS-server aan het opstarten",
"dns_status_error": "Fout bij het oproepen van de DNS-server status", | <mask> "reset_settings": "Reset Instellingen",
<mask> "update_announcement": "AdGuard Home{{version}} is nu beschikbaar! <0>klik hier</0> voor meer info.",
<mask> "setup_guide": "Installatie gids",
<mask> "dns_addresses": "DNS adressen",
<mask> "dns_start": "DNS server aan het opstarten",
<mask> "dns_status_error": "Fout bij het oproepen van de DNS server status",
<mask> "down": "Uitgeschakeld",
<mask> "fix": "Los op",
<mask> "dns_providers": "hier is een <0>lijst of gekende DNS providers</0> waarvan je kan kiezen.",
<mask> "update_now": "Update nu",
<mask> "update_failed": "Auto-update is mislukt. <a>Volg deze stappen</a> om manueel te updaten.",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "install_welcome_desc": "AdGuard Home is een netwerk DNS server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.",
</s> add "install_welcome_desc": "AdGuard Home is een netwerk DNS-server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.", </s> remove "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in uw AdGuard Home-serveradressen.",
</s> add "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in jouw AdGuard Home server adressen.", </s> remove "access_desc": "Hier kan je toegangsregels voor de AdGuard Home DNS server instellen.",
</s> add "access_desc": "Hier kan je toegangsregels voor de AdGuard Home DNS-server instellen.", </s> remove "install_settings_dns": "DNS server",
"install_settings_dns_desc": "U moet uw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:",
</s> add "install_settings_dns": "DNS-server",
"install_settings_dns_desc": "Je moet jouw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:", </s> remove "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer uw AdGuard Home-serveradressen in.",
</s> add "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer jouw AdGuard Home server adressen in.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"save_btn": "Opslaan", | <mask> "settings_global": "Globaal",
<mask> "settings_custom": "Aangepast",
<mask> "table_client": "Gebruiker",
<mask> "table_name": "Naam",
<mask> "save_btn": "Bewaar",
<mask> "client_add": "Voeg gebruiker toe",
<mask> "client_new": "Nieuwe gebruiker",
<mask> "client_edit": "Wijzig gebruiker",
<mask> "client_identifier": "Identificeer via",
<mask> "ip_address": "IP adres",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address or a special client ID (can be used for DoT/DoH/DoQ). <0>Here</0> you can learn more about how to identify clients.",
</s> add "client_identifier_desc": "Clients can be identified by the IP address, CIDR, MAC address. Please note that using MAC as identifier is possible only if AdGuard Home is also a <0>DHCP server</0>", </s> remove "no_logs_found": "Geen log bestanden gevonden",
</s> add "no_logs_found": "Geen logboeken gevonden", </s> remove "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in uw AdGuard Home-serveradressen.",
</s> add "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in jouw AdGuard Home server adressen.", </s> remove "install_devices_ios_list_4": "Voer in het DNS-veld uw AdGuard Home-serveradressen in.",
</s> add "install_devices_ios_list_4": "Voer in het DNS veld jouw AdGuard Home server adressen in.", </s> remove "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
</s> add "fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"access_desc": "Hier kan je toegangsregels voor de AdGuard Home DNS-server instellen.", | <mask> "list_confirm_delete": "Ben je zeker om deze lijst te verwijderen?",
<mask> "auto_clients_title": "Gebruikers (runtime)",
<mask> "auto_clients_desc": "Data over gebruikers die AdGuard Home gebruiken, maar niet geconfigureerd zijn",
<mask> "access_title": "Toegangs instellingen",
<mask> "access_desc": "Hier kan je toegangsregels voor de AdGuard Home DNS server instellen.",
<mask> "access_allowed_title": "Toegestane gebruikers",
<mask> "access_allowed_desc": "Een lijst van CIDR of IP adressen. Indien ingesteld, zal AdGuard Home alleen van deze IP adressen aanvragen accepteren.",
<mask> "access_disallowed_title": "Verworpen gebruikers",
<mask> "access_disallowed_desc": "Een lijst van CIDR of IP adressen. Indien ingesteld, zal AdGuard Home aanvragen van deze IP adressen verwerpen.",
<mask> "access_blocked_title": "Niet toegelaten domeinen",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
</s> add "fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.", </s> remove "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer uw AdGuard Home-serveradressen in.",
</s> add "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer jouw AdGuard Home server adressen in.", </s> remove "install_welcome_desc": "AdGuard Home is een netwerk DNS server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.",
</s> add "install_welcome_desc": "AdGuard Home is een netwerk DNS-server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.", </s> remove "install_devices_ios_list_4": "Voer in het DNS-veld uw AdGuard Home-serveradressen in.",
</s> add "install_devices_ios_list_4": "Voer in het DNS veld jouw AdGuard Home server adressen in.", </s> remove "setup_dns_notice": "Om <1> DNS-over-HTTPS </1> of <1> DNS-over-TLS </1> te gebruiken, moet u <0> Codering </0> configureren in de AdGuard Home-instellingen.",
</s> add "setup_dns_notice": "Om <1>DNS-via-HTTPS</1> of <1>DNS-via-TLS</1> te gebruiken, moet je <0>Versleuteling configureren</0> in de AdGuard Home instellingen.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"setup_dns_notice": "Om <1>DNS-via-HTTPS</1> of <1>DNS-via-TLS</1> te gebruiken, moet je <0>Versleuteling configureren</0> in de AdGuard Home instellingen.", | <mask> "setup_dns_privacy_other_2": "<0>dnsproxy</0> ondersteunt alle bekende beveiligde DNS-protocollen.",
<mask> "setup_dns_privacy_other_3": "<0> dnscrypt-proxy </0> ondersteunt <1> DNS-over-HTTPS </1>.",
<mask> "setup_dns_privacy_other_4": "<0> Mozilla Firefox </0> ondersteunt <1> DNS-over-HTTPS </1>.",
<mask> "setup_dns_privacy_other_5": "U vindt meer implementaties <0> hier </0> en <1> hier </1>.",
<mask> "setup_dns_notice": "Om <1> DNS-over-HTTPS </1> of <1> DNS-over-TLS </1> te gebruiken, moet u <0> Codering </0> configureren in de AdGuard Home-instellingen.",
<mask> "rewrite_added": "DNS-herschrijving voor \"{{key}}\" met succes toegevoegd",
<mask> "rewrite_deleted": "DNS-herschrijving voor \"{{key}}\" met succes verwijderd",
<mask> "rewrite_add": "DNS-herschrijving toevoegen",
<mask> "rewrite_not_found": "Geen DNS-herschrijving gevonden",
<mask> "rewrite_confirm_delete": "Bent u zeker dat u DNS-herschrijving \"{{key}}\" wilt verwijderen?",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "setup_dns_privacy_ioc_mac": "iOS and macOS configuration",
</s> add </s> remove "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
</s> add "fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.", </s> remove "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer uw AdGuard Home-serveradressen in.",
</s> add "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer jouw AdGuard Home server adressen in.", </s> remove "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in uw AdGuard Home-serveradressen.",
</s> add "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in jouw AdGuard Home server adressen.", </s> remove "install_settings_dns": "DNS server",
"install_settings_dns_desc": "U moet uw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:",
</s> add "install_settings_dns": "DNS-server",
"install_settings_dns_desc": "Je moet jouw apparaten of router configureren om de DNS-server te gebruiken op de volgende adressen:", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.", | <mask> "rewrite_AAAA": "<0>AAAA</0>: speciale waarde, <0>AAAA</0> records uit de upstream bewaren",
<mask> "disable_ipv6": "Zet IPv6 uit",
<mask> "disable_ipv6_desc": "Als deze functie is ingeschakeld, worden alle DNS-query's voor IPv6-adressen (type AAAA) verwijderd.",
<mask> "fastest_addr": "Snelste IP adres",
<mask> "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
<mask> "autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
<mask> "autofix_warning_list": "De volgende taken worden uitgevoerd: <0> Deactiveren van Systeem DNSStubListener</0> <0> DNS-serveradres instellen op 127.0.0.1 </0> <0> Symbolisch koppelingsdoel van /etc/resolv.conf vervangen door /run/systemd/resolve/resolv.conf </0> <0> Stop DNSStubListener (herlaad systemd-resolved service) </0>",
<mask> "autofix_warning_result": "Als gevolg hiervan worden alle DNS-verzoeken van je systeem standaard door AdGuard Home verwerkt.",
<mask> "tags_title": "Labels",
<mask> "tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>",
<mask> "form_select_tags": "Client tags selecteren",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "setup_dns_notice": "Om <1> DNS-over-HTTPS </1> of <1> DNS-over-TLS </1> te gebruiken, moet u <0> Codering </0> configureren in de AdGuard Home-instellingen.",
</s> add "setup_dns_notice": "Om <1>DNS-via-HTTPS</1> of <1>DNS-via-TLS</1> te gebruiken, moet je <0>Versleuteling configureren</0> in de AdGuard Home instellingen.", </s> remove "access_desc": "Hier kan je toegangsregels voor de AdGuard Home DNS server instellen.",
</s> add "access_desc": "Hier kan je toegangsregels voor de AdGuard Home DNS-server instellen.", </s> remove "install_welcome_desc": "AdGuard Home is een netwerk DNS server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.",
</s> add "install_welcome_desc": "AdGuard Home is een netwerk DNS-server die advertenties en trackers blokkeert. Het doel is om jou controle te geven over je gehele netwerk en al je apparaten, en er hoeft geen client-side programma te worden gebruikt.", </s> remove "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in uw AdGuard Home-serveradressen.",
</s> add "install_devices_android_list_5": "Wijzig de DNS 1-waarden en DNS 2-waarden in jouw AdGuard Home server adressen.", </s> remove "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer uw AdGuard Home-serveradressen in.",
</s> add "install_devices_macos_list_4": "Selecteer het tabblad DNS en voer jouw AdGuard Home server adressen in.", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | client/src/__locales/nl.json |
"version": "0.2.0", | <mask> {
<mask> "name": "translations",
<mask> "version": "0.1.0",
<mask> "lockfileVersion": 1,
<mask> "requires": true,
<mask> "dependencies": {
<mask> "ajv": {
<mask> "version": "6.5.5",
</s> Pull request: client: upd locales
Merge in DNS/adguard-home from upd-locales to master
Updates #2643.
Squashed commit of the following:
commit 5a1e04c252b7cf0091f4471f278de49d885bf05a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 5 18:42:32 2021 +0300
client: upd locales </s> remove "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
</s> add "fastest_addr_desc": "Alle DNS-servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS-servers, maar verbetert wel de connectiviteit.",
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home jouw systeem om de AdGuard Home DNS-server te gebruiken.", </s> remove "dns_over_quic": "DNS-over-QUIC",
"client_id": "Client ID",
"client_id_placeholder": "Enter client ID",
"client_id_desc": "Different clients can be identified by a special client ID. <a>Here</a> you can learn more about how to identify clients.",
</s> add </s> remove "download_mobileconfig": "Download configuration file",
</s> add </s> remove "rule_label": "Rule(s)",
</s> add "rule_label": "Rule", </s> remove "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate or wildcard certificate. If the field is not set, it will accept TLS connections for any domain.",
</s> add "encryption_server_desc": "In order to use HTTPS, you need to enter the server name that matches your SSL certificate.", | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dd64d19c3d61179186df5a9c89dc5e8d89ad93da | scripts/translations/package-lock.json |
className={classNames('form-control form-control--search form-control--transparent', className)} | <mask> id={FORM_NAMES.search}
<mask> name={FORM_NAMES.search}
<mask> component={renderFilterField}
<mask> type="text"
<mask> className={classNames('form-control--search form-control--transparent', className)}
<mask> placeholder={t('domain_or_client')}
<mask> tooltip={t('query_log_strict_search')}
<mask> onClearInputClick={onInputClear}
<mask> onKeyDown={onEnterPress}
<mask> normalizeOnBlur={normalizeOnBlur}
</s> Pull request: 5249 fix search input outline
Updates #5249
Squashed commit of the following:
commit f1a16e79073d0b887a1c27becab0aeb039d7268b
Merge: b752c58e 0c03063c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Dec 21 17:06:59 2022 +0300
Merge branch 'master' into 5249-outline
commit b752c58e0a79815d22853cd85419ffa64f38f530
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Dec 21 12:34:15 2022 +0300
fix input borders
commit 1c7d5da85a30ba951b6ad0a0b8e70780309686fa
Merge: 40fb0273 0ddd8e3d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Dec 21 12:27:25 2022 +0300
Merge branch 'master' into 5249-outline
commit 40fb02734de1a525681d54295600897088c02ac9
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 20 13:29:15 2022 +0300
5249 fix search input outline </s> remove border: 0 solid transparent !important;
</s> add </s> remove box-shadow: 0 1px 0 #ddd;
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/defde7d0fe00680cdf6343adca81b34796b7d78d | client/src/components/Logs/Filters/Form.js |
<mask> padding: 0.5rem 0.75rem 0.5rem 2rem !important;
<mask> }
<mask>
<mask> .form-control--search {
<mask> box-shadow: 0 1px 0 #ddd;
<mask> padding: 0 2.5rem;
<mask> height: 2.25rem;
<mask> flex-grow: 1;
<mask> }
<mask>
</s> Pull request: 5249 fix search input outline
Updates #5249
Squashed commit of the following:
commit f1a16e79073d0b887a1c27becab0aeb039d7268b
Merge: b752c58e 0c03063c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Dec 21 17:06:59 2022 +0300
Merge branch 'master' into 5249-outline
commit b752c58e0a79815d22853cd85419ffa64f38f530
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Dec 21 12:34:15 2022 +0300
fix input borders
commit 1c7d5da85a30ba951b6ad0a0b8e70780309686fa
Merge: 40fb0273 0ddd8e3d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Dec 21 12:27:25 2022 +0300
Merge branch 'master' into 5249-outline
commit 40fb02734de1a525681d54295600897088c02ac9
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 20 13:29:15 2022 +0300
5249 fix search input outline </s> remove border: 0 solid transparent !important;
</s> add </s> remove className={classNames('form-control--search form-control--transparent', className)}
</s> add className={classNames('form-control form-control--search form-control--transparent', className)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/defde7d0fe00680cdf6343adca81b34796b7d78d | client/src/components/Logs/Logs.css | |
<mask> flex-grow: 1;
<mask> }
<mask>
<mask> .form-control--transparent {
<mask> border: 0 solid transparent !important;
<mask> background-color: transparent !important;
<mask> }
<mask>
<mask> .input-group-search {
<mask> background-color: transparent;
</s> Pull request: 5249 fix search input outline
Updates #5249
Squashed commit of the following:
commit f1a16e79073d0b887a1c27becab0aeb039d7268b
Merge: b752c58e 0c03063c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Dec 21 17:06:59 2022 +0300
Merge branch 'master' into 5249-outline
commit b752c58e0a79815d22853cd85419ffa64f38f530
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Dec 21 12:34:15 2022 +0300
fix input borders
commit 1c7d5da85a30ba951b6ad0a0b8e70780309686fa
Merge: 40fb0273 0ddd8e3d
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Dec 21 12:27:25 2022 +0300
Merge branch 'master' into 5249-outline
commit 40fb02734de1a525681d54295600897088c02ac9
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 20 13:29:15 2022 +0300
5249 fix search input outline </s> remove box-shadow: 0 1px 0 #ddd;
</s> add </s> remove className={classNames('form-control--search form-control--transparent', className)}
</s> add className={classNames('form-control form-control--search form-control--transparent', className)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/defde7d0fe00680cdf6343adca81b34796b7d78d | client/src/components/Logs/Logs.css | |
this.getAllStats();
}
getAllStats = () => { | <mask> import Loading from '../ui/Loading';
<mask>
<mask> class Dashboard extends Component {
<mask> componentDidMount() {
<mask> this.props.getStats();
<mask> this.props.getStatsHistory();
<mask> this.props.getTopStats();
<mask> };
</s> Add refresh button to querylog page
Closes #331 </s> remove }
</s> add }; </s> remove // get logs on initialization if queryLogIsEnabled
if (this.props.dashboard.queryLogEnabled) {
this.props.getLogs();
}
</s> add this.getLogs(); </s> remove <button
className="btn btn-primary btn-standart"
type="submit"
onClick={this.handleDownloadButton}
>Download log file</button> }
</s> add <button
className="btn btn-primary btn-standart mr-2"
type="submit"
onClick={this.handleDownloadButton}
>Download log file</button>
}
{queryLogEnabled &&
<button
className="btn btn-outline-primary btn-standart"
type="submit"
onClick={this.getLogs}
>Refresh</button>
} </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.componentDidMount()}>Refresh statistics</button>;
const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.componentDidMount()}></button>;
</s> add const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}>Refresh statistics</button>;
const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.getAllStats()} />; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df12038f33b7acf6a3e9329054f1b5ad4cb02cd8 | client/src/components/Dashboard/index.js |
}; | <mask> componentDidMount() {
<mask> this.props.getStats();
<mask> this.props.getStatsHistory();
<mask> this.props.getTopStats();
<mask> }
<mask>
<mask> render() {
<mask> const { dashboard } = this.props;
<mask> const dashboardProcessing =
<mask> dashboard.processing ||
</s> Add refresh button to querylog page
Closes #331 </s> remove <button
className="btn btn-primary btn-standart"
type="submit"
onClick={this.handleDownloadButton}
>Download log file</button> }
</s> add <button
className="btn btn-primary btn-standart mr-2"
type="submit"
onClick={this.handleDownloadButton}
>Download log file</button>
}
{queryLogEnabled &&
<button
className="btn btn-outline-primary btn-standart"
type="submit"
onClick={this.getLogs}
>Refresh</button>
} </s> remove // get logs on initialization if queryLogIsEnabled
if (this.props.dashboard.queryLogEnabled) {
this.props.getLogs();
}
</s> add this.getLogs(); </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.componentDidMount()}>Refresh statistics</button>;
const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.componentDidMount()}></button>;
</s> add const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}>Refresh statistics</button>;
const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.getAllStats()} />; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df12038f33b7acf6a3e9329054f1b5ad4cb02cd8 | client/src/components/Dashboard/index.js |
const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}>Refresh statistics</button>;
const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.getAllStats()} />; | <mask> dashboard.processingStats ||
<mask> dashboard.processingStatsHistory ||
<mask> dashboard.processingTopStats;
<mask>
<mask> const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.componentDidMount()}>Refresh statistics</button>;
<mask> const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.componentDidMount()}></button>;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title="Dashboard">
<mask> <div className="page-title__actions">
</s> Add refresh button to querylog page
Closes #331 </s> remove <button
className="btn btn-primary btn-standart"
type="submit"
onClick={this.handleDownloadButton}
>Download log file</button> }
</s> add <button
className="btn btn-primary btn-standart mr-2"
type="submit"
onClick={this.handleDownloadButton}
>Download log file</button>
}
{queryLogEnabled &&
<button
className="btn btn-outline-primary btn-standart"
type="submit"
onClick={this.getLogs}
>Refresh</button>
} </s> remove }
</s> add }; </s> remove // get logs on initialization if queryLogIsEnabled
if (this.props.dashboard.queryLogEnabled) {
this.props.getLogs();
}
</s> add this.getLogs(); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df12038f33b7acf6a3e9329054f1b5ad4cb02cd8 | client/src/components/Dashboard/index.js |
this.getLogs(); | <mask> const DOWNLOAD_LOG_FILENAME = 'dns-logs.txt';
<mask>
<mask> class Logs extends Component {
<mask> componentDidMount() {
<mask> // get logs on initialization if queryLogIsEnabled
<mask> if (this.props.dashboard.queryLogEnabled) {
<mask> this.props.getLogs();
<mask> }
<mask> }
<mask>
<mask> componentDidUpdate(prevProps) {
<mask> // get logs when queryLog becomes enabled
<mask> if (this.props.dashboard.queryLogEnabled && !prevProps.dashboard.queryLogEnabled) {
</s> Add refresh button to querylog page
Closes #331 </s> remove }
</s> add }; </s> remove <button
className="btn btn-primary btn-standart"
type="submit"
onClick={this.handleDownloadButton}
>Download log file</button> }
</s> add <button
className="btn btn-primary btn-standart mr-2"
type="submit"
onClick={this.handleDownloadButton}
>Download log file</button>
}
{queryLogEnabled &&
<button
className="btn btn-outline-primary btn-standart"
type="submit"
onClick={this.getLogs}
>Refresh</button>
} </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.componentDidMount()}>Refresh statistics</button>;
const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.componentDidMount()}></button>;
</s> add const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}>Refresh statistics</button>;
const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.getAllStats()} />; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df12038f33b7acf6a3e9329054f1b5ad4cb02cd8 | client/src/components/Logs/index.js |
getLogs = () => {
// get logs on initialization if queryLogIsEnabled
if (this.props.dashboard.queryLogEnabled) {
this.props.getLogs();
}
}
| <mask> }
<mask> }
<mask>
<mask> renderTooltip(isFiltered, rule) {
<mask> if (rule) {
<mask> return (isFiltered && <Tooltip text={rule}/>);
<mask> }
</s> Add refresh button to querylog page
Closes #331 </s> remove // get logs on initialization if queryLogIsEnabled
if (this.props.dashboard.queryLogEnabled) {
this.props.getLogs();
}
</s> add this.getLogs(); </s> remove }
</s> add }; </s> remove <button
className="btn btn-primary btn-standart"
type="submit"
onClick={this.handleDownloadButton}
>Download log file</button> }
</s> add <button
className="btn btn-primary btn-standart mr-2"
type="submit"
onClick={this.handleDownloadButton}
>Download log file</button>
}
{queryLogEnabled &&
<button
className="btn btn-outline-primary btn-standart"
type="submit"
onClick={this.getLogs}
>Refresh</button>
} </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.componentDidMount()}>Refresh statistics</button>;
const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.componentDidMount()}></button>;
</s> add const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}>Refresh statistics</button>;
const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.getAllStats()} />; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df12038f33b7acf6a3e9329054f1b5ad4cb02cd8 | client/src/components/Logs/index.js |
<button
className="btn btn-primary btn-standart mr-2"
type="submit"
onClick={this.handleDownloadButton}
>Download log file</button>
}
{queryLogEnabled &&
<button
className="btn btn-outline-primary btn-standart"
type="submit"
onClick={this.getLogs}
>Refresh</button>
} | <mask> type="submit"
<mask> onClick={() => this.props.toggleLogStatus(queryLogEnabled)}
<mask> >{queryLogEnabled ? 'Disable log' : 'Enable log'}</button>
<mask> {queryLogEnabled &&
<mask> <button
<mask> className="btn btn-primary btn-standart"
<mask> type="submit"
<mask> onClick={this.handleDownloadButton}
<mask> >Download log file</button> }
<mask> </div>);
<mask> }
<mask>
<mask> render() {
<mask> const { queryLogs, dashboard } = this.props;
</s> Add refresh button to querylog page
Closes #331 </s> remove }
</s> add }; </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.componentDidMount()}>Refresh statistics</button>;
const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.componentDidMount()}></button>;
</s> add const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}>Refresh statistics</button>;
const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.getAllStats()} />; </s> remove // get logs on initialization if queryLogIsEnabled
if (this.props.dashboard.queryLogEnabled) {
this.props.getLogs();
}
</s> add this.getLogs(); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df12038f33b7acf6a3e9329054f1b5ad4cb02cd8 | client/src/components/Logs/index.js |
test: test-js test-go
test-js: | <mask> lint-go:
<mask> @echo Running go linter
<mask> golangci-lint run
<mask>
<mask> test:
<mask> @echo Running JS unit-tests
<mask> npm run test --prefix client
<mask> @echo Running Go unit-tests
<mask> go test $(TEST_FLAGS) -v -coverprofile=coverage.txt -covermode=atomic ./...
<mask>
<mask> ci: client_with_deps
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove @echo Running Go unit-tests
</s> add test-go: </s> remove github.com/AdguardTeam/dnsproxy v0.32.6
</s> add github.com/AdguardTeam/dnsproxy v0.33.0 </s> remove ClientProto string // Protocol for the client connection: "" (plain), "doh", "dot"
</s> add ClientProto ClientProto </s> remove if d.Proto == "https" {
p.ClientProto = "doh"
} else if d.Proto == "tls" {
p.ClientProto = "dot"
</s> add switch d.Proto {
case proxy.ProtoHTTPS:
p.ClientProto = querylog.ClientProtoDOH
case proxy.ProtoQUIC:
p.ClientProto = querylog.ClientProtoDOQ
case proxy.ProtoTLS:
p.ClientProto = querylog.ClientProtoDOT
default:
// Consider this a plain DNS-over-UDP or DNS-over-TCL
// request. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | Makefile |
test-go: | <mask>
<mask> test:
<mask> @echo Running JS unit-tests
<mask> npm run test --prefix client
<mask> @echo Running Go unit-tests
<mask> go test $(TEST_FLAGS) -v -coverprofile=coverage.txt -covermode=atomic ./...
<mask>
<mask> ci: client_with_deps
<mask> go mod download
<mask> $(MAKE) test
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove test:
@echo Running JS unit-tests
</s> add test: test-js test-go
test-js: </s> remove github.com/AdguardTeam/dnsproxy v0.32.6
</s> add github.com/AdguardTeam/dnsproxy v0.33.0 </s> remove ClientProto string // Protocol for the client connection: "" (plain), "doh", "dot"
</s> add ClientProto ClientProto </s> remove if d.Proto == "https" {
p.ClientProto = "doh"
} else if d.Proto == "tls" {
p.ClientProto = "dot"
</s> add switch d.Proto {
case proxy.ProtoHTTPS:
p.ClientProto = querylog.ClientProtoDOH
case proxy.ProtoQUIC:
p.ClientProto = querylog.ClientProtoDOQ
case proxy.ProtoTLS:
p.ClientProto = querylog.ClientProtoDOT
default:
// Consider this a plain DNS-over-UDP or DNS-over-TCL
// request. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | Makefile |
github.com/AdguardTeam/dnsproxy v0.33.0 | <mask>
<mask> go 1.14
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.32.6
<mask> github.com/AdguardTeam/golibs v0.4.2
<mask> github.com/AdguardTeam/urlfilter v0.12.3
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
<mask> github.com/fsnotify/fsnotify v1.4.9
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove github.com/AdguardTeam/dnsproxy v0.32.6 h1:HCKQFUvyvIP3lrJxP8t8+mE/DJwLk2HDmzI/af5PUu4=
github.com/AdguardTeam/dnsproxy v0.32.6/go.mod h1:ZLDrKIypYxBDz2N9FQHgeehuHrwTbuhZXdGwNySshbw=
</s> add github.com/AdguardTeam/dnsproxy v0.33.0 h1:bYNf20QgvkclPm+w5YSakFQbrrlcD3MpUwkQPLMwhwU=
github.com/AdguardTeam/dnsproxy v0.33.0/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect </s> remove github.com/miekg/dns v1.1.31
</s> add github.com/miekg/dns v1.1.35
github.com/rogpeppe/go-internal v1.5.2 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.mod |
<mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714
<mask> github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8
<mask> github.com/joomcode/errorx v1.0.3
<mask> github.com/kardianos/service v1.1.0
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.1 // indirect
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
<mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065
<mask> github.com/miekg/dns v1.1.31
<mask> github.com/satori/go.uuid v1.2.0
<mask> github.com/sirupsen/logrus v1.6.0 // indirect
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove github.com/miekg/dns v1.1.31
</s> add github.com/miekg/dns v1.1.35
github.com/rogpeppe/go-internal v1.5.2 // indirect </s> remove github.com/stretchr/testify v1.5.1
</s> add github.com/stretchr/testify v1.6.1 </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect </s> remove github.com/miekg/dns v1.1.31 h1:sJFOl9BgwbYAWOGEwr61FU28pqsBNdpRBnhGXtO06Oo=
github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
</s> add github.com/miekg/dns v1.1.34/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs=
github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.mod | |
github.com/miekg/dns v1.1.35
github.com/rogpeppe/go-internal v1.5.2 // indirect | <mask> github.com/kardianos/service v1.1.0
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.1 // indirect
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
<mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065
<mask> github.com/miekg/dns v1.1.31
<mask> github.com/satori/go.uuid v1.2.0
<mask> github.com/sirupsen/logrus v1.6.0 // indirect
<mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c
<mask> github.com/stretchr/testify v1.5.1
<mask> github.com/u-root/u-root v6.0.0+incompatible
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.1 // indirect
</s> add </s> remove github.com/stretchr/testify v1.5.1
</s> add github.com/stretchr/testify v1.6.1 </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect </s> remove github.com/miekg/dns v1.1.31 h1:sJFOl9BgwbYAWOGEwr61FU28pqsBNdpRBnhGXtO06Oo=
github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
</s> add github.com/miekg/dns v1.1.34/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs=
github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.mod |
github.com/stretchr/testify v1.6.1 | <mask> github.com/miekg/dns v1.1.31
<mask> github.com/satori/go.uuid v1.2.0
<mask> github.com/sirupsen/logrus v1.6.0 // indirect
<mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c
<mask> github.com/stretchr/testify v1.5.1
<mask> github.com/u-root/u-root v6.0.0+incompatible
<mask> go.etcd.io/bbolt v1.3.4
<mask> golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
<mask> golang.org/x/net v0.0.0-20200904194848-62affa334b73
<mask> golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect </s> remove github.com/miekg/dns v1.1.31
</s> add github.com/miekg/dns v1.1.35
github.com/rogpeppe/go-internal v1.5.2 // indirect </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.1 // indirect
</s> add </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM=
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E=
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.mod |
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect | <mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c
<mask> github.com/stretchr/testify v1.5.1
<mask> github.com/u-root/u-root v6.0.0+incompatible
<mask> go.etcd.io/bbolt v1.3.4
<mask> golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
<mask> golang.org/x/net v0.0.0-20200904194848-62affa334b73
<mask> golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
<mask> golang.org/x/text v0.3.3 // indirect
<mask> google.golang.org/protobuf v1.25.0 // indirect
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0
<mask> gopkg.in/yaml.v2 v2.3.0
<mask> howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5
<mask> )
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove github.com/stretchr/testify v1.5.1
</s> add github.com/stretchr/testify v1.6.1 </s> remove github.com/miekg/dns v1.1.31
</s> add github.com/miekg/dns v1.1.35
github.com/rogpeppe/go-internal v1.5.2 // indirect </s> remove golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20 h1:4X356008q5SA3YXu8PiRap39KFmy4Lf6sGlceJKZQsU=
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.mod |
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect | <mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0
<mask> gopkg.in/yaml.v2 v2.3.0
<mask> howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5
<mask> )
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect </s> remove "github.com/AdguardTeam/AdGuardHome/internal/querylog"
"github.com/miekg/dns"
</s> add | [
"keep",
"add",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.mod |
github.com/AdguardTeam/dnsproxy v0.33.0 h1:bYNf20QgvkclPm+w5YSakFQbrrlcD3MpUwkQPLMwhwU=
github.com/AdguardTeam/dnsproxy v0.33.0/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= | <mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
<mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
<mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
<mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
<mask> github.com/AdguardTeam/dnsproxy v0.32.6 h1:HCKQFUvyvIP3lrJxP8t8+mE/DJwLk2HDmzI/af5PUu4=
<mask> github.com/AdguardTeam/dnsproxy v0.32.6/go.mod h1:ZLDrKIypYxBDz2N9FQHgeehuHrwTbuhZXdGwNySshbw=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2 h1:7M28oTZFoFwNmp8eGPb3ImmYbxGaJLyQXeIFVHjME0o=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
<mask> github.com/AdguardTeam/urlfilter v0.12.3 h1:FMjQG0eTgrr8xA3z2zaLVcCgGdpzoECPGWwgPjtwPNs=
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove github.com/AdguardTeam/dnsproxy v0.32.6
</s> add github.com/AdguardTeam/dnsproxy v0.33.0 </s> remove github.com/lucas-clemente/quic-go v0.18.0 h1:JhQDdqxdwdmGdKsKgXi1+coHRoGhvU6z0rNzOJqZ/4o=
github.com/lucas-clemente/quic-go v0.18.0/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXqzHSOcJrM5ITUlCg=
</s> add github.com/lucas-clemente/quic-go v0.18.1 h1:DMR7guC0NtVS8zNZR3IO7NARZvZygkSC56GGtC6cyys=
github.com/lucas-clemente/quic-go v0.18.1/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXqzHSOcJrM5ITUlCg= </s> remove github.com/ameshkov/dnscrypt v1.1.0 h1:2vAt5dD6ZmqlAxEAfzRcLBnkvdf8NI46Kn9InSwQbSI=
github.com/ameshkov/dnscrypt v1.1.0/go.mod h1:ikduAxNLCTEfd1AaCgpIA5TgroIVQ8JY3Vb095fiFJg=
</s> add github.com/ameshkov/dnscrypt/v2 v2.0.0 h1:i83G8MeGLrAFgUL8GSu98TVhtFDEifF7SIS7Qi/RZ3U=
github.com/ameshkov/dnscrypt/v2 v2.0.0/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.sum |
github.com/ameshkov/dnscrypt/v2 v2.0.0 h1:i83G8MeGLrAFgUL8GSu98TVhtFDEifF7SIS7Qi/RZ3U=
github.com/ameshkov/dnscrypt/v2 v2.0.0/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI= | <mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
<mask> github.com/ameshkov/dnscrypt v1.1.0 h1:2vAt5dD6ZmqlAxEAfzRcLBnkvdf8NI46Kn9InSwQbSI=
<mask> github.com/ameshkov/dnscrypt v1.1.0/go.mod h1:ikduAxNLCTEfd1AaCgpIA5TgroIVQ8JY3Vb095fiFJg=
<mask> github.com/ameshkov/dnsstamps v1.0.1 h1:LhGvgWDzhNJh+kBQd/AfUlq1vfVe109huiXw4JhnPug=
<mask> github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
<mask> github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
<mask> github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
<mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6 h1:KXlsf+qt/X5ttPGEjR0tPH1xaWWoKBEg9Q1THAj2h3I=
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove github.com/miekg/dns v1.1.31 h1:sJFOl9BgwbYAWOGEwr61FU28pqsBNdpRBnhGXtO06Oo=
github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
</s> add github.com/miekg/dns v1.1.34/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs=
github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= </s> remove github.com/AdguardTeam/dnsproxy v0.32.6
</s> add github.com/AdguardTeam/dnsproxy v0.33.0 </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.1 // indirect
</s> add </s> remove github.com/miekg/dns v1.1.31
</s> add github.com/miekg/dns v1.1.35
github.com/rogpeppe/go-internal v1.5.2 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.sum |
github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo=
github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A= | <mask> github.com/ameshkov/dnscrypt/v2 v2.0.0/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI=
<mask> github.com/ameshkov/dnsstamps v1.0.1 h1:LhGvgWDzhNJh+kBQd/AfUlq1vfVe109huiXw4JhnPug=
<mask> github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
<mask> github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
<mask> github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
<mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6 h1:KXlsf+qt/X5ttPGEjR0tPH1xaWWoKBEg9Q1THAj2h3I=
<mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA=
<mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 h1:M57m0xQqZIhx7CEJgeLSvRFKEK1RjzRuIXiA3HfYU7g=
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove github.com/ameshkov/dnscrypt v1.1.0 h1:2vAt5dD6ZmqlAxEAfzRcLBnkvdf8NI46Kn9InSwQbSI=
github.com/ameshkov/dnscrypt v1.1.0/go.mod h1:ikduAxNLCTEfd1AaCgpIA5TgroIVQ8JY3Vb095fiFJg=
</s> add github.com/ameshkov/dnscrypt/v2 v2.0.0 h1:i83G8MeGLrAFgUL8GSu98TVhtFDEifF7SIS7Qi/RZ3U=
github.com/ameshkov/dnscrypt/v2 v2.0.0/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI= </s> remove github.com/AdguardTeam/dnsproxy v0.32.6
</s> add github.com/AdguardTeam/dnsproxy v0.33.0 </s> remove github.com/miekg/dns v1.1.31 h1:sJFOl9BgwbYAWOGEwr61FU28pqsBNdpRBnhGXtO06Oo=
github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
</s> add github.com/miekg/dns v1.1.34/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs=
github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= </s> remove ClientProto string // Protocol for the client connection: "" (plain), "doh", "dot"
</s> add ClientProto ClientProto | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.sum |
github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= | <mask> github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
<mask> github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
<mask> github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
<mask> github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
<mask> github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
<mask> github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
<mask> github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
<mask> github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove github.com/lucas-clemente/quic-go v0.18.0 h1:JhQDdqxdwdmGdKsKgXi1+coHRoGhvU6z0rNzOJqZ/4o=
github.com/lucas-clemente/quic-go v0.18.0/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXqzHSOcJrM5ITUlCg=
</s> add github.com/lucas-clemente/quic-go v0.18.1 h1:DMR7guC0NtVS8zNZR3IO7NARZvZygkSC56GGtC6cyys=
github.com/lucas-clemente/quic-go v0.18.1/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXqzHSOcJrM5ITUlCg= </s> remove golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20 h1:4X356008q5SA3YXu8PiRap39KFmy4Lf6sGlceJKZQsU=
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove github.com/AdguardTeam/dnsproxy v0.32.6 h1:HCKQFUvyvIP3lrJxP8t8+mE/DJwLk2HDmzI/af5PUu4=
github.com/AdguardTeam/dnsproxy v0.32.6/go.mod h1:ZLDrKIypYxBDz2N9FQHgeehuHrwTbuhZXdGwNySshbw=
</s> add github.com/AdguardTeam/dnsproxy v0.33.0 h1:bYNf20QgvkclPm+w5YSakFQbrrlcD3MpUwkQPLMwhwU=
github.com/AdguardTeam/dnsproxy v0.33.0/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= </s> remove github.com/ameshkov/dnscrypt v1.1.0 h1:2vAt5dD6ZmqlAxEAfzRcLBnkvdf8NI46Kn9InSwQbSI=
github.com/ameshkov/dnscrypt v1.1.0/go.mod h1:ikduAxNLCTEfd1AaCgpIA5TgroIVQ8JY3Vb095fiFJg=
</s> add github.com/ameshkov/dnscrypt/v2 v2.0.0 h1:i83G8MeGLrAFgUL8GSu98TVhtFDEifF7SIS7Qi/RZ3U=
github.com/ameshkov/dnscrypt/v2 v2.0.0/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI= | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.sum |
github.com/lucas-clemente/quic-go v0.18.1 h1:DMR7guC0NtVS8zNZR3IO7NARZvZygkSC56GGtC6cyys=
github.com/lucas-clemente/quic-go v0.18.1/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXqzHSOcJrM5ITUlCg= | <mask> github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
<mask> github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
<mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
<mask> github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
<mask> github.com/lucas-clemente/quic-go v0.18.0 h1:JhQDdqxdwdmGdKsKgXi1+coHRoGhvU6z0rNzOJqZ/4o=
<mask> github.com/lucas-clemente/quic-go v0.18.0/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXqzHSOcJrM5ITUlCg=
<mask> github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
<mask> github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
<mask> github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
<mask> github.com/marten-seemann/qpack v0.2.0/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
<mask> github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove github.com/AdguardTeam/dnsproxy v0.32.6 h1:HCKQFUvyvIP3lrJxP8t8+mE/DJwLk2HDmzI/af5PUu4=
github.com/AdguardTeam/dnsproxy v0.32.6/go.mod h1:ZLDrKIypYxBDz2N9FQHgeehuHrwTbuhZXdGwNySshbw=
</s> add github.com/AdguardTeam/dnsproxy v0.33.0 h1:bYNf20QgvkclPm+w5YSakFQbrrlcD3MpUwkQPLMwhwU=
github.com/AdguardTeam/dnsproxy v0.33.0/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= </s> remove github.com/ameshkov/dnscrypt v1.1.0 h1:2vAt5dD6ZmqlAxEAfzRcLBnkvdf8NI46Kn9InSwQbSI=
github.com/ameshkov/dnscrypt v1.1.0/go.mod h1:ikduAxNLCTEfd1AaCgpIA5TgroIVQ8JY3Vb095fiFJg=
</s> add github.com/ameshkov/dnscrypt/v2 v2.0.0 h1:i83G8MeGLrAFgUL8GSu98TVhtFDEifF7SIS7Qi/RZ3U=
github.com/ameshkov/dnscrypt/v2 v2.0.0/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.sum |
github.com/miekg/dns v1.1.34/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs=
github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= | <mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
<mask> github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
<mask> github.com/miekg/dns v1.1.29 h1:xHBEhR+t5RzcFJjBLJlax2daXOrTYtr9z4WdKEfWFzg=
<mask> github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
<mask> github.com/miekg/dns v1.1.31 h1:sJFOl9BgwbYAWOGEwr61FU28pqsBNdpRBnhGXtO06Oo=
<mask> github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
<mask> github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
<mask> github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
<mask> github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
<mask> github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
<mask> github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove github.com/miekg/dns v1.1.31
</s> add github.com/miekg/dns v1.1.35
github.com/rogpeppe/go-internal v1.5.2 // indirect </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.1 // indirect
</s> add </s> remove github.com/stretchr/testify v1.5.1
</s> add github.com/stretchr/testify v1.6.1 </s> remove github.com/ameshkov/dnscrypt v1.1.0 h1:2vAt5dD6ZmqlAxEAfzRcLBnkvdf8NI46Kn9InSwQbSI=
github.com/ameshkov/dnscrypt v1.1.0/go.mod h1:ikduAxNLCTEfd1AaCgpIA5TgroIVQ8JY3Vb095fiFJg=
</s> add github.com/ameshkov/dnscrypt/v2 v2.0.0 h1:i83G8MeGLrAFgUL8GSu98TVhtFDEifF7SIS7Qi/RZ3U=
github.com/ameshkov/dnscrypt/v2 v2.0.0/go.mod h1:nbZnxJt4edIPx2Haa8n2XtC2g5AWcsdQiSuXkNH8eDI= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.sum |
github.com/rogpeppe/go-internal v1.5.2 h1:qLvObTrvO/XRCqmkKxUlOBc48bI3efyDuAZe25QiF0w=
github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= | <mask> github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
<mask> github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
<mask> github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk=
<mask> github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
<mask> github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
<mask> github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
<mask> github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
<mask> github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
<mask> github.com/shirou/gopsutil v2.20.3+incompatible h1:0JVooMPsT7A7HqEYdydp/OfjSOYSjhXV7w1hkKj/NPQ=
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove github.com/miekg/dns v1.1.31
</s> add github.com/miekg/dns v1.1.35
github.com/rogpeppe/go-internal v1.5.2 // indirect </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.1 // indirect
</s> add </s> remove github.com/stretchr/testify v1.5.1
</s> add github.com/stretchr/testify v1.6.1 </s> remove github.com/lucas-clemente/quic-go v0.18.0 h1:JhQDdqxdwdmGdKsKgXi1+coHRoGhvU6z0rNzOJqZ/4o=
github.com/lucas-clemente/quic-go v0.18.0/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXqzHSOcJrM5ITUlCg=
</s> add github.com/lucas-clemente/quic-go v0.18.1 h1:DMR7guC0NtVS8zNZR3IO7NARZvZygkSC56GGtC6cyys=
github.com/lucas-clemente/quic-go v0.18.1/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXqzHSOcJrM5ITUlCg= | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.sum |
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= | <mask> github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
<mask> github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
<mask> github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
<mask> github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
<mask> github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
<mask> github.com/u-root/u-root v6.0.0+incompatible h1:YqPGmRoRyYmeg17KIWFRSyVq6LX5T6GSzawyA6wG6EE=
<mask> github.com/u-root/u-root v6.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
<mask> github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove github.com/stretchr/testify v1.5.1
</s> add github.com/stretchr/testify v1.6.1 </s> remove github.com/miekg/dns v1.1.31
</s> add github.com/miekg/dns v1.1.35
github.com/rogpeppe/go-internal v1.5.2 // indirect </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.sum |
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E=
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | <mask> golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM=
<mask> golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
<mask> golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
<mask> golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
<mask> golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
<mask> golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect </s> remove github.com/stretchr/testify v1.5.1
</s> add github.com/stretchr/testify v1.6.1 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.sum |
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0= | <mask> golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
<mask> golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
<mask> golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
<mask> golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
<mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
<mask> golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM=
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E=
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= </s> remove golang.org/x/net v0.0.0-20200904194848-62affa334b73 h1:MXfv8rhZWmFeqX3GNZRsd6vOLoaCHjYEX3qkRo3YBUA=
golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
</s> add golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 h1:42cLlJJdEh+ySyeUUbEQ5bsTiq8voBeTuweGVkY6Puw=
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect </s> remove github.com/stretchr/testify v1.5.1
</s> add github.com/stretchr/testify v1.6.1 </s> remove github.com/AdguardTeam/dnsproxy v0.32.6
</s> add github.com/AdguardTeam/dnsproxy v0.33.0 | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.sum |
golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 h1:42cLlJJdEh+ySyeUUbEQ5bsTiq8voBeTuweGVkY6Puw=
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | <mask> golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
<mask> golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
<mask> golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
<mask> golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20200904194848-62affa334b73 h1:MXfv8rhZWmFeqX3GNZRsd6vOLoaCHjYEX3qkRo3YBUA=
<mask> golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
<mask> golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
<mask> golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
<mask> golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
<mask> golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect </s> remove github.com/stretchr/testify v1.5.1
</s> add github.com/stretchr/testify v1.6.1 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.sum |
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | <mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o=
<mask> golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20 h1:4X356008q5SA3YXu8PiRap39KFmy4Lf6sGlceJKZQsU=
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect </s> remove github.com/stretchr/testify v1.5.1
</s> add github.com/stretchr/testify v1.6.1 </s> remove ClientProto string // Protocol for the client connection: "" (plain), "doh", "dot"
</s> add ClientProto ClientProto | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.sum |
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20200331124033-c3d80250170d h1:nc5K6ox/4lTFbMVSL9WRR81ixkcwXThoiF6yf+R9scA=
<mask> golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4=
<mask> golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20 h1:4X356008q5SA3YXu8PiRap39KFmy4Lf6sGlceJKZQsU=
<mask> golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect </s> remove github.com/stretchr/testify v1.5.1
</s> add github.com/stretchr/testify v1.6.1 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.sum |
golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | <mask> golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
<mask> golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
<mask> golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
<mask> golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20 h1:4X356008q5SA3YXu8PiRap39KFmy4Lf6sGlceJKZQsU=
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect </s> remove ClientProto string // Protocol for the client connection: "" (plain), "doh", "dot"
</s> add ClientProto ClientProto | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.sum |
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | <mask> golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
<mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
<mask> golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
<mask> google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
<mask> google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=
<mask> google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
<mask> google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
<mask> google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect </s> remove github.com/lucas-clemente/quic-go v0.18.0 h1:JhQDdqxdwdmGdKsKgXi1+coHRoGhvU6z0rNzOJqZ/4o=
github.com/lucas-clemente/quic-go v0.18.0/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXqzHSOcJrM5ITUlCg=
</s> add github.com/lucas-clemente/quic-go v0.18.1 h1:DMR7guC0NtVS8zNZR3IO7NARZvZygkSC56GGtC6cyys=
github.com/lucas-clemente/quic-go v0.18.1/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXqzHSOcJrM5ITUlCg= | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.sum |
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c h1:grhR+C34yXImVGp7EzNk+DTIk+323eIUWOmEevy6bDo=
gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | <mask> gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
<mask> gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
<mask> honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
<mask> honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
<mask> honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
<mask> honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect </s> remove ClientProto string // Protocol for the client connection: "" (plain), "doh", "dot"
</s> add ClientProto ClientProto | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | go.sum |
invalidUpstreams := []string{
"1.2.3.4.5", | <mask> }
<mask> }
<mask>
<mask> func TestValidateUpstream(t *testing.T) {
<mask> invalidUpstreams := []string{"1.2.3.4.5",
<mask> "123.3.7m",
<mask> "htttps://google.com/dns-query",
<mask> "[/host.com]tls://dns.adguard.com",
<mask> "[host.ru]#",
<mask> }
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove validDefaultUpstreams := []string{"1.1.1.1",
</s> add validDefaultUpstreams := []string{
"1.1.1.1", </s> remove func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {
return
}
</s> add func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {} </s> remove validUpstreams := []string{"[/host.com/]1.1.1.1",
</s> add validUpstreams := []string{
"[/host.com/]1.1.1.1", </s> remove if d.Proto == "https" {
p.ClientProto = "doh"
} else if d.Proto == "tls" {
p.ClientProto = "dot"
</s> add switch d.Proto {
case proxy.ProtoHTTPS:
p.ClientProto = querylog.ClientProtoDOH
case proxy.ProtoQUIC:
p.ClientProto = querylog.ClientProtoDOQ
case proxy.ProtoTLS:
p.ClientProto = querylog.ClientProtoDOT
default:
// Consider this a plain DNS-over-UDP or DNS-over-TCL
// request. </s> remove ClientProto string // Protocol for the client connection: "" (plain), "doh", "dot"
</s> add ClientProto ClientProto | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | internal/dnsforward/dnsforward_test.go |
validDefaultUpstreams := []string{
"1.1.1.1", | <mask> "[/host.com]tls://dns.adguard.com",
<mask> "[host.ru]#",
<mask> }
<mask>
<mask> validDefaultUpstreams := []string{"1.1.1.1",
<mask> "tls://1.1.1.1",
<mask> "https://dns.adguard.com/dns-query",
<mask> "sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
<mask> }
<mask>
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove validUpstreams := []string{"[/host.com/]1.1.1.1",
</s> add validUpstreams := []string{
"[/host.com/]1.1.1.1", </s> remove invalidUpstreams := []string{"1.2.3.4.5",
</s> add invalidUpstreams := []string{
"1.2.3.4.5", </s> remove func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {
return
}
</s> add func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {} </s> remove if d.Proto == "https" {
p.ClientProto = "doh"
} else if d.Proto == "tls" {
p.ClientProto = "dot"
</s> add switch d.Proto {
case proxy.ProtoHTTPS:
p.ClientProto = querylog.ClientProtoDOH
case proxy.ProtoQUIC:
p.ClientProto = querylog.ClientProtoDOQ
case proxy.ProtoTLS:
p.ClientProto = querylog.ClientProtoDOT
default:
// Consider this a plain DNS-over-UDP or DNS-over-TCL
// request. </s> remove upstreamsSet = []string{"[/host.com/]1.1.1.1",
</s> add upstreamsSet = []string{
"[/host.com/]1.1.1.1", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | internal/dnsforward/dnsforward_test.go |
validUpstreams := []string{
"[/host.com/]1.1.1.1", | <mask> "https://dns.adguard.com/dns-query",
<mask> "sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
<mask> }
<mask>
<mask> validUpstreams := []string{"[/host.com/]1.1.1.1",
<mask> "[//]tls://1.1.1.1",
<mask> "[/www.host.com/]#",
<mask> "[/host.com/google.com/]8.8.8.8",
<mask> "[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
<mask> }
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove upstreamsSet = []string{"[/host.com/]1.1.1.1",
</s> add upstreamsSet = []string{
"[/host.com/]1.1.1.1", </s> remove validDefaultUpstreams := []string{"1.1.1.1",
</s> add validDefaultUpstreams := []string{
"1.1.1.1", </s> remove invalidUpstreams := []string{"1.2.3.4.5",
</s> add invalidUpstreams := []string{
"1.2.3.4.5", </s> remove func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {
return
}
</s> add func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {} </s> remove if d.Proto == "https" {
p.ClientProto = "doh"
} else if d.Proto == "tls" {
p.ClientProto = "dot"
</s> add switch d.Proto {
case proxy.ProtoHTTPS:
p.ClientProto = querylog.ClientProtoDOH
case proxy.ProtoQUIC:
p.ClientProto = querylog.ClientProtoDOQ
case proxy.ProtoTLS:
p.ClientProto = querylog.ClientProtoDOT
default:
// Consider this a plain DNS-over-UDP or DNS-over-TCL
// request. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | internal/dnsforward/dnsforward_test.go |
upstreamsSet = []string{
"[/host.com/]1.1.1.1", | <mask> err = ValidateUpstreams(upstreamsSet)
<mask> assert.Nil(t, err, "comments should not be validated")
<mask>
<mask> // Set of valid upstreams. There is no default upstream specified
<mask> upstreamsSet = []string{"[/host.com/]1.1.1.1",
<mask> "[//]tls://1.1.1.1",
<mask> "[/www.host.com/]#",
<mask> "[/host.com/google.com/]8.8.8.8",
<mask> "[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
<mask> }
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove validUpstreams := []string{"[/host.com/]1.1.1.1",
</s> add validUpstreams := []string{
"[/host.com/]1.1.1.1", </s> remove ent.ClientProto = v
</s> add ent.ClientProto, err = NewClientProto(v) </s> remove if d.Proto == "https" {
p.ClientProto = "doh"
} else if d.Proto == "tls" {
p.ClientProto = "dot"
</s> add switch d.Proto {
case proxy.ProtoHTTPS:
p.ClientProto = querylog.ClientProtoDOH
case proxy.ProtoQUIC:
p.ClientProto = querylog.ClientProtoDOQ
case proxy.ProtoTLS:
p.ClientProto = querylog.ClientProtoDOT
default:
// Consider this a plain DNS-over-UDP or DNS-over-TCL
// request. </s> remove func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {
return
}
</s> add func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {} </s> remove ClientProto string // Protocol for the client connection: "" (plain), "doh", "dot"
</s> add ClientProto ClientProto | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | internal/dnsforward/dnsforward_test.go |
func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {} | <mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> l.Hostname = "localhost"
<mask> return []dhcpd.Lease{l}
<mask> }
<mask> func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {
<mask> return
<mask> }
<mask>
<mask> func TestPTRResponseFromDHCPLeases(t *testing.T) {
<mask> dhcp := &testDHCP{}
<mask>
<mask> c := dnsfilter.Config{}
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove invalidUpstreams := []string{"1.2.3.4.5",
</s> add invalidUpstreams := []string{
"1.2.3.4.5", </s> remove if d.Proto == "https" {
p.ClientProto = "doh"
} else if d.Proto == "tls" {
p.ClientProto = "dot"
</s> add switch d.Proto {
case proxy.ProtoHTTPS:
p.ClientProto = querylog.ClientProtoDOH
case proxy.ProtoQUIC:
p.ClientProto = querylog.ClientProtoDOQ
case proxy.ProtoTLS:
p.ClientProto = querylog.ClientProtoDOT
default:
// Consider this a plain DNS-over-UDP or DNS-over-TCL
// request. </s> remove validDefaultUpstreams := []string{"1.1.1.1",
</s> add validDefaultUpstreams := []string{
"1.1.1.1", </s> remove validUpstreams := []string{"[/host.com/]1.1.1.1",
</s> add validUpstreams := []string{
"[/host.com/]1.1.1.1", </s> remove ClientProto string // Protocol for the client connection: "" (plain), "doh", "dot"
</s> add ClientProto ClientProto | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | internal/dnsforward/dnsforward_test.go |
<mask> "net"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/miekg/dns"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> )
<mask>
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | internal/dnsforward/stats.go | |
"github.com/AdguardTeam/AdGuardHome/internal/querylog" | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // Write Stats data and logs
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove "github.com/AdguardTeam/AdGuardHome/internal/querylog"
"github.com/miekg/dns"
</s> add </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | internal/dnsforward/stats.go |
"github.com/miekg/dns" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> )
<mask>
<mask> // Write Stats data and logs
<mask> func processQueryLogsAndStats(ctx *dnsContext) int {
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove "github.com/AdguardTeam/AdGuardHome/internal/querylog"
"github.com/miekg/dns"
</s> add </s> remove func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {
return
}
</s> add func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {} </s> remove invalidUpstreams := []string{"1.2.3.4.5",
</s> add invalidUpstreams := []string{
"1.2.3.4.5", </s> remove ClientProto string // Protocol for the client connection: "" (plain), "doh", "dot"
</s> add ClientProto ClientProto | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | internal/dnsforward/stats.go |
switch d.Proto {
case proxy.ProtoHTTPS:
p.ClientProto = querylog.ClientProtoDOH
case proxy.ProtoQUIC:
p.ClientProto = querylog.ClientProtoDOQ
case proxy.ProtoTLS:
p.ClientProto = querylog.ClientProtoDOT
default:
// Consider this a plain DNS-over-UDP or DNS-over-TCL
// request. | <mask> Elapsed: elapsed,
<mask> ClientIP: getIP(d.Addr),
<mask> }
<mask>
<mask> if d.Proto == "https" {
<mask> p.ClientProto = "doh"
<mask> } else if d.Proto == "tls" {
<mask> p.ClientProto = "dot"
<mask> }
<mask>
<mask> if d.Upstream != nil {
<mask> p.Upstream = d.Upstream.Address()
<mask> }
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {
return
}
</s> add func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {} </s> remove invalidUpstreams := []string{"1.2.3.4.5",
</s> add invalidUpstreams := []string{
"1.2.3.4.5", </s> remove upstreamsSet = []string{"[/host.com/]1.1.1.1",
</s> add upstreamsSet = []string{
"[/host.com/]1.1.1.1", </s> remove ent.ClientProto = v
</s> add ent.ClientProto, err = NewClientProto(v) </s> remove ClientProto string // Protocol for the client connection: "" (plain), "doh", "dot"
</s> add ClientProto ClientProto | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | internal/dnsforward/stats.go |
ent.ClientProto, err = NewClientProto(v) | <mask> case "QC":
<mask> ent.QClass = v
<mask>
<mask> case "CP":
<mask> ent.ClientProto = v
<mask>
<mask> case "Answer":
<mask> ent.Answer, err = base64.StdEncoding.DecodeString(v)
<mask> case "OrigAnswer":
<mask> ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove if d.Proto == "https" {
p.ClientProto = "doh"
} else if d.Proto == "tls" {
p.ClientProto = "dot"
</s> add switch d.Proto {
case proxy.ProtoHTTPS:
p.ClientProto = querylog.ClientProtoDOH
case proxy.ProtoQUIC:
p.ClientProto = querylog.ClientProtoDOQ
case proxy.ProtoTLS:
p.ClientProto = querylog.ClientProtoDOT
default:
// Consider this a plain DNS-over-UDP or DNS-over-TCL
// request. </s> remove upstreamsSet = []string{"[/host.com/]1.1.1.1",
</s> add upstreamsSet = []string{
"[/host.com/]1.1.1.1", </s> remove func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {
return
}
</s> add func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {} </s> remove ClientProto string // Protocol for the client connection: "" (plain), "doh", "dot"
</s> add ClientProto ClientProto | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | internal/querylog/decode.go |
"fmt" | <mask> package querylog
<mask>
<mask> import (
<mask> "os"
<mask> "path/filepath"
<mask> "strings"
<mask> "sync"
<mask> "time"
<mask>
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove "github.com/AdguardTeam/AdGuardHome/internal/querylog"
"github.com/miekg/dns"
</s> add </s> remove github.com/AdguardTeam/dnsproxy v0.32.6
</s> add github.com/AdguardTeam/dnsproxy v0.33.0 </s> remove ClientProto string // Protocol for the client connection: "" (plain), "doh", "dot"
</s> add ClientProto ClientProto </s> remove github.com/AdguardTeam/dnsproxy v0.32.6 h1:HCKQFUvyvIP3lrJxP8t8+mE/DJwLk2HDmzI/af5PUu4=
github.com/AdguardTeam/dnsproxy v0.32.6/go.mod h1:ZLDrKIypYxBDz2N9FQHgeehuHrwTbuhZXdGwNySshbw=
</s> add github.com/AdguardTeam/dnsproxy v0.33.0 h1:bYNf20QgvkclPm+w5YSakFQbrrlcD3MpUwkQPLMwhwU=
github.com/AdguardTeam/dnsproxy v0.33.0/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA= | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | internal/querylog/qlog.go |
ClientProto ClientProto `json:"CP"` | <mask> QHost string `json:"QH"`
<mask> QType string `json:"QT"`
<mask> QClass string `json:"QC"`
<mask>
<mask> ClientProto string `json:"CP"` // "" or "doh"
<mask>
<mask> Answer []byte `json:",omitempty"` // sometimes empty answers happen like binerdunt.top or rev2.globalrootservers.net
<mask> OrigAnswer []byte `json:",omitempty"`
<mask>
<mask> Result dnsfilter.Result
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove ClientProto string // Protocol for the client connection: "" (plain), "doh", "dot"
</s> add ClientProto ClientProto </s> remove if d.Proto == "https" {
p.ClientProto = "doh"
} else if d.Proto == "tls" {
p.ClientProto = "dot"
</s> add switch d.Proto {
case proxy.ProtoHTTPS:
p.ClientProto = querylog.ClientProtoDOH
case proxy.ProtoQUIC:
p.ClientProto = querylog.ClientProtoDOQ
case proxy.ProtoTLS:
p.ClientProto = querylog.ClientProtoDOT
default:
// Consider this a plain DNS-over-UDP or DNS-over-TCL
// request. </s> remove golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73
golang.org/x/sys v0.0.0-20200917073148-efd3b9a0ff20
golang.org/x/text v0.3.3 // indirect
google.golang.org/protobuf v1.25.0 // indirect
</s> add golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect </s> remove github.com/miekg/dns v1.1.31
</s> add github.com/miekg/dns v1.1.35
github.com/rogpeppe/go-internal v1.5.2 // indirect </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.1 // indirect
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | internal/querylog/qlog.go |
ClientProto ClientProto | <mask> Result *dnsfilter.Result // Filtering result (optional)
<mask> Elapsed time.Duration // Time spent for processing the request
<mask> ClientIP net.IP
<mask> Upstream string // Upstream server URL
<mask> ClientProto string // Protocol for the client connection: "" (plain), "doh", "dot"
<mask> }
<mask>
<mask> // New - create a new instance of the query log
<mask> func New(conf Config) QueryLog {
<mask> return newQueryLog(conf)
</s> Pull request: * dnsforward, querylog: set client_proto for logs correctly
Merge in DNS/adguard-home from 2241-doq-logs to master
Squashed commit of the following:
commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:25 2020 +0300
* all: update dnsproxy
commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 14:22:15 2020 +0300
Merge branch 'master' into 2241-doq-logs
commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 3 12:37:23 2020 +0300
* dnsforward, querylog: set client_proto for logs correctly </s> remove ClientProto string `json:"CP"` // "" or "doh"
</s> add ClientProto ClientProto `json:"CP"` </s> remove if d.Proto == "https" {
p.ClientProto = "doh"
} else if d.Proto == "tls" {
p.ClientProto = "dot"
</s> add switch d.Proto {
case proxy.ProtoHTTPS:
p.ClientProto = querylog.ClientProtoDOH
case proxy.ProtoQUIC:
p.ClientProto = querylog.ClientProtoDOQ
case proxy.ProtoTLS:
p.ClientProto = querylog.ClientProtoDOT
default:
// Consider this a plain DNS-over-UDP or DNS-over-TCL
// request. </s> remove func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {
return
}
</s> add func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {} </s> remove upstreamsSet = []string{"[/host.com/]1.1.1.1",
</s> add upstreamsSet = []string{
"[/host.com/]1.1.1.1", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df34ee5c095a57a2d4a51ad9a6416eb627a63063 | internal/querylog/querylog.go |
"os" | <mask> "io/ioutil"
<mask> "net"
<mask> "net/http"
<mask> "os/exec"
<mask> "runtime"
<mask> "strings"
<mask> "time"
</s> + POST /control/dhcp/reset: Reset DHCP configuration </s> remove ICMPTimeout uint `json:"icmp_timeout_msec" yaml:"icmp_timeout_msec"`
</s> add ICMPTimeout uint32 `json:"icmp_timeout_msec" yaml:"icmp_timeout_msec"`
WorkDir string `json:"-" yaml:"-"`
DBFilePath string `json:"-" yaml:"-"` // path to DB file </s> remove LeaseDuration uint `json:"lease_duration" yaml:"lease_duration"` // in seconds
WorkDir string `json:"-" yaml:"-"`
DBFilePath string `json:"-" yaml:"-"` // path to DB file
</s> add LeaseDuration uint32 `json:"lease_duration" yaml:"lease_duration"` // in seconds | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df92941ae0d464f5a4523c905cac8a88e8d4ddb4 | dhcpd/dhcp_http.go |
LeaseDuration uint32 `json:"lease_duration" yaml:"lease_duration"` // in seconds | <mask> GatewayIP string `json:"gateway_ip" yaml:"gateway_ip"`
<mask> SubnetMask string `json:"subnet_mask" yaml:"subnet_mask"`
<mask> RangeStart string `json:"range_start" yaml:"range_start"`
<mask> RangeEnd string `json:"range_end" yaml:"range_end"`
<mask> LeaseDuration uint `json:"lease_duration" yaml:"lease_duration"` // in seconds
<mask> WorkDir string `json:"-" yaml:"-"`
<mask> DBFilePath string `json:"-" yaml:"-"` // path to DB file
<mask>
<mask> // IP conflict detector: time (ms) to wait for ICMP reply.
<mask> // 0: disable
<mask> ICMPTimeout uint `json:"icmp_timeout_msec" yaml:"icmp_timeout_msec"`
<mask>
</s> + POST /control/dhcp/reset: Reset DHCP configuration </s> remove ICMPTimeout uint `json:"icmp_timeout_msec" yaml:"icmp_timeout_msec"`
</s> add ICMPTimeout uint32 `json:"icmp_timeout_msec" yaml:"icmp_timeout_msec"`
WorkDir string `json:"-" yaml:"-"`
DBFilePath string `json:"-" yaml:"-"` // path to DB file | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df92941ae0d464f5a4523c905cac8a88e8d4ddb4 | dhcpd/dhcpd.go |
ICMPTimeout uint32 `json:"icmp_timeout_msec" yaml:"icmp_timeout_msec"`
WorkDir string `json:"-" yaml:"-"`
DBFilePath string `json:"-" yaml:"-"` // path to DB file | <mask> DBFilePath string `json:"-" yaml:"-"` // path to DB file
<mask>
<mask> // IP conflict detector: time (ms) to wait for ICMP reply.
<mask> // 0: disable
<mask> ICMPTimeout uint `json:"icmp_timeout_msec" yaml:"icmp_timeout_msec"`
<mask>
<mask> // Called when the configuration is changed by HTTP request
<mask> ConfigModified func() `json:"-" yaml:"-"`
<mask>
<mask> // Register an HTTP handler
</s> + POST /control/dhcp/reset: Reset DHCP configuration </s> remove LeaseDuration uint `json:"lease_duration" yaml:"lease_duration"` // in seconds
WorkDir string `json:"-" yaml:"-"`
DBFilePath string `json:"-" yaml:"-"` // path to DB file
</s> add LeaseDuration uint32 `json:"lease_duration" yaml:"lease_duration"` // in seconds | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/df92941ae0d464f5a4523c905cac8a88e8d4ddb4 | dhcpd/dhcpd.go |
"strings" | <mask> "context"
<mask> "fmt"
<mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/golibs/cache"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove func testParseOk(t *testing.T, ss ...string) options {
</s> add func testParseOK(t *testing.T, ss ...string) options {
t.Helper()
</s> remove "os"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
"github.com/stretchr/testify/require" | <mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func TestMain(m *testing.M) {
<mask> aghtest.DiscardLogOutput(m)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove func prepareTestDir() string {
</s> add func prepareTestDir(t *testing.T) string {
t.Helper()
| [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.Nilf(t, err, "Error while matching host %s: %s", hostname, err) | <mask> func (d *DNSFilter) checkMatch(t *testing.T, hostname string) {
<mask> t.Helper()
<mask>
<mask> res, err := d.CheckHost(hostname, dns.TypeA, &setts)
<mask> assert.Nilf(t, err, "Error while matching host %s: %s", hostname, err)
<mask> assert.Truef(t, res.IsFiltered, "Expected hostname %s to match", hostname)
<mask> }
<mask>
<mask> func (d *DNSFilter) checkMatchIP(t *testing.T, hostname, ip string, qtype uint16) {
<mask> t.Helper()
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nilf(t, err, "Error while matching host %s: %s", hostname, err)
</s> add require.Nilf(t, err, "Error while matching host %s: %s", hostname, err) </s> remove assert.Nilf(t, err, "Error while matching host %s: %s", hostname, err)
</s> add require.Nilf(t, err, "Error while matching host %s: %s", hostname, err) </s> remove if assert.NotEmpty(t, res.Rules, "Expected result to have rules") {
r := res.Rules[0]
assert.NotNilf(t, r.IP, "Expected ip %s to match, actual: %v", ip, r.IP)
assert.Equalf(t, ip, r.IP.String(), "Expected ip %s to match, actual: %v", ip, r.IP)
}
</s> add require.NotEmpty(t, res.Rules, "Expected result to have rules")
r := res.Rules[0]
require.NotNilf(t, r.IP, "Expected ip %s to match, actual: %v", ip, r.IP)
assert.Equalf(t, ip, r.IP.String(), "Expected ip %s to match, actual: %v", ip, r.IP) </s> remove assert.Nilf(b, err, "Error while matching host %s: %s", blocked, err)
</s> add require.Nilf(b, err, "Error while matching host %s: %s", blocked, err) </s> remove assert.Nilf(b, err, "Error while matching host %s: %s", blocked, err)
</s> add require.Nilf(b, err, "Error while matching host %s: %s", blocked, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.Nilf(t, err, "Error while matching host %s: %s", hostname, err) | <mask> func (d *DNSFilter) checkMatchIP(t *testing.T, hostname, ip string, qtype uint16) {
<mask> t.Helper()
<mask>
<mask> res, err := d.CheckHost(hostname, qtype, &setts)
<mask> assert.Nilf(t, err, "Error while matching host %s: %s", hostname, err)
<mask> assert.Truef(t, res.IsFiltered, "Expected hostname %s to match", hostname)
<mask> if assert.NotEmpty(t, res.Rules, "Expected result to have rules") {
<mask> r := res.Rules[0]
<mask> assert.NotNilf(t, r.IP, "Expected ip %s to match, actual: %v", ip, r.IP)
<mask> assert.Equalf(t, ip, r.IP.String(), "Expected ip %s to match, actual: %v", ip, r.IP)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove if assert.NotEmpty(t, res.Rules, "Expected result to have rules") {
r := res.Rules[0]
assert.NotNilf(t, r.IP, "Expected ip %s to match, actual: %v", ip, r.IP)
assert.Equalf(t, ip, r.IP.String(), "Expected ip %s to match, actual: %v", ip, r.IP)
}
</s> add require.NotEmpty(t, res.Rules, "Expected result to have rules")
r := res.Rules[0]
require.NotNilf(t, r.IP, "Expected ip %s to match, actual: %v", ip, r.IP)
assert.Equalf(t, ip, r.IP.String(), "Expected ip %s to match, actual: %v", ip, r.IP) </s> remove assert.Nilf(t, err, "Error while matching host %s: %s", hostname, err)
</s> add require.Nilf(t, err, "Error while matching host %s: %s", hostname, err) </s> remove assert.Nilf(t, err, "Error while matching host %s: %s", hostname, err)
</s> add require.Nilf(t, err, "Error while matching host %s: %s", hostname, err) </s> remove assert.Nilf(b, err, "Error while matching host %s: %s", blocked, err)
</s> add require.Nilf(b, err, "Error while matching host %s: %s", blocked, err) </s> remove assert.Nilf(b, err, "Error while matching host %s: %s", blocked, err)
</s> add require.Nilf(b, err, "Error while matching host %s: %s", blocked, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.NotEmpty(t, res.Rules, "Expected result to have rules")
r := res.Rules[0]
require.NotNilf(t, r.IP, "Expected ip %s to match, actual: %v", ip, r.IP)
assert.Equalf(t, ip, r.IP.String(), "Expected ip %s to match, actual: %v", ip, r.IP) | <mask>
<mask> res, err := d.CheckHost(hostname, qtype, &setts)
<mask> assert.Nilf(t, err, "Error while matching host %s: %s", hostname, err)
<mask> assert.Truef(t, res.IsFiltered, "Expected hostname %s to match", hostname)
<mask> if assert.NotEmpty(t, res.Rules, "Expected result to have rules") {
<mask> r := res.Rules[0]
<mask> assert.NotNilf(t, r.IP, "Expected ip %s to match, actual: %v", ip, r.IP)
<mask> assert.Equalf(t, ip, r.IP.String(), "Expected ip %s to match, actual: %v", ip, r.IP)
<mask> }
<mask> }
<mask>
<mask> func (d *DNSFilter) checkMatchEmpty(t *testing.T, hostname string) {
<mask> t.Helper()
<mask>
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nilf(t, err, "Error while matching host %s: %s", hostname, err)
</s> add require.Nilf(t, err, "Error while matching host %s: %s", hostname, err) </s> remove assert.Nilf(t, err, "Error while matching host %s: %s", hostname, err)
</s> add require.Nilf(t, err, "Error while matching host %s: %s", hostname, err) </s> remove assert.Nilf(t, err, "Error while matching host %s: %s", hostname, err)
</s> add require.Nilf(t, err, "Error while matching host %s: %s", hostname, err) </s> remove assert.Nilf(b, err, "Error while matching host %s: %s", blocked, err)
</s> add require.Nilf(b, err, "Error while matching host %s: %s", blocked, err) </s> remove assert.Nilf(b, err, "Error while matching host %s: %s", blocked, err)
</s> add require.Nilf(b, err, "Error while matching host %s: %s", blocked, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.Nilf(t, err, "Error while matching host %s: %s", hostname, err) | <mask> func (d *DNSFilter) checkMatchEmpty(t *testing.T, hostname string) {
<mask> t.Helper()
<mask>
<mask> res, err := d.CheckHost(hostname, dns.TypeA, &setts)
<mask> assert.Nilf(t, err, "Error while matching host %s: %s", hostname, err)
<mask> assert.Falsef(t, res.IsFiltered, "Expected hostname %s to not match", hostname)
<mask> }
<mask>
<mask> func TestEtcHostsMatching(t *testing.T) {
<mask> addr := "216.239.38.120"
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nilf(t, err, "Error while matching host %s: %s", hostname, err)
</s> add require.Nilf(t, err, "Error while matching host %s: %s", hostname, err) </s> remove assert.Nilf(t, err, "Error while matching host %s: %s", hostname, err)
</s> add require.Nilf(t, err, "Error while matching host %s: %s", hostname, err) </s> remove if assert.NotEmpty(t, res.Rules, "Expected result to have rules") {
r := res.Rules[0]
assert.NotNilf(t, r.IP, "Expected ip %s to match, actual: %v", ip, r.IP)
assert.Equalf(t, ip, r.IP.String(), "Expected ip %s to match, actual: %v", ip, r.IP)
}
</s> add require.NotEmpty(t, res.Rules, "Expected result to have rules")
r := res.Rules[0]
require.NotNilf(t, r.IP, "Expected ip %s to match, actual: %v", ip, r.IP)
assert.Equalf(t, ip, r.IP.String(), "Expected ip %s to match, actual: %v", ip, r.IP) </s> remove assert.Nilf(b, err, "Error while matching host %s: %s", blocked, err)
</s> add require.Nilf(b, err, "Error while matching host %s: %s", blocked, err) </s> remove assert.Nilf(b, err, "Error while matching host %s: %s", blocked, err)
</s> add require.Nilf(b, err, "Error while matching host %s: %s", blocked, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.Nil(t, err) | <mask> d.checkMatchIP(t, "block.com", "0.0.0.0", dns.TypeA)
<mask>
<mask> // Empty IPv6.
<mask> res, err := d.CheckHost("block.com", dns.TypeAAAA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.True(t, res.IsFiltered)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.Equal(t, "0.0.0.0 block.com", res.Rules[0].Text)
<mask> assert.Empty(t, res.Rules[0].IP)
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "0.0.0.0 block.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "0.0.0.0 block.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "::1 ipv6.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "::1 ipv6.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "||host1^", res.Rules[0].Text)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "||host1^", res.Rules[0].Text) </s> remove res, err := d.CheckHost(host, dns.TypeA, &setts)
assert.Nil(t, err)
assert.True(t, res.IsFiltered)
if assert.Len(t, res.Rules, 1) {
assert.Equal(t, res.Rules[0].IP, net.IPv4(213, 180, 193, 56))
}
</s> add t.Run(strings.ToLower(host), func(t *testing.T) {
res, err := d.CheckHost(host, dns.TypeA, &setts)
require.Nil(t, err)
assert.True(t, res.IsFiltered)
require.Len(t, res.Rules, 1)
assert.Equal(t, yandexIP, res.Rules[0].IP)
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.Len(t, res.Rules, 1)
assert.Equal(t, "0.0.0.0 block.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP) | <mask> // Empty IPv6.
<mask> res, err := d.CheckHost("block.com", dns.TypeAAAA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.True(t, res.IsFiltered)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.Equal(t, "0.0.0.0 block.com", res.Rules[0].Text)
<mask> assert.Empty(t, res.Rules[0].IP)
<mask> }
<mask>
<mask> // IPv6 match.
<mask> d.checkMatchIP(t, "ipv6.com", addr6, dns.TypeAAAA)
<mask>
<mask> // Empty IPv4.
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "::1 ipv6.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "::1 ipv6.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, res.Rules[0].IP, net.IPv6loopback)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, res.Rules[0].IP, net.IPv6loopback) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.Nil(t, err) | <mask> d.checkMatchIP(t, "ipv6.com", addr6, dns.TypeAAAA)
<mask>
<mask> // Empty IPv4.
<mask> res, err = d.CheckHost("ipv6.com", dns.TypeA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.True(t, res.IsFiltered)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.Equal(t, "::1 ipv6.com", res.Rules[0].Text)
<mask> assert.Empty(t, res.Rules[0].IP)
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "::1 ipv6.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "::1 ipv6.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "0.0.0.0 block.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "0.0.0.0 block.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "||host1^", res.Rules[0].Text)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "||host1^", res.Rules[0].Text) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "||host2^", res.Rules[0].Text)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "||host2^", res.Rules[0].Text) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.Len(t, res.Rules, 1)
assert.Equal(t, "::1 ipv6.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP) | <mask> // Empty IPv4.
<mask> res, err = d.CheckHost("ipv6.com", dns.TypeA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.True(t, res.IsFiltered)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.Equal(t, "::1 ipv6.com", res.Rules[0].Text)
<mask> assert.Empty(t, res.Rules[0].IP)
<mask> }
<mask>
<mask> // Two IPv4, the first one returned.
<mask> res, err = d.CheckHost("host2", dns.TypeA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.True(t, res.IsFiltered)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, res.Rules[0].IP, net.IP{0, 0, 0, 1})
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, res.Rules[0].IP, net.IP{0, 0, 0, 1}) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "0.0.0.0 block.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "0.0.0.0 block.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "||host1^", res.Rules[0].Text)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "||host1^", res.Rules[0].Text) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.Nil(t, err) | <mask> }
<mask>
<mask> // Two IPv4, the first one returned.
<mask> res, err = d.CheckHost("host2", dns.TypeA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.True(t, res.IsFiltered)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.Equal(t, res.Rules[0].IP, net.IP{0, 0, 0, 1})
<mask> }
<mask>
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, res.Rules[0].IP, net.IP{0, 0, 0, 1})
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, res.Rules[0].IP, net.IP{0, 0, 0, 1}) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "::1 ipv6.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "::1 ipv6.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, res.Rules[0].IP, net.IPv6loopback)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, res.Rules[0].IP, net.IPv6loopback) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "||host2^", res.Rules[0].Text)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "||host2^", res.Rules[0].Text) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.Len(t, res.Rules, 1)
assert.Equal(t, res.Rules[0].IP, net.IP{0, 0, 0, 1}) | <mask> // Two IPv4, the first one returned.
<mask> res, err = d.CheckHost("host2", dns.TypeA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.True(t, res.IsFiltered)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.Equal(t, res.Rules[0].IP, net.IP{0, 0, 0, 1})
<mask> }
<mask>
<mask> // One IPv6 address.
<mask> res, err = d.CheckHost("host2", dns.TypeAAAA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.True(t, res.IsFiltered)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "::1 ipv6.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "::1 ipv6.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, res.Rules[0].IP, net.IPv6loopback)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, res.Rules[0].IP, net.IPv6loopback) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "||host1^", res.Rules[0].Text)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "||host1^", res.Rules[0].Text) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.Nil(t, err) | <mask> }
<mask>
<mask> // One IPv6 address.
<mask> res, err = d.CheckHost("host2", dns.TypeAAAA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.True(t, res.IsFiltered)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.Equal(t, res.Rules[0].IP, net.IPv6loopback)
<mask> }
<mask> }
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, res.Rules[0].IP, net.IPv6loopback)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, res.Rules[0].IP, net.IPv6loopback) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, res.Rules[0].IP, net.IP{0, 0, 0, 1})
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, res.Rules[0].IP, net.IP{0, 0, 0, 1}) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "||host2^", res.Rules[0].Text)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "||host2^", res.Rules[0].Text) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "0.0.0.0 block.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "0.0.0.0 block.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.Len(t, res.Rules, 1)
assert.Equal(t, res.Rules[0].IP, net.IPv6loopback) | <mask> // One IPv6 address.
<mask> res, err = d.CheckHost("host2", dns.TypeAAAA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.True(t, res.IsFiltered)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.Equal(t, res.Rules[0].IP, net.IPv6loopback)
<mask> }
<mask> }
<mask>
<mask> // Safe Browsing.
<mask>
<mask> func TestSafeBrowsing(t *testing.T) {
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, res.Rules[0].IP, net.IP{0, 0, 0, 1})
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, res.Rules[0].IP, net.IP{0, 0, 0, 1}) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "||host2^", res.Rules[0].Text)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "||host2^", res.Rules[0].Text) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "0.0.0.0 block.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "0.0.0.0 block.com", res.Rules[0].Text)
assert.Empty(t, res.Rules[0].IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
const matching = "wmconvirus.narod.ru" | <mask> aghtest.ReplaceLogLevel(t, log.DEBUG)
<mask>
<mask> d := newForTest(&Config{SafeBrowsingEnabled: true}, nil)
<mask> t.Cleanup(d.Close)
<mask> matching := "wmconvirus.narod.ru"
<mask> d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
<mask> Hostname: matching,
<mask> Block: true,
<mask> })
<mask> d.checkMatch(t, matching)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove matching := "wmconvirus.narod.ru"
</s> add const matching = "wmconvirus.narod.ru" </s> remove matching := "pornhub.com"
</s> add const matching = "pornhub.com" </s> remove assert.Contains(t, logOutput.String(), "SafeBrowsing lookup for "+matching)
</s> add require.Contains(t, logOutput.String(), "SafeBrowsing lookup for "+matching) </s> remove assert.Contains(t, logOutput.String(), "Parental lookup for "+matching)
</s> add require.Contains(t, logOutput.String(), "Parental lookup for "+matching) </s> remove ans, _ := (&aghtest.TestResolver{}).HostToIPs(hostname)
</s> add ans4, _ := (&aghtest.TestResolver{}).HostToIPs(hostname) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.Contains(t, logOutput.String(), "SafeBrowsing lookup for "+matching) | <mask> Block: true,
<mask> })
<mask> d.checkMatch(t, matching)
<mask>
<mask> assert.Contains(t, logOutput.String(), "SafeBrowsing lookup for "+matching)
<mask>
<mask> d.checkMatch(t, "test."+matching)
<mask> d.checkMatchEmpty(t, "yandex.ru")
<mask> d.checkMatchEmpty(t, "pornhub.com")
<mask>
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Contains(t, logOutput.String(), "Parental lookup for "+matching)
</s> add require.Contains(t, logOutput.String(), "Parental lookup for "+matching) </s> remove // test cached result
</s> add // Test cached result. </s> remove d.parentalServer = defaultParentalServer
</s> add </s> remove matching := "wmconvirus.narod.ru"
</s> add const matching = "wmconvirus.narod.ru" </s> remove matching := "pornhub.com"
</s> add const matching = "pornhub.com" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
const matching = "wmconvirus.narod.ru" | <mask>
<mask> func TestParallelSB(t *testing.T) {
<mask> d := newForTest(&Config{SafeBrowsingEnabled: true}, nil)
<mask> t.Cleanup(d.Close)
<mask> matching := "wmconvirus.narod.ru"
<mask> d.SetSafeBrowsingUpstream(&aghtest.TestBlockUpstream{
<mask> Hostname: matching,
<mask> Block: true,
<mask> })
<mask>
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove matching := "wmconvirus.narod.ru"
</s> add const matching = "wmconvirus.narod.ru" </s> remove matching := "pornhub.com"
</s> add const matching = "pornhub.com" </s> remove ans, _ := (&aghtest.TestResolver{}).HostToIPs(hostname)
</s> add ans4, _ := (&aghtest.TestResolver{}).HostToIPs(hostname) </s> remove assert.True(t, ok, "Expected safesearch to find result for www.google.com")
</s> add require.True(t, ok, "Expected safesearch to find result for www.google.com") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.True(t, ok, "Expected safesearch to find result for www.google.com") | <mask> func TestSafeSearch(t *testing.T) {
<mask> d := newForTest(&Config{SafeSearchEnabled: true}, nil)
<mask> t.Cleanup(d.Close)
<mask> val, ok := d.SafeSearchDomain("www.google.com")
<mask> assert.True(t, ok, "Expected safesearch to find result for www.google.com")
<mask> assert.Equal(t, "forcesafesearch.google.com", val, "Expected safesearch for google.com to be forcesafesearch.google.com")
<mask> }
<mask>
<mask> func TestCheckHostSafeSearchYandex(t *testing.T) {
<mask> d := newForTest(&Config{SafeSearchEnabled: true}, nil)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.True(b, ok, "Expected safesearch to find result for www.google.com")
</s> add require.True(b, ok, "Expected safesearch to find result for www.google.com") </s> remove assert.True(b, ok, "Expected safesearch to find result for www.google.com")
</s> add require.True(b, ok, "Expected safesearch to find result for www.google.com") </s> remove assert.Truef(t, ok, "Failed to get safesearch domain for %s", domain)
</s> add require.Truef(t, ok, "Failed to get safesearch domain for %s", domain) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Empty(t, res.Rules)
</s> add require.Empty(t, res.Rules) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
yandexIP := net.IPv4(213, 180, 193, 56)
| <mask> t.Cleanup(d.Close)
<mask>
<mask> // Check host for each domain.
<mask> for _, host := range []string{
<mask> "yAndeX.ru",
<mask> "YANdex.COM",
<mask> "yandex.ua",
<mask> "yandex.by",
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove CustomResolver: &aghtest.TestResolver{},
</s> add CustomResolver: resolver, </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove domain := "yandex.ru"
</s> add const domain = "yandex.ru" </s> remove assert.Empty(t, res.Rules)
</s> add require.Empty(t, res.Rules)
yandexIP := net.IPv4(213, 180, 193, 56) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
t.Run(strings.ToLower(host), func(t *testing.T) {
res, err := d.CheckHost(host, dns.TypeA, &setts)
require.Nil(t, err)
assert.True(t, res.IsFiltered)
require.Len(t, res.Rules, 1)
assert.Equal(t, yandexIP, res.Rules[0].IP)
}) | <mask> "yandex.by",
<mask> "yandex.kz",
<mask> "www.yandex.com",
<mask> } {
<mask> res, err := d.CheckHost(host, dns.TypeA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.True(t, res.IsFiltered)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.Equal(t, res.Rules[0].IP, net.IPv4(213, 180, 193, 56))
<mask> }
<mask> }
<mask> }
<mask>
<mask> func TestCheckHostSafeSearchGoogle(t *testing.T) {
<mask> d := newForTest(&Config{
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.True(t, isFound)
if assert.Len(t, cachedValue.Rules, 1) {
assert.Equal(t, cachedValue.Rules[0].IP, net.IPv4(213, 180, 193, 56))
}
</s> add require.True(t, isFound)
require.Len(t, cachedValue.Rules, 1)
assert.Equal(t, cachedValue.Rules[0].IP, yandexIP) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, res.Rules[0].IP, net.IPv4(213, 180, 193, 56))
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, res.Rules[0].IP, yandexIP) </s> remove if assert.Len(t, res.Rules, 1) {
assert.NotEqual(t, res.Rules[0].IP.String(), "0.0.0.0")
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, ip, res.Rules[0].IP) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nilf(t, err, "CheckHost for safesearh domain %s failed cause %s", domain, err)
</s> add require.Nilf(t, err, "CheckHost for safesearh domain %s failed cause %s", domain, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
resolver := &aghtest.TestResolver{} | <mask> }
<mask>
<mask> func TestCheckHostSafeSearchGoogle(t *testing.T) {
<mask> d := newForTest(&Config{
<mask> SafeSearchEnabled: true,
<mask> CustomResolver: resolver,
<mask> }, nil)
<mask> t.Cleanup(d.Close)
<mask>
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove CustomResolver: &aghtest.TestResolver{},
</s> add CustomResolver: resolver, </s> remove domain := "www.google.ru"
</s> add const domain = "www.google.ru" </s> remove res, err := d.CheckHost(host, dns.TypeA, &setts)
assert.Nil(t, err)
assert.True(t, res.IsFiltered)
if assert.Len(t, res.Rules, 1) {
assert.Equal(t, res.Rules[0].IP, net.IPv4(213, 180, 193, 56))
}
</s> add t.Run(strings.ToLower(host), func(t *testing.T) {
res, err := d.CheckHost(host, dns.TypeA, &setts)
require.Nil(t, err)
assert.True(t, res.IsFiltered)
require.Len(t, res.Rules, 1)
assert.Equal(t, yandexIP, res.Rules[0].IP)
}) </s> remove matching := "wmconvirus.narod.ru"
</s> add const matching = "wmconvirus.narod.ru" </s> remove matching := "pornhub.com"
</s> add const matching = "pornhub.com" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
CustomResolver: resolver, | <mask>
<mask> func TestCheckHostSafeSearchGoogle(t *testing.T) {
<mask> d := newForTest(&Config{
<mask> SafeSearchEnabled: true,
<mask> CustomResolver: &aghtest.TestResolver{},
<mask> }, nil)
<mask> t.Cleanup(d.Close)
<mask>
<mask> // Check host for each domain.
<mask> for _, host := range []string{
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove domain := "yandex.ru"
</s> add const domain = "yandex.ru" </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
ip, _ := resolver.HostToIPs("forcesafesearch.google.com")
| <mask> t.Cleanup(d.Close)
<mask>
<mask> // Check host for each domain.
<mask> for _, host := range []string{
<mask> "www.google.com",
<mask> "www.google.im",
<mask> "www.google.co.in",
<mask> "www.google.iq",
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove CustomResolver: &aghtest.TestResolver{},
</s> add CustomResolver: resolver, </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove domain := "yandex.ru"
</s> add const domain = "yandex.ru" </s> remove assert.Empty(t, res.Rules)
</s> add require.Empty(t, res.Rules)
yandexIP := net.IPv4(213, 180, 193, 56) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.Nil(t, err) | <mask> "www.google.je",
<mask> } {
<mask> t.Run(host, func(t *testing.T) {
<mask> res, err := d.CheckHost(host, dns.TypeA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.True(t, res.IsFiltered)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.NotEqual(t, res.Rules[0].IP.String(), "0.0.0.0")
<mask> }
<mask> })
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove if assert.Len(t, res.Rules, 1) {
assert.NotEqual(t, res.Rules[0].IP.String(), "0.0.0.0")
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, ip, res.Rules[0].IP) </s> remove res, err := d.CheckHost(host, dns.TypeA, &setts)
assert.Nil(t, err)
assert.True(t, res.IsFiltered)
if assert.Len(t, res.Rules, 1) {
assert.Equal(t, res.Rules[0].IP, net.IPv4(213, 180, 193, 56))
}
</s> add t.Run(strings.ToLower(host), func(t *testing.T) {
res, err := d.CheckHost(host, dns.TypeA, &setts)
require.Nil(t, err)
assert.True(t, res.IsFiltered)
require.Len(t, res.Rules, 1)
assert.Equal(t, yandexIP, res.Rules[0].IP)
}) </s> remove assert.Len(t, res.Rules, 1)
</s> add require.Len(t, res.Rules, 1) </s> remove assert.Nil(t, err)
if assert.Len(t, res.Rules, 1) {
assert.True(t, res.Rules[0].IP.Equal(ip))
}
</s> add require.Nil(t, err)
require.Len(t, res.Rules, 1)
assert.True(t, res.Rules[0].IP.Equal(ip)) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "||host1^", res.Rules[0].Text)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "||host1^", res.Rules[0].Text) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.Len(t, res.Rules, 1)
assert.Equal(t, ip, res.Rules[0].IP) | <mask> t.Run(host, func(t *testing.T) {
<mask> res, err := d.CheckHost(host, dns.TypeA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.True(t, res.IsFiltered)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.NotEqual(t, res.Rules[0].IP.String(), "0.0.0.0")
<mask> }
<mask> })
<mask> }
<mask> }
<mask>
<mask> func TestSafeSearchCacheYandex(t *testing.T) {
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove res, err := d.CheckHost(host, dns.TypeA, &setts)
assert.Nil(t, err)
assert.True(t, res.IsFiltered)
if assert.Len(t, res.Rules, 1) {
assert.Equal(t, res.Rules[0].IP, net.IPv4(213, 180, 193, 56))
}
</s> add t.Run(strings.ToLower(host), func(t *testing.T) {
res, err := d.CheckHost(host, dns.TypeA, &setts)
require.Nil(t, err)
assert.True(t, res.IsFiltered)
require.Len(t, res.Rules, 1)
assert.Equal(t, yandexIP, res.Rules[0].IP)
}) </s> remove assert.Len(t, res.Rules, 1)
</s> add require.Len(t, res.Rules, 1) </s> remove if assert.Len(t, res.Rules, 1) {
assert.Equal(t, "||host2^", res.Rules[0].Text)
}
</s> add require.Len(t, res.Rules, 1)
assert.Equal(t, "||host2^", res.Rules[0].Text) </s> remove assert.Nil(t, err)
if assert.Len(t, res.Rules, 1) {
assert.True(t, res.Rules[0].IP.Equal(ip))
}
</s> add require.Nil(t, err)
require.Len(t, res.Rules, 1)
assert.True(t, res.Rules[0].IP.Equal(ip)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
const domain = "yandex.ru" | <mask>
<mask> func TestSafeSearchCacheYandex(t *testing.T) {
<mask> d := newForTest(nil, nil)
<mask> t.Cleanup(d.Close)
<mask> domain := "yandex.ru"
<mask>
<mask> // Check host with disabled safesearch.
<mask> res, err := d.CheckHost(domain, dns.TypeA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.False(t, res.IsFiltered)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Empty(t, res.Rules)
</s> add require.Empty(t, res.Rules)
yandexIP := net.IPv4(213, 180, 193, 56) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Empty(t, res.Rules)
</s> add require.Empty(t, res.Rules) </s> remove domain := "www.google.ru"
</s> add const domain = "www.google.ru" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
require.Nil(t, err) | <mask> domain := "yandex.ru"
<mask>
<mask> // Check host with disabled safesearch.
<mask> res, err := d.CheckHost(domain, dns.TypeA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.False(t, res.IsFiltered)
<mask> assert.Empty(t, res.Rules)
<mask>
<mask> d = newForTest(&Config{SafeSearchEnabled: true}, nil)
<mask> t.Cleanup(d.Close)
</s> Pull request: 2639 use testify require vol.4
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639.
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests </s> remove assert.Empty(t, res.Rules)
</s> add require.Empty(t, res.Rules)
yandexIP := net.IPv4(213, 180, 193, 56) </s> remove domain := "yandex.ru"
</s> add const domain = "yandex.ru" </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Empty(t, res.Rules)
</s> add require.Empty(t, res.Rules) </s> remove domain := "www.google.ru"
</s> add const domain = "www.google.ru" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/dfdbfee4fd89047c49777841a70654480f1e67ea | internal/dnsfilter/dnsfilter_test.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.