mirror of
https://git.vectorsigma.ru/public/AdGuardHome.git
synced 2026-07-29 01:29:31 +00:00
Merge in DNS/adguard-home from AGDNS-3061-config-modifier to master Squashed commit of the following: commit a0068547bd0209d12e8dbf98ddd5e4ed2545cdd0 Merge: 97b798af6451255675Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Aug 5 17:39:31 2025 +0300 Merge branch 'master' into AGDNS-3061-config-modifier commit 97b798af6a50ee27ee5ed2bcf1c4c3670f5afc5d Merge: 96d21efc9b8043e4f0Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jul 30 20:27:41 2025 +0300 Merge branch 'master' into AGDNS-3061-config-modifier commit 96d21efc984073adef5026de8a03b5bf94542648 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jul 30 20:18:43 2025 +0300 all: imp code commit 67c5608b4be3bd712a0ab5980f25ecea1ed21d65 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jul 29 20:31:19 2025 +0300 all: imp code commit 52f45a9f70f57d8e7f7fc0e9e8291ff0dde74343 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Jul 28 20:32:13 2025 +0300 all: use config modifier commit d389ffd286460d8ff1964bd2ee8dabdafb832b9b Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jul 25 14:20:31 2025 +0300 bamboo-specs: fix ci commit 3f303ac9131a07e4af5783696b237436fd93d65c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jul 25 14:18:42 2025 +0300 home: config modifier
192 lines
4.1 KiB
Go
192 lines
4.1 KiB
Go
package filtering
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
"slices"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
|
|
)
|
|
|
|
// 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) {
|
|
ctx := r.Context()
|
|
|
|
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(ctx, d.logger)
|
|
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)
|
|
d.logger.DebugContext(
|
|
ctx,
|
|
"added rewrite element",
|
|
"domain", rw.Domain,
|
|
"answer", rw.Answer,
|
|
"rewrites_len", len(d.conf.Rewrites),
|
|
)
|
|
}()
|
|
|
|
d.conf.ConfModifier.Apply(ctx)
|
|
}
|
|
|
|
// handleRewriteDelete is the handler for the POST /control/rewrite/delete HTTP
|
|
// API.
|
|
func (d *DNSFilter) handleRewriteDelete(w http.ResponseWriter, r *http.Request) {
|
|
ctx := r.Context()
|
|
|
|
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{}
|
|
|
|
defer d.conf.ConfModifier.Apply(ctx)
|
|
|
|
d.confMu.Lock()
|
|
defer d.confMu.Unlock()
|
|
|
|
for _, ent := range d.conf.Rewrites {
|
|
if !ent.equal(entDel) {
|
|
arr = append(arr, ent)
|
|
|
|
continue
|
|
}
|
|
|
|
d.logger.DebugContext(
|
|
ctx,
|
|
"removed rewrite element",
|
|
"domain", ent.Domain,
|
|
"answer", ent.Answer,
|
|
)
|
|
}
|
|
|
|
d.conf.Rewrites = arr
|
|
}
|
|
|
|
// 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) {
|
|
ctx := r.Context()
|
|
|
|
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(ctx, d.logger)
|
|
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.ConfModifier.Apply(ctx)
|
|
}
|
|
}()
|
|
|
|
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)
|
|
|
|
d.logger.DebugContext(
|
|
ctx,
|
|
"removed rewrite element",
|
|
"domain", rwDel.Domain,
|
|
"answer", rwDel.Answer,
|
|
)
|
|
d.logger.DebugContext(
|
|
ctx,
|
|
"added rewrite element",
|
|
"domain", rwAdd.Domain,
|
|
"answer", rwAdd.Answer,
|
|
)
|
|
}
|