all: imp code

This commit is contained in:
Dimitry Kolyshev
2022-12-06 12:35:05 +02:00
parent 6b607e982b
commit 55a0dec144
2 changed files with 8 additions and 7 deletions

View File

@@ -945,7 +945,7 @@ func New(c *Config, blockFilters []Filter) (d *DNSFilter, err error) {
d.rewriteStorage, err = rewrite.NewDefaultStorage(RewritesListID, d.Rewrites) d.rewriteStorage, err = rewrite.NewDefaultStorage(RewritesListID, d.Rewrites)
if err != nil { if err != nil {
return nil, fmt.Errorf("rewrites: init: %s", err) return nil, fmt.Errorf("rewrites: init: %w", err)
} }
bsvcs := []string{} bsvcs := []string{}

View File

@@ -9,16 +9,15 @@ import (
"github.com/AdguardTeam/golibs/log" "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) { func (d *DNSFilter) handleRewriteList(w http.ResponseWriter, r *http.Request) {
d.confLock.RLock()
defer d.confLock.RUnlock()
_ = aghhttp.WriteJSONResponse(w, r, d.rewriteStorage.List()) _ = 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) { func (d *DNSFilter) handleRewriteAdd(w http.ResponseWriter, r *http.Request) {
rw := rewrite.Item{} rw := &rewrite.Item{}
err := json.NewDecoder(r.Body).Decode(&rw) err := json.NewDecoder(r.Body).Decode(rw)
if err != nil { if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "json.Decode: %s", err) 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() d.confLock.Lock()
defer d.confLock.Unlock() defer d.confLock.Unlock()
err = d.rewriteStorage.Add(&rw) err = d.rewriteStorage.Add(rw)
if err != nil { if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, "add rewrite: %s", err) 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() 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) { func (d *DNSFilter) handleRewriteDelete(w http.ResponseWriter, r *http.Request) {
entDel := rewrite.Item{} entDel := rewrite.Item{}
err := json.NewDecoder(r.Body).Decode(&entDel) err := json.NewDecoder(r.Body).Decode(&entDel)