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

Pull request: fix querylog bug

Browse Source 
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master

Closes #2345.

Squashed commit of the following:

commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Nov 27 12:14:49 2020 +0300

    all: make changelog more humanly readable.

commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Nov 26 14:43:14 2020 +0300

    all: log changes

commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Nov 26 14:42:18 2020 +0300

    Merge branch 'master' into 2345-querylog-bug-fix

commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Nov 26 14:02:57 2020 +0300

    querylog: fix json parsing bug
This commit is contained in:
Eugene Burkov
2020-11-27 12:33:25 +03:00
parent 96e83a133f
commit f9e4e7b024
3 changed files with 87 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
internal/querylog/decode.go
View File

@@ -3,7 +3,7 @@ package querylog
import (
"encoding/base64"
"encoding/json"
"strconv"
"io"
"strings"
"time"
@@ -84,15 +84,11 @@ var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
v, ok := t.(bool)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
ent.Result.IsFiltered = v
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
@@ -104,23 +100,23 @@ var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
v, ok := t.(json.Number)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
i, err := v.Int64()
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
ent.Result.FilterID = i
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
v, ok := t.(json.Number)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
i, err := v.Int64()
if err != nil {
return err
}
@@ -144,17 +140,20 @@ var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
return nil
},
"Elapsed": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
v, ok := t.(json.Number)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
i, err := v.Int64()
if err != nil {
return err
}
ent.Elapsed = time.Duration(i)
return nil
},
"Result": func(json.Token, *logEntry) error {
return nil
},
"Question": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
@@ -192,10 +191,13 @@ var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
func decodeLogEntry(ent *logEntry, str string) {
dec := json.NewDecoder(strings.NewReader(str))
for dec.More() {
dec.UseNumber()
for {
keyToken, err := dec.Token()
if err != nil {
log.Debug("decodeLogEntry err: %s", err)
if err != io.EOF {
log.Debug("decodeLogEntry err: %s", err)
}
return
}
if _, ok := keyToken.(json.Delim); ok {
@@ -203,15 +205,16 @@ func decodeLogEntry(ent *logEntry, str string) {
}
key := keyToken.(string)
handler, ok := logEntryHandlers[key]
value, err := dec.Token()
if !ok {
continue
}
val, err := dec.Token()
if err != nil {
return
}
if ok {
if err := handler(value, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
}
if err := handler(val, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
}
}
}