From 47b2aa94c56b37be492c3c01e8111054612d9722 Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Thu, 17 Dec 2020 13:12:27 +0300 Subject: [PATCH] querylog: remove pre-v0.99.3 compatibility code --- CHANGELOG.md | 2 ++ internal/querylog/decode.go | 34 -------------------------------- internal/querylog/decode_test.go | 14 +------------ 3 files changed, 3 insertions(+), 47 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec60ee3c1d1..fda4fe42d7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,7 +67,9 @@ and this project adheres to [#2345]: https://github.com/AdguardTeam/AdGuardHome/issues/2345 [#2355]: https://github.com/AdguardTeam/AdGuardHome/issues/2355 +### Removed +- Support for pre-v0.99.3 format of query logs ([#2102]). ## [v0.104.3] - 2020-11-19 diff --git a/internal/querylog/decode.go b/internal/querylog/decode.go index 363c4258ec6..f59377811e6 100644 --- a/internal/querylog/decode.go +++ b/internal/querylog/decode.go @@ -9,7 +9,6 @@ import ( "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" "github.com/AdguardTeam/golibs/log" - "github.com/miekg/dns" ) type logEntryHandler (func(t json.Token, ent *logEntry) error) @@ -105,39 +104,6 @@ var logEntryHandlers = map[string]logEntryHandler{ ent.Elapsed = time.Duration(i) return nil }, - "Question": func(t json.Token, ent *logEntry) error { - v, ok := t.(string) - if !ok { - return nil - } - var qstr []byte - qstr, err := base64.StdEncoding.DecodeString(v) - if err != nil { - return err - } - q := new(dns.Msg) - err = q.Unpack(qstr) - if err != nil { - return err - } - ent.QHost = q.Question[0].Name - if len(ent.QHost) == 0 { - return nil // nil??? - } - ent.QHost = ent.QHost[:len(ent.QHost)-1] - ent.QType = dns.TypeToString[q.Question[0].Qtype] - ent.QClass = dns.ClassToString[q.Question[0].Qclass] - return nil - }, - "Time": func(t json.Token, ent *logEntry) error { - v, ok := t.(string) - if !ok { - return nil - } - var err error - ent.Time, err = time.Parse(time.RFC3339, v) - return err - }, } var resultHandlers = map[string]logEntryHandler{ diff --git a/internal/querylog/decode_test.go b/internal/querylog/decode_test.go index 1db5b788c2f..d9cbd6002a4 100644 --- a/internal/querylog/decode_test.go +++ b/internal/querylog/decode_test.go @@ -21,19 +21,7 @@ func TestDecode_decodeQueryLog(t *testing.T) { log string want string }{{ - name: "back_compatibility_all_right", - log: `{"Question":"ULgBAAABAAAAAAAAC2FkZ3VhcmR0ZWFtBmdpdGh1YgJpbwAAHAAB","Answer":"ULiBgAABAAAAAQAAC2FkZ3VhcmR0ZWFtBmdpdGh1YgJpbwAAHAABwBgABgABAAADQgBLB25zLTE2MjIJYXdzZG5zLTEwAmNvAnVrABFhd3NkbnMtaG9zdG1hc3RlcgZhbWF6b24DY29tAAAAAAEAABwgAAADhAASdQAAAVGA","Result":{},"Time":"2020-11-13T12:41:25.970861+03:00","Elapsed":244066501,"IP":"127.0.0.1","Upstream":"https://1.1.1.1:443/dns-query"}`, - want: "default", - }, { - name: "back_compatibility_bad_msg", - log: `{"Question":"","Answer":"ULiBgAABAAAAAQAAC2FkZ3VhcmR0ZWFtBmdpdGh1YgJpbwAAHAABwBgABgABAAADQgBLB25zLTE2MjIJYXdzZG5zLTEwAmNvAnVrABFhd3NkbnMtaG9zdG1hc3RlcgZhbWF6b24DY29tAAAAAAEAABwgAAADhAASdQAAAVGA","Result":{},"Time":"2020-11-13T12:41:25.970861+03:00","Elapsed":244066501,"IP":"127.0.0.1","Upstream":"https://1.1.1.1:443/dns-query"}`, - want: "decodeLogEntry handler err: dns: overflow unpacking uint16\n", - }, { - name: "back_compatibility_bad_decoding", - log: `{"Question":"LgBAAABAAAAAAAAC2FkZ3VhcmR0ZWFtBmdpdGh1YgJpbwAAHAAB","Answer":"ULiBgAABAAAAAQAAC2FkZ3VhcmR0ZWFtBmdpdGh1YgJpbwAAHAABwBgABgABAAADQgBLB25zLTE2MjIJYXdzZG5zLTEwAmNvAnVrABFhd3NkbnMtaG9zdG1hc3RlcgZhbWF6b24DY29tAAAAAAEAABwgAAADhAASdQAAAVGA","Result":{},"Time":"2020-11-13T12:41:25.970861+03:00","Elapsed":244066501,"IP":"127.0.0.1","Upstream":"https://1.1.1.1:443/dns-query"}`, - want: "decodeLogEntry handler err: illegal base64 data at input byte 48\n", - }, { - name: "modern_all_right", + name: "all_right", log: `{"IP":"127.0.0.1","T":"2020-11-25T18:55:56.519796+03:00","QH":"an.yandex.ru","QT":"A","QC":"IN","CP":"","Answer":"Qz+BgAABAAEAAAAAAmFuBnlhbmRleAJydQAAAQABwAwAAQABAAAACgAEAAAAAA==","Result":{"IsFiltered":true,"Reason":3,"Rule":"||an.yandex.","FilterID":1},"Elapsed":837429}`, want: "default", }, {