daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request: 3013 querylog idna

Browse Source 
Merge in DNS/adguard-home from 3013-idna to master

Closes #3013.

Squashed commit of the following:

commit 567d4c3beef3cf3ee995ad9d8c3aba6616c74c6c
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jun 29 13:11:10 2021 +0300

    client: mv punycode label

commit 6585dcaece9f590d7f02afb5aa25953ab0c2555b
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Jun 29 12:32:40 2021 +0300

    client: handle unicode name

commit c0f61bfbb9bdf919be7b07c112c4b7a52f3ad6a1
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jun 28 20:00:57 2021 +0300

    all: imp log of changes

commit 41388abc8770ce164bcba327fcf0013133b5e6f7
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jun 28 19:52:23 2021 +0300

    scripts: imp hooks

commit 9c4ba933fbd9340e1de061d4f451218238650c0f
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jun 28 19:47:27 2021 +0300

    all: imp code, docs

commit 61bd6d6f926480cb8c2f9bd3cd2b61e1532f71cf
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jun 28 16:09:25 2021 +0300

    querylog: add ascii hostname, convert to unicode
This commit is contained in:
Eugene Burkov
2021-06-29 13:36:52 +03:00
parent 9d1656b5c1
commit 16e5e09c2e
11 changed files with 139 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/querylog/qlog_test.go
View File

@@ -67,7 +67,7 @@ func TestQueryLog(t *testing.T) {
}, {
name: "by_domain_strict",
sCr: []searchCriterion{{
criterionType: ctDomainOrClient,
criterionType: ctTerm,
strict: true,
value: "TEST.example.org",
}},
@@ -77,7 +77,7 @@ func TestQueryLog(t *testing.T) {
}, {
name: "by_domain_non-strict",
sCr: []searchCriterion{{
criterionType: ctDomainOrClient,
criterionType: ctTerm,
strict: false,
value: "example.ORG",
}},
@@ -89,7 +89,7 @@ func TestQueryLog(t *testing.T) {
}, {
name: "by_client_ip_strict",
sCr: []searchCriterion{{
criterionType: ctDomainOrClient,
criterionType: ctTerm,
strict: true,
value: "2.2.2.2",
}},
@@ -99,7 +99,7 @@ func TestQueryLog(t *testing.T) {
}, {
name: "by_client_ip_non-strict",
sCr: []searchCriterion{{
criterionType: ctDomainOrClient,
criterionType: ctTerm,
strict: false,
value: "2.2.2",
}},