From 55a0dec14487be9b55e0eb0f636d70d373b92db4 Mon Sep 17 00:00:00 2001 From: Dimitry Kolyshev Date: Tue, 6 Dec 2022 12:35:05 +0200 Subject: [PATCH] all: imp code --- internal/filtering/filtering.go | 2 +- internal/filtering/rewritehttp.go | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/internal/filtering/filtering.go b/internal/filtering/filtering.go index 74f006b2..e552a16e 100644 --- a/internal/filtering/filtering.go +++ b/internal/filtering/filtering.go @@ -945,7 +945,7 @@ func New(c *Config, blockFilters []Filter) (d *DNSFilter, err error) { d.rewriteStorage, err = rewrite.NewDefaultStorage(RewritesListID, d.Rewrites) if err != nil { - return nil, fmt.Errorf("rewrites: init: %s", err) + return nil, fmt.Errorf("rewrites: init: %w", err) } bsvcs := []string{} diff --git a/internal/filtering/rewritehttp.go b/internal/filtering/rewritehttp.go index 3b3cad7e..be792f9c 100644 --- a/internal/filtering/rewritehttp.go +++ b/internal/filtering/rewritehttp.go @@ -9,16 +9,15 @@ import ( "github.com/AdguardTeam/golibs/log" ) +// handleRewriteList is the handler for the GET /control/rewrite/list HTTP API. func (d *DNSFilter) handleRewriteList(w http.ResponseWriter, r *http.Request) { - d.confLock.RLock() - defer d.confLock.RUnlock() - _ = aghhttp.WriteJSONResponse(w, r, d.rewriteStorage.List()) } +// handleRewriteAdd is the handler for the POST /control/rewrite/add HTTP API. func (d *DNSFilter) handleRewriteAdd(w http.ResponseWriter, r *http.Request) { - rw := rewrite.Item{} - err := json.NewDecoder(r.Body).Decode(&rw) + rw := &rewrite.Item{} + err := json.NewDecoder(r.Body).Decode(rw) if err != nil { aghhttp.Error(r, w, http.StatusBadRequest, "json.Decode: %s", err) @@ -28,7 +27,7 @@ func (d *DNSFilter) handleRewriteAdd(w http.ResponseWriter, r *http.Request) { d.confLock.Lock() defer d.confLock.Unlock() - err = d.rewriteStorage.Add(&rw) + err = d.rewriteStorage.Add(rw) if err != nil { aghhttp.Error(r, w, http.StatusBadRequest, "add rewrite: %s", err) @@ -40,6 +39,8 @@ func (d *DNSFilter) handleRewriteAdd(w http.ResponseWriter, r *http.Request) { d.Config.ConfigModified() } +// handleRewriteDelete is the handler for the POST /control/rewrite/delete HTTP +// API. func (d *DNSFilter) handleRewriteDelete(w http.ResponseWriter, r *http.Request) { entDel := rewrite.Item{} err := json.NewDecoder(r.Body).Decode(&entDel)