mirror of
https://git.vectorsigma.ru/public/AdGuardHome.git
synced 2026-07-29 00:39:06 +00:00
Merge in DNS/adguard-home from AGDNS-2374-imp-filtering-slog to master
Squashed commit of the following:
commit 6040411aa2eeea62305acd3d99a6ea88a3998f38
Merge: 880c024ce 3c05f7799
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jul 9 09:32:45 2025 +0400
Merge remote-tracking branch 'origin/master' into AGDNS-2374-imp-filtering-slog
commit 880c024ce2ea2190fae4794c262eef3d4ec90687
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jul 1 16:54:08 2025 +0400
all: imp code
commit de62c55be126c2214e6576a39b07405a6e451aa6
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 30 15:16:58 2025 +0400
filtering: slog
commit 9bc1abfac1b9d183fe44e56d2b57b73d6507441a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 30 15:13:24 2025 +0400
filtering: slog
commit 88b251e974f78832b1fb4b149c2314471a931490
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 30 14:13:37 2025 +0400
filtering: slog
commit 2a6939865d8398c075d1eae2f9315bb81238b9ff
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 30 12:29:48 2025 +0400
all: init filtering logger
commit 94609444fb54b3a996806606ec7014aec8dcc65e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 30 11:43:51 2025 +0400
filtering: imp rewrite
commit 84544cce8a65ad4cf6af793b0aaf55a902f0109f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 30 11:39:58 2025 +0400
filtering: imp hashprefix
commit b88d8799c04c2a45ba43aa1ebd614347686a4148
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Jun 27 13:07:09 2025 +0400
filtering: imp hashprefix
commit 904a847684d6e6d3aa55dfc478d5b6c4dc8767db
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Jun 27 12:57:14 2025 +0400
filtering: rewrite slog
commit 2669388fea2ba4b2e0d470d780714429b43d246b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Jun 27 12:36:34 2025 +0400
filtering: hashprefix slog
188 lines
4.1 KiB
Go
188 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) {
|
|
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(r.Context(), 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(
|
|
r.Context(),
|
|
"added rewrite element",
|
|
"domain", rw.Domain,
|
|
"answer", rw.Answer,
|
|
"rewrites_len", 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) {
|
|
d.logger.DebugContext(
|
|
r.Context(),
|
|
"removed rewrite element",
|
|
"domain", ent.Domain,
|
|
"answer", 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(r.Context(), 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.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)
|
|
|
|
ctx := r.Context()
|
|
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,
|
|
)
|
|
}
|