+ {React.Children.map(Object.entries(contentObj), renderGrid)}
+
,
];
const requestDetails = getGrid(requestDetailsObj, 'request_details');
@@ -81,35 +111,60 @@ const DomainCell = ({
'px-2 d-flex justify-content-center flex-column': isDetailed,
});
- const details = [ip, protocol].filter(Boolean)
- .join(', ');
+ const details = [ip, protocol].filter(Boolean).join(', ');
- return
- {dnssec_enabled &&
}
-
-
-
{domain}
- {details && isDetailed
- &&
{details}
}
+ return (
+
+ {dnssec_enabled && (
+
+ )}
+
+
+ {unicodeName ? (
+
+ {unicodeName}
+
+ ) : (
+
+ {domain}
+
+ )}
+ {details && isDetailed && (
+
+ {details}
+
+ )}
+
-
;
+ );
};
DomainCell.propTypes = {
answer_dnssec: propTypes.bool.isRequired,
client_proto: propTypes.string.isRequired,
domain: propTypes.string.isRequired,
+ unicodeName: propTypes.string,
time: propTypes.string.isRequired,
type: propTypes.string.isRequired,
tracker: propTypes.object,
diff --git a/client/src/helpers/helpers.js b/client/src/helpers/helpers.js
index f7e20fcc..19ed0b70 100644
--- a/client/src/helpers/helpers.js
+++ b/client/src/helpers/helpers.js
@@ -77,7 +77,7 @@ export const normalizeLogs = (logs) => logs.map((log) => {
upstream,
} = log;
- const { host: domain, type } = question;
+ const { name: domain, unicode_name: unicodeName, type } = question;
const processResponse = (data) => (data ? data.map((response) => {
const { value, type, ttl } = response;
@@ -96,6 +96,7 @@ export const normalizeLogs = (logs) => logs.map((log) => {
return {
time,
domain,
+ unicodeName,
type,
response: processResponse(answer),
reason,
diff --git a/internal/querylog/http.go b/internal/querylog/http.go
index cc26f8ab..8bf5ee27 100644
--- a/internal/querylog/http.go
+++ b/internal/querylog/http.go
@@ -127,7 +127,7 @@ func getDoubleQuotesEnclosedValue(s *string) bool {
}
// parseSearchCriterion parses a search criterion from the query parameter.
-func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (bool, searchCriterion, error) {
+func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
val := q.Get(name)
if len(val) == 0 {
return false, searchCriterion{}, nil
@@ -176,7 +176,7 @@ func (l *queryLog) parseSearchParams(r *http.Request) (p *searchParams, err erro
}
paramNames := map[string]criterionType{
- "search": ctDomainOrClient,
+ "search": ctTerm,
"response_status": ctFilteringStatus,
}
diff --git a/internal/querylog/json.go b/internal/querylog/json.go
index b2f6f515..2dfaf68b 100644
--- a/internal/querylog/json.go
+++ b/internal/querylog/json.go
@@ -10,6 +10,7 @@ import (
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
"github.com/AdguardTeam/golibs/log"
"github.com/miekg/dns"
+ "golang.org/x/net/idna"
)
// TODO(a.garipov): Use a proper structured approach here.
@@ -66,6 +67,20 @@ func (l *queryLog) logEntryToJSONEntry(entry *logEntry) (jsonEntry jobject) {
}
}
+ hostname := entry.QHost
+ question := jobject{
+ "type": entry.QType,
+ "class": entry.QClass,
+ "name": hostname,
+ }
+ if qhost, err := idna.ToUnicode(hostname); err == nil {
+ if qhost != hostname && qhost != "" {
+ question["unicode_name"] = qhost
+ }
+ } else {
+ log.Debug("translating %q into unicode: %s", hostname, err)
+ }
+
jsonEntry = jobject{
"reason": entry.Result.Reason.String(),
"elapsedMs": strconv.FormatFloat(entry.Elapsed.Seconds()*1000, 'f', -1, 64),
@@ -74,11 +89,7 @@ func (l *queryLog) logEntryToJSONEntry(entry *logEntry) (jsonEntry jobject) {
"client_info": entry.client,
"client_proto": entry.ClientProto,
"upstream": entry.Upstream,
- "question": jobject{
- "host": entry.QHost,
- "type": entry.QType,
- "class": entry.QClass,
- },
+ "question": question,
}
if entry.ClientID != "" {
diff --git a/internal/querylog/qlog_test.go b/internal/querylog/qlog_test.go
index 709f4585..9ee31aa9 100644
--- a/internal/querylog/qlog_test.go
+++ b/internal/querylog/qlog_test.go
@@ -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",
}},
diff --git a/internal/querylog/searchcriterion.go b/internal/querylog/searchcriterion.go
index d5f4d4f0..d726b5bc 100644
--- a/internal/querylog/searchcriterion.go
+++ b/internal/querylog/searchcriterion.go
@@ -11,9 +11,11 @@ import (
type criterionType int
const (
- // ctDomainOrClient is for searching by the domain name, the client's IP
- // address, or the clinet's ID.
- ctDomainOrClient criterionType = iota
+ // ctTerm is for searching by the domain name, the client's IP
+ // address, the client's ID or the client's name.
+ //
+ // TODO(e.burkov): Make it support IDNA while #3012.
+ ctTerm criterionType = iota
// ctFilteringStatus is for searching by the filtering status.
//
// See (*searchCriterion).ctFilteringStatusCase for details.
@@ -114,7 +116,7 @@ func (c *searchCriterion) ctDomainOrClientCaseNonStrict(
// optimisation purposes.
func (c *searchCriterion) quickMatch(line string, findClient quickMatchClientFunc) (ok bool) {
switch c.criterionType {
- case ctDomainOrClient:
+ case ctTerm:
host := readJSONValue(line, `"QH":"`)
ip := readJSONValue(line, `"IP":"`)
clientID := readJSONValue(line, `"CID":"`)
@@ -141,7 +143,7 @@ func (c *searchCriterion) quickMatch(line string, findClient quickMatchClientFun
// match checks if the log entry matches this search criterion.
func (c *searchCriterion) match(entry *logEntry) bool {
switch c.criterionType {
- case ctDomainOrClient:
+ case ctTerm:
return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
diff --git a/openapi/CHANGELOG.md b/openapi/CHANGELOG.md
index 7660cc27..4744f720 100644
--- a/openapi/CHANGELOG.md
+++ b/openapi/CHANGELOG.md
@@ -4,6 +4,17 @@
## v0.107: API changes
+### The new field `"unicode_name"` in `DNSQuestion`
+
+* The new optional field `"unicode_name"` is the Unicode representation of
+ question's domain name. It is only presented if the original question's
+ domain name is an IDN.
+
+### Documentation fix of `DNSQuestion`
+
+* Previously incorrectly named field `"host"` in `DNSQuestion` is now named
+ `"name"`.
+
### Disabling Statistics
* The API `POST /control/stats_config` HTTP API allows disabling statistics by
diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml
index dbe6c2c0..5410427b 100644
--- a/openapi/openapi.yaml
+++ b/openapi/openapi.yaml
@@ -1823,9 +1823,12 @@
'class':
'type': 'string'
'example': 'IN'
- 'host':
+ 'name':
'type': 'string'
- 'example': 'example.org'
+ 'example': 'xn--d1abbgf6aiiy.xn--p1ai'
+ 'unicode_name':
+ 'type': 'string'
+ 'example': 'президент.рф'
'type':
'type': 'string'
'example': 'A'
diff --git a/scripts/hooks/pre-commit b/scripts/hooks/pre-commit
index e38e9aa5..6c2e5d34 100755
--- a/scripts/hooks/pre-commit
+++ b/scripts/hooks/pre-commit
@@ -4,7 +4,7 @@ set -e -f -u
# Show all temporary todos to the programmer but don't fail the commit
# if there are any, because the commit could be in a temporary branch.
-git grep -e 'TODO.*!!' -- ':!HACKING.md' ':!scripts/hooks/pre-commit' | more || :
+git grep -e 'TODO.*!!' -- ':!HACKING.md' ':!scripts/hooks/pre-commit' | cat || :
if [ "$( git diff --cached --name-only -- 'client/*.js' )" ]
then