mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-15 03:02:07 +03:00
f84ff2bd05
Merge in DNS/adguard-home from AG-25263-dns-config to master Squashed commit of the following: commit 478b607526391af65de67d6d7f1d904198610cdf Merge: b944d12fa51340adb3
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Sep 4 18:04:56 2023 +0400 Merge remote-tracking branch 'origin/master' into AG-25263-dns-config commit b944d12fa812b05b9d9f22d2287425ca36630329 Merge: b474f712f0182b9ec1
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Sep 1 09:13:36 2023 +0400 Merge remote-tracking branch 'origin/master' into AG-25263-dns-config # Conflicts: # internal/dnsforward/dnsforward.go commit b474f712f64daa1a7d7e32d89edc901d2f273c9a Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Sep 1 09:11:17 2023 +0400 all: imp code commit 635a316b8244f13d90a8fe2209f1673c0765aaa9 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Aug 30 16:18:25 2023 +0300 all: dnsfilter rm config embed commit 5aa6212e89bc38e3d283b8d6b1a78726d10b3f3a Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Aug 30 12:45:01 2023 +0300 all: dnsfilter rm config embed
172 lines
3.9 KiB
Go
172 lines
3.9 KiB
Go
package filtering
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"golang.org/x/exp/slices"
|
|
)
|
|
|
|
// TODO(d.kolyshev): Use [rewrite.Item] instead.
|
|
type rewriteEntryJSON struct {
|
|
Domain string `json:"domain"`
|
|
Answer string `json:"answer"`
|
|
}
|
|
|
|
// handleRewriteList is the handler for the GET /control/rewrite/list HTTP API.
|
|
func (d *DNSFilter) handleRewriteList(w http.ResponseWriter, r *http.Request) {
|
|
arr := []*rewriteEntryJSON{}
|
|
|
|
func() {
|
|
d.confMu.RLock()
|
|
defer d.confMu.RUnlock()
|
|
|
|
for _, ent := range d.conf.Rewrites {
|
|
jsonEnt := rewriteEntryJSON{
|
|
Domain: ent.Domain,
|
|
Answer: ent.Answer,
|
|
}
|
|
arr = append(arr, &jsonEnt)
|
|
}
|
|
}()
|
|
|
|
aghhttp.WriteJSONResponseOK(w, r, arr)
|
|
}
|
|
|
|
// handleRewriteAdd is the handler for the POST /control/rewrite/add HTTP API.
|
|
func (d *DNSFilter) handleRewriteAdd(w http.ResponseWriter, r *http.Request) {
|
|
rwJSON := rewriteEntryJSON{}
|
|
err := json.NewDecoder(r.Body).Decode(&rwJSON)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "json.Decode: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
rw := &LegacyRewrite{
|
|
Domain: rwJSON.Domain,
|
|
Answer: rwJSON.Answer,
|
|
}
|
|
|
|
err = rw.normalize()
|
|
if err != nil {
|
|
// Shouldn't happen currently, since normalize only returns a non-nil
|
|
// error when a rewrite is nil, but be change-proof.
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "normalizing: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
func() {
|
|
d.confMu.Lock()
|
|
defer d.confMu.Unlock()
|
|
|
|
d.conf.Rewrites = append(d.conf.Rewrites, rw)
|
|
log.Debug(
|
|
"rewrite: added element: %s -> %s [%d]",
|
|
rw.Domain,
|
|
rw.Answer,
|
|
len(d.conf.Rewrites),
|
|
)
|
|
}()
|
|
|
|
d.conf.ConfigModified()
|
|
}
|
|
|
|
// handleRewriteDelete is the handler for the POST /control/rewrite/delete HTTP
|
|
// API.
|
|
func (d *DNSFilter) handleRewriteDelete(w http.ResponseWriter, r *http.Request) {
|
|
jsent := rewriteEntryJSON{}
|
|
err := json.NewDecoder(r.Body).Decode(&jsent)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "json.Decode: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
entDel := &LegacyRewrite{
|
|
Domain: jsent.Domain,
|
|
Answer: jsent.Answer,
|
|
}
|
|
arr := []*LegacyRewrite{}
|
|
|
|
func() {
|
|
d.confMu.Lock()
|
|
defer d.confMu.Unlock()
|
|
|
|
for _, ent := range d.conf.Rewrites {
|
|
if ent.equal(entDel) {
|
|
log.Debug("rewrite: removed element: %s -> %s", ent.Domain, ent.Answer)
|
|
|
|
continue
|
|
}
|
|
|
|
arr = append(arr, ent)
|
|
}
|
|
d.conf.Rewrites = arr
|
|
}()
|
|
|
|
d.conf.ConfigModified()
|
|
}
|
|
|
|
// rewriteUpdateJSON is a struct for JSON object with rewrite rule update info.
|
|
type rewriteUpdateJSON struct {
|
|
Target rewriteEntryJSON `json:"target"`
|
|
Update rewriteEntryJSON `json:"update"`
|
|
}
|
|
|
|
// handleRewriteUpdate is the handler for the PUT /control/rewrite/update HTTP
|
|
// API.
|
|
func (d *DNSFilter) handleRewriteUpdate(w http.ResponseWriter, r *http.Request) {
|
|
updateJSON := rewriteUpdateJSON{}
|
|
err := json.NewDecoder(r.Body).Decode(&updateJSON)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "json.Decode: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
rwDel := &LegacyRewrite{
|
|
Domain: updateJSON.Target.Domain,
|
|
Answer: updateJSON.Target.Answer,
|
|
}
|
|
|
|
rwAdd := &LegacyRewrite{
|
|
Domain: updateJSON.Update.Domain,
|
|
Answer: updateJSON.Update.Answer,
|
|
}
|
|
|
|
err = rwAdd.normalize()
|
|
if err != nil {
|
|
// Shouldn't happen currently, since normalize only returns a non-nil
|
|
// error when a rewrite is nil, but be change-proof.
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "normalizing: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
index := -1
|
|
defer func() {
|
|
if index >= 0 {
|
|
d.conf.ConfigModified()
|
|
}
|
|
}()
|
|
|
|
d.confMu.Lock()
|
|
defer d.confMu.Unlock()
|
|
|
|
index = slices.IndexFunc(d.conf.Rewrites, rwDel.equal)
|
|
if index == -1 {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "target rule not found")
|
|
|
|
return
|
|
}
|
|
|
|
d.conf.Rewrites = slices.Replace(d.conf.Rewrites, index, index+1, rwAdd)
|
|
|
|
log.Debug("rewrite: removed element: %s -> %s", rwDel.Domain, rwDel.Answer)
|
|
log.Debug("rewrite: added element: %s -> %s", rwAdd.Domain, rwAdd.Answer)
|
|
}
|