AdGuardHome/internal/filtering/rewritehttp.go

172 lines
3.9 KiB
Go
Raw Normal View History

Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to master Squashed commit of the following: commit 6303107d6ca7dd88175e4e123128189e5958f060 Merge: e2040b95 09f88cf2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 13:38:01 2022 +0200 Merge remote-tracking branch 'origin/master' into 2499-rewrites-1 commit e2040b95dd3157d033d929bb45fc7662b9918a78 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 12:00:21 2022 +0200 rewrite: item commit c7278e8adeec1ba3a090cc93db30c80699617c52 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sun Dec 4 12:57:59 2022 +0200 rewrite: imp code commit d23a740262a4fbdd9b25f7449ced707c0d2be634 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:08:25 2022 +0200 rewrite: imp code commit 773a5211b6662afd03a34219e7114c6f1e2bb579 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:05:20 2022 +0200 rewrite: imp code commit 48b54e19da9844d9b868d0be7e428ad6bacae6a5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:02:47 2022 +0200 rewrite: tests item commit 62af2bd91f5559840e7948ac4bf7c36b1bee1dc2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:11:21 2022 +0200 rewrite: tests commit f040b609391cb2275b11d4732bbac0380c01de07 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:04:59 2022 +0200 rewrite: imp code commit 4592b8c4e6107e5a746261d3335282827ce36b74 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:02:31 2022 +0200 rewrite: imp code commit cc1660695341c558dbac6acaa31ac160a45f6105 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 16:19:27 2022 +0200 rewrite: imp code commit cf3840b76d45bf319630256c01586159dd1e85fe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 13:16:40 2022 +0200 rewrite: tests commit 6fd6f03ca4320d4345032139b43cb457b3ae4278 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 11:14:44 2022 +0200 rewrite: imp code commit 2ebd2a1e79afc8f486cf6533968c51ca61bc03ab Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 11:43:24 2022 +0200 rewrite: tests commit 7da987994303a3e7b16eb6b0baaa4b59a52b97be Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 10:54:57 2022 +0200 filtering: imp code commit ab98efc6710fac7cba28dab5bca9b60e9ec34ef7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Nov 28 13:31:12 2022 +0200 filtering: rewritehttp
2022-12-05 14:46:51 +03:00
package filtering
import (
"encoding/json"
"net/http"
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
"github.com/AdguardTeam/golibs/log"
Pull request: 1577: rewrite edit http api Merge in DNS/adguard-home from 1577-rewrite-edit to master Squashed commit of the following: commit d03bee2a14337d169eea950b3df18a447c02b422 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri May 12 12:54:15 2023 +0300 filtering: imp tests commit bd68320df6dc057d922d91551cd00c74ebfaad6c Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri May 12 10:38:12 2023 +0300 filtering: rewrite http tests commit 0d8bbcd0194c0db89a6d4b45927669423c9bbb59 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu May 11 12:06:30 2023 +0300 filtering: rewrite http tests commit 29080384dd8fa80d5286d2fac1a4429d712bbafa Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 17:24:00 2023 +0300 filtering: imp code commit 96c6b1c98debfae565c5e6254746959a4307744e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:56:32 2023 +0300 filtering: imp code commit b5d0c50ea11f9d829ba9d2b188fcc471a965e012 Merge: 5fa9e1c37 c77b2a0ce Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:37:19 2023 +0300 Merge remote-tracking branch 'origin/master' into 1577-rewrite-edit commit 5fa9e1c3714e107f893c03efa72227f3ed88691c Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:35:19 2023 +0300 filtering: imp code commit dd9dce8fbf0ce4bd200f2fc2fbf580e025920cd5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 13:06:43 2023 +0300 docs: rewrite http update commit 0c67b040e80787b084c4669bb20db8d6d145fc1b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 13:04:31 2023 +0300 filtering: rewrite http update
2023-05-12 13:04:19 +03:00
"golang.org/x/exp/slices"
Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to master Squashed commit of the following: commit 6303107d6ca7dd88175e4e123128189e5958f060 Merge: e2040b95 09f88cf2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 13:38:01 2022 +0200 Merge remote-tracking branch 'origin/master' into 2499-rewrites-1 commit e2040b95dd3157d033d929bb45fc7662b9918a78 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 12:00:21 2022 +0200 rewrite: item commit c7278e8adeec1ba3a090cc93db30c80699617c52 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sun Dec 4 12:57:59 2022 +0200 rewrite: imp code commit d23a740262a4fbdd9b25f7449ced707c0d2be634 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:08:25 2022 +0200 rewrite: imp code commit 773a5211b6662afd03a34219e7114c6f1e2bb579 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:05:20 2022 +0200 rewrite: imp code commit 48b54e19da9844d9b868d0be7e428ad6bacae6a5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:02:47 2022 +0200 rewrite: tests item commit 62af2bd91f5559840e7948ac4bf7c36b1bee1dc2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:11:21 2022 +0200 rewrite: tests commit f040b609391cb2275b11d4732bbac0380c01de07 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:04:59 2022 +0200 rewrite: imp code commit 4592b8c4e6107e5a746261d3335282827ce36b74 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:02:31 2022 +0200 rewrite: imp code commit cc1660695341c558dbac6acaa31ac160a45f6105 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 16:19:27 2022 +0200 rewrite: imp code commit cf3840b76d45bf319630256c01586159dd1e85fe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 13:16:40 2022 +0200 rewrite: tests commit 6fd6f03ca4320d4345032139b43cb457b3ae4278 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 11:14:44 2022 +0200 rewrite: imp code commit 2ebd2a1e79afc8f486cf6533968c51ca61bc03ab Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 11:43:24 2022 +0200 rewrite: tests commit 7da987994303a3e7b16eb6b0baaa4b59a52b97be Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 10:54:57 2022 +0200 filtering: imp code commit ab98efc6710fac7cba28dab5bca9b60e9ec34ef7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Nov 28 13:31:12 2022 +0200 filtering: rewritehttp
2022-12-05 14:46:51 +03:00
)
// 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.
Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to master Squashed commit of the following: commit 6303107d6ca7dd88175e4e123128189e5958f060 Merge: e2040b95 09f88cf2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 13:38:01 2022 +0200 Merge remote-tracking branch 'origin/master' into 2499-rewrites-1 commit e2040b95dd3157d033d929bb45fc7662b9918a78 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 12:00:21 2022 +0200 rewrite: item commit c7278e8adeec1ba3a090cc93db30c80699617c52 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sun Dec 4 12:57:59 2022 +0200 rewrite: imp code commit d23a740262a4fbdd9b25f7449ced707c0d2be634 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:08:25 2022 +0200 rewrite: imp code commit 773a5211b6662afd03a34219e7114c6f1e2bb579 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:05:20 2022 +0200 rewrite: imp code commit 48b54e19da9844d9b868d0be7e428ad6bacae6a5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:02:47 2022 +0200 rewrite: tests item commit 62af2bd91f5559840e7948ac4bf7c36b1bee1dc2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:11:21 2022 +0200 rewrite: tests commit f040b609391cb2275b11d4732bbac0380c01de07 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:04:59 2022 +0200 rewrite: imp code commit 4592b8c4e6107e5a746261d3335282827ce36b74 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:02:31 2022 +0200 rewrite: imp code commit cc1660695341c558dbac6acaa31ac160a45f6105 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 16:19:27 2022 +0200 rewrite: imp code commit cf3840b76d45bf319630256c01586159dd1e85fe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 13:16:40 2022 +0200 rewrite: tests commit 6fd6f03ca4320d4345032139b43cb457b3ae4278 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 11:14:44 2022 +0200 rewrite: imp code commit 2ebd2a1e79afc8f486cf6533968c51ca61bc03ab Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 11:43:24 2022 +0200 rewrite: tests commit 7da987994303a3e7b16eb6b0baaa4b59a52b97be Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 10:54:57 2022 +0200 filtering: imp code commit ab98efc6710fac7cba28dab5bca9b60e9ec34ef7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Nov 28 13:31:12 2022 +0200 filtering: rewritehttp
2022-12-05 14:46:51 +03:00
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)
Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to master Squashed commit of the following: commit 6303107d6ca7dd88175e4e123128189e5958f060 Merge: e2040b95 09f88cf2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 13:38:01 2022 +0200 Merge remote-tracking branch 'origin/master' into 2499-rewrites-1 commit e2040b95dd3157d033d929bb45fc7662b9918a78 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 12:00:21 2022 +0200 rewrite: item commit c7278e8adeec1ba3a090cc93db30c80699617c52 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sun Dec 4 12:57:59 2022 +0200 rewrite: imp code commit d23a740262a4fbdd9b25f7449ced707c0d2be634 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:08:25 2022 +0200 rewrite: imp code commit 773a5211b6662afd03a34219e7114c6f1e2bb579 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:05:20 2022 +0200 rewrite: imp code commit 48b54e19da9844d9b868d0be7e428ad6bacae6a5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:02:47 2022 +0200 rewrite: tests item commit 62af2bd91f5559840e7948ac4bf7c36b1bee1dc2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:11:21 2022 +0200 rewrite: tests commit f040b609391cb2275b11d4732bbac0380c01de07 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:04:59 2022 +0200 rewrite: imp code commit 4592b8c4e6107e5a746261d3335282827ce36b74 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:02:31 2022 +0200 rewrite: imp code commit cc1660695341c558dbac6acaa31ac160a45f6105 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 16:19:27 2022 +0200 rewrite: imp code commit cf3840b76d45bf319630256c01586159dd1e85fe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 13:16:40 2022 +0200 rewrite: tests commit 6fd6f03ca4320d4345032139b43cb457b3ae4278 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 11:14:44 2022 +0200 rewrite: imp code commit 2ebd2a1e79afc8f486cf6533968c51ca61bc03ab Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 11:43:24 2022 +0200 rewrite: tests commit 7da987994303a3e7b16eb6b0baaa4b59a52b97be Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 10:54:57 2022 +0200 filtering: imp code commit ab98efc6710fac7cba28dab5bca9b60e9ec34ef7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Nov 28 13:31:12 2022 +0200 filtering: rewritehttp
2022-12-05 14:46:51 +03:00
}
}()
Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to master Squashed commit of the following: commit 6303107d6ca7dd88175e4e123128189e5958f060 Merge: e2040b95 09f88cf2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 13:38:01 2022 +0200 Merge remote-tracking branch 'origin/master' into 2499-rewrites-1 commit e2040b95dd3157d033d929bb45fc7662b9918a78 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 12:00:21 2022 +0200 rewrite: item commit c7278e8adeec1ba3a090cc93db30c80699617c52 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sun Dec 4 12:57:59 2022 +0200 rewrite: imp code commit d23a740262a4fbdd9b25f7449ced707c0d2be634 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:08:25 2022 +0200 rewrite: imp code commit 773a5211b6662afd03a34219e7114c6f1e2bb579 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:05:20 2022 +0200 rewrite: imp code commit 48b54e19da9844d9b868d0be7e428ad6bacae6a5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:02:47 2022 +0200 rewrite: tests item commit 62af2bd91f5559840e7948ac4bf7c36b1bee1dc2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:11:21 2022 +0200 rewrite: tests commit f040b609391cb2275b11d4732bbac0380c01de07 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:04:59 2022 +0200 rewrite: imp code commit 4592b8c4e6107e5a746261d3335282827ce36b74 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:02:31 2022 +0200 rewrite: imp code commit cc1660695341c558dbac6acaa31ac160a45f6105 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 16:19:27 2022 +0200 rewrite: imp code commit cf3840b76d45bf319630256c01586159dd1e85fe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 13:16:40 2022 +0200 rewrite: tests commit 6fd6f03ca4320d4345032139b43cb457b3ae4278 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 11:14:44 2022 +0200 rewrite: imp code commit 2ebd2a1e79afc8f486cf6533968c51ca61bc03ab Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 11:43:24 2022 +0200 rewrite: tests commit 7da987994303a3e7b16eb6b0baaa4b59a52b97be Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 10:54:57 2022 +0200 filtering: imp code commit ab98efc6710fac7cba28dab5bca9b60e9ec34ef7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Nov 28 13:31:12 2022 +0200 filtering: rewritehttp
2022-12-05 14:46:51 +03:00
Pull request 1907: 951-blocked-services-schedule-api Updates #951. Squashed commit of the following: commit 6b840fd516f5a87fde0420e3aceb9c239b22c974 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Aug 29 19:53:03 2023 +0300 client: imp docs more commit 7fc8f0363fbe4c4266cb0f67428fe4d18c351d2d Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Aug 29 19:40:00 2023 +0300 client: imp docs commit 00bc14d5760614f2797714cdc2c4c19b1a94b86e Author: Ildar Kamalov <ik@adguard.com> Date: Mon Aug 28 18:43:49 2023 +0300 try to fix lock file commit d749df74b576091e0b58928d86ea8b3b49f919da Merge: c69f9230b e1f6229e5 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Aug 28 18:14:02 2023 +0300 Merge branch 'master' into 951-blocked-services-schedule-api commit c69f9230b12f7c983db06b74324b3df77d74b32b Author: Ildar Kamalov <ik@adguard.com> Date: Mon Aug 28 17:16:20 2023 +0300 revert eslintrc commit b37916c2dff0ddea5293d87570bb58e3443d2d21 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Aug 28 12:02:39 2023 +0300 fix translations commit f5bb67d81506c687d0abd580049a3eee0af808e0 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Aug 28 11:43:57 2023 +0300 fix helpers commit 13ec6a8b3a0acfb62762ae7e46c6e98eb7c82212 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Aug 28 11:24:57 2023 +0300 remove todo commit 23724ec2fd683ed17b9f1cee841ad9aaf4c9d04f Author: Ildar Kamalov <ik@adguard.com> Date: Mon Aug 28 09:56:56 2023 +0300 add clients schedule form commit 84d29e558a329068e64e7a95ee183946aa4515b5 Author: Ildar Kamalov <ik@adguard.com> Date: Fri Aug 25 17:44:40 2023 +0300 fix schedule form commit 83e4017688082e9eb670091d5a24d98157050502 Author: Ildar Kamalov <ik@adguard.com> Date: Fri Aug 18 12:58:16 2023 +0300 remove unused commit ef2b68e138da382e3cf42586ae604e12d9493504 Author: Ildar Kamalov <ik@adguard.com> Date: Fri Aug 18 12:57:37 2023 +0300 client: fix translation string commit 32ea80c968f52f18adbc811b2f06874644cdfe20 Author: Ildar Kamalov <ik@adguard.com> Date: Fri Aug 18 12:26:26 2023 +0300 wip schedule commit 9b770873859186c9424c8d108812e32ddff33bad Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jul 21 14:29:50 2023 +0300 all: imp naming commit ea4e9514ea3b264bcce7f2a301db817de4e87059 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jul 19 18:09:27 2023 +0300 all: imp code commit 98a705bdaa5c1e79394c73e5d75af2416fe9f297 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jul 18 18:23:26 2023 +0300 all: imp naming commit 4f84b55c7bfc9f7b680feac0ec45f5ea9189299a Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jul 14 15:01:17 2023 +0300 all: add global schedule api commit 87cf1646869ee9138964b47a27b7493674c8854a Merge: cabb80ac1 2adc8624c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jul 14 12:09:29 2023 +0300 Merge branch 'master' into 951-blocked-services-schedule-api commit cabb80ac16de437a8118bb0166479574379c97a3 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jul 13 13:37:23 2023 +0300 openapi: fix typo commit 2279b03acbcfc3d76216f8aaf30ae1c7894127bc Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jul 13 12:26:19 2023 +0300 all: imp docs ... and 3 more commits
2023-08-29 20:03:40 +03:00
aghhttp.WriteJSONResponseOK(w, r, arr)
Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to master Squashed commit of the following: commit 6303107d6ca7dd88175e4e123128189e5958f060 Merge: e2040b95 09f88cf2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 13:38:01 2022 +0200 Merge remote-tracking branch 'origin/master' into 2499-rewrites-1 commit e2040b95dd3157d033d929bb45fc7662b9918a78 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 12:00:21 2022 +0200 rewrite: item commit c7278e8adeec1ba3a090cc93db30c80699617c52 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sun Dec 4 12:57:59 2022 +0200 rewrite: imp code commit d23a740262a4fbdd9b25f7449ced707c0d2be634 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:08:25 2022 +0200 rewrite: imp code commit 773a5211b6662afd03a34219e7114c6f1e2bb579 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:05:20 2022 +0200 rewrite: imp code commit 48b54e19da9844d9b868d0be7e428ad6bacae6a5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:02:47 2022 +0200 rewrite: tests item commit 62af2bd91f5559840e7948ac4bf7c36b1bee1dc2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:11:21 2022 +0200 rewrite: tests commit f040b609391cb2275b11d4732bbac0380c01de07 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:04:59 2022 +0200 rewrite: imp code commit 4592b8c4e6107e5a746261d3335282827ce36b74 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:02:31 2022 +0200 rewrite: imp code commit cc1660695341c558dbac6acaa31ac160a45f6105 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 16:19:27 2022 +0200 rewrite: imp code commit cf3840b76d45bf319630256c01586159dd1e85fe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 13:16:40 2022 +0200 rewrite: tests commit 6fd6f03ca4320d4345032139b43cb457b3ae4278 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 11:14:44 2022 +0200 rewrite: imp code commit 2ebd2a1e79afc8f486cf6533968c51ca61bc03ab Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 11:43:24 2022 +0200 rewrite: tests commit 7da987994303a3e7b16eb6b0baaa4b59a52b97be Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 10:54:57 2022 +0200 filtering: imp code commit ab98efc6710fac7cba28dab5bca9b60e9ec34ef7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Nov 28 13:31:12 2022 +0200 filtering: rewritehttp
2022-12-05 14:46:51 +03:00
}
// handleRewriteAdd is the handler for the POST /control/rewrite/add HTTP API.
Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to master Squashed commit of the following: commit 6303107d6ca7dd88175e4e123128189e5958f060 Merge: e2040b95 09f88cf2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 13:38:01 2022 +0200 Merge remote-tracking branch 'origin/master' into 2499-rewrites-1 commit e2040b95dd3157d033d929bb45fc7662b9918a78 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 12:00:21 2022 +0200 rewrite: item commit c7278e8adeec1ba3a090cc93db30c80699617c52 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sun Dec 4 12:57:59 2022 +0200 rewrite: imp code commit d23a740262a4fbdd9b25f7449ced707c0d2be634 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:08:25 2022 +0200 rewrite: imp code commit 773a5211b6662afd03a34219e7114c6f1e2bb579 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:05:20 2022 +0200 rewrite: imp code commit 48b54e19da9844d9b868d0be7e428ad6bacae6a5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:02:47 2022 +0200 rewrite: tests item commit 62af2bd91f5559840e7948ac4bf7c36b1bee1dc2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:11:21 2022 +0200 rewrite: tests commit f040b609391cb2275b11d4732bbac0380c01de07 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:04:59 2022 +0200 rewrite: imp code commit 4592b8c4e6107e5a746261d3335282827ce36b74 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:02:31 2022 +0200 rewrite: imp code commit cc1660695341c558dbac6acaa31ac160a45f6105 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 16:19:27 2022 +0200 rewrite: imp code commit cf3840b76d45bf319630256c01586159dd1e85fe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 13:16:40 2022 +0200 rewrite: tests commit 6fd6f03ca4320d4345032139b43cb457b3ae4278 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 11:14:44 2022 +0200 rewrite: imp code commit 2ebd2a1e79afc8f486cf6533968c51ca61bc03ab Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 11:43:24 2022 +0200 rewrite: tests commit 7da987994303a3e7b16eb6b0baaa4b59a52b97be Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 10:54:57 2022 +0200 filtering: imp code commit ab98efc6710fac7cba28dab5bca9b60e9ec34ef7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Nov 28 13:31:12 2022 +0200 filtering: rewritehttp
2022-12-05 14:46:51 +03:00
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),
)
}()
Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to master Squashed commit of the following: commit 6303107d6ca7dd88175e4e123128189e5958f060 Merge: e2040b95 09f88cf2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 13:38:01 2022 +0200 Merge remote-tracking branch 'origin/master' into 2499-rewrites-1 commit e2040b95dd3157d033d929bb45fc7662b9918a78 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 12:00:21 2022 +0200 rewrite: item commit c7278e8adeec1ba3a090cc93db30c80699617c52 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sun Dec 4 12:57:59 2022 +0200 rewrite: imp code commit d23a740262a4fbdd9b25f7449ced707c0d2be634 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:08:25 2022 +0200 rewrite: imp code commit 773a5211b6662afd03a34219e7114c6f1e2bb579 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:05:20 2022 +0200 rewrite: imp code commit 48b54e19da9844d9b868d0be7e428ad6bacae6a5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:02:47 2022 +0200 rewrite: tests item commit 62af2bd91f5559840e7948ac4bf7c36b1bee1dc2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:11:21 2022 +0200 rewrite: tests commit f040b609391cb2275b11d4732bbac0380c01de07 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:04:59 2022 +0200 rewrite: imp code commit 4592b8c4e6107e5a746261d3335282827ce36b74 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:02:31 2022 +0200 rewrite: imp code commit cc1660695341c558dbac6acaa31ac160a45f6105 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 16:19:27 2022 +0200 rewrite: imp code commit cf3840b76d45bf319630256c01586159dd1e85fe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 13:16:40 2022 +0200 rewrite: tests commit 6fd6f03ca4320d4345032139b43cb457b3ae4278 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 11:14:44 2022 +0200 rewrite: imp code commit 2ebd2a1e79afc8f486cf6533968c51ca61bc03ab Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 11:43:24 2022 +0200 rewrite: tests commit 7da987994303a3e7b16eb6b0baaa4b59a52b97be Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 10:54:57 2022 +0200 filtering: imp code commit ab98efc6710fac7cba28dab5bca9b60e9ec34ef7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Nov 28 13:31:12 2022 +0200 filtering: rewritehttp
2022-12-05 14:46:51 +03:00
d.conf.ConfigModified()
Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to master Squashed commit of the following: commit 6303107d6ca7dd88175e4e123128189e5958f060 Merge: e2040b95 09f88cf2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 13:38:01 2022 +0200 Merge remote-tracking branch 'origin/master' into 2499-rewrites-1 commit e2040b95dd3157d033d929bb45fc7662b9918a78 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 12:00:21 2022 +0200 rewrite: item commit c7278e8adeec1ba3a090cc93db30c80699617c52 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sun Dec 4 12:57:59 2022 +0200 rewrite: imp code commit d23a740262a4fbdd9b25f7449ced707c0d2be634 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:08:25 2022 +0200 rewrite: imp code commit 773a5211b6662afd03a34219e7114c6f1e2bb579 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:05:20 2022 +0200 rewrite: imp code commit 48b54e19da9844d9b868d0be7e428ad6bacae6a5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:02:47 2022 +0200 rewrite: tests item commit 62af2bd91f5559840e7948ac4bf7c36b1bee1dc2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:11:21 2022 +0200 rewrite: tests commit f040b609391cb2275b11d4732bbac0380c01de07 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:04:59 2022 +0200 rewrite: imp code commit 4592b8c4e6107e5a746261d3335282827ce36b74 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:02:31 2022 +0200 rewrite: imp code commit cc1660695341c558dbac6acaa31ac160a45f6105 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 16:19:27 2022 +0200 rewrite: imp code commit cf3840b76d45bf319630256c01586159dd1e85fe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 13:16:40 2022 +0200 rewrite: tests commit 6fd6f03ca4320d4345032139b43cb457b3ae4278 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 11:14:44 2022 +0200 rewrite: imp code commit 2ebd2a1e79afc8f486cf6533968c51ca61bc03ab Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 11:43:24 2022 +0200 rewrite: tests commit 7da987994303a3e7b16eb6b0baaa4b59a52b97be Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 10:54:57 2022 +0200 filtering: imp code commit ab98efc6710fac7cba28dab5bca9b60e9ec34ef7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Nov 28 13:31:12 2022 +0200 filtering: rewritehttp
2022-12-05 14:46:51 +03:00
}
// handleRewriteDelete is the handler for the POST /control/rewrite/delete HTTP
// API.
Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to master Squashed commit of the following: commit 6303107d6ca7dd88175e4e123128189e5958f060 Merge: e2040b95 09f88cf2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 13:38:01 2022 +0200 Merge remote-tracking branch 'origin/master' into 2499-rewrites-1 commit e2040b95dd3157d033d929bb45fc7662b9918a78 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 12:00:21 2022 +0200 rewrite: item commit c7278e8adeec1ba3a090cc93db30c80699617c52 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sun Dec 4 12:57:59 2022 +0200 rewrite: imp code commit d23a740262a4fbdd9b25f7449ced707c0d2be634 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:08:25 2022 +0200 rewrite: imp code commit 773a5211b6662afd03a34219e7114c6f1e2bb579 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:05:20 2022 +0200 rewrite: imp code commit 48b54e19da9844d9b868d0be7e428ad6bacae6a5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:02:47 2022 +0200 rewrite: tests item commit 62af2bd91f5559840e7948ac4bf7c36b1bee1dc2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:11:21 2022 +0200 rewrite: tests commit f040b609391cb2275b11d4732bbac0380c01de07 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:04:59 2022 +0200 rewrite: imp code commit 4592b8c4e6107e5a746261d3335282827ce36b74 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:02:31 2022 +0200 rewrite: imp code commit cc1660695341c558dbac6acaa31ac160a45f6105 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 16:19:27 2022 +0200 rewrite: imp code commit cf3840b76d45bf319630256c01586159dd1e85fe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 13:16:40 2022 +0200 rewrite: tests commit 6fd6f03ca4320d4345032139b43cb457b3ae4278 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 11:14:44 2022 +0200 rewrite: imp code commit 2ebd2a1e79afc8f486cf6533968c51ca61bc03ab Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 11:43:24 2022 +0200 rewrite: tests commit 7da987994303a3e7b16eb6b0baaa4b59a52b97be Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 10:54:57 2022 +0200 filtering: imp code commit ab98efc6710fac7cba28dab5bca9b60e9ec34ef7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Nov 28 13:31:12 2022 +0200 filtering: rewritehttp
2022-12-05 14:46:51 +03:00
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()
Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to master Squashed commit of the following: commit 6303107d6ca7dd88175e4e123128189e5958f060 Merge: e2040b95 09f88cf2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 13:38:01 2022 +0200 Merge remote-tracking branch 'origin/master' into 2499-rewrites-1 commit e2040b95dd3157d033d929bb45fc7662b9918a78 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 12:00:21 2022 +0200 rewrite: item commit c7278e8adeec1ba3a090cc93db30c80699617c52 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sun Dec 4 12:57:59 2022 +0200 rewrite: imp code commit d23a740262a4fbdd9b25f7449ced707c0d2be634 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:08:25 2022 +0200 rewrite: imp code commit 773a5211b6662afd03a34219e7114c6f1e2bb579 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:05:20 2022 +0200 rewrite: imp code commit 48b54e19da9844d9b868d0be7e428ad6bacae6a5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:02:47 2022 +0200 rewrite: tests item commit 62af2bd91f5559840e7948ac4bf7c36b1bee1dc2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:11:21 2022 +0200 rewrite: tests commit f040b609391cb2275b11d4732bbac0380c01de07 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:04:59 2022 +0200 rewrite: imp code commit 4592b8c4e6107e5a746261d3335282827ce36b74 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:02:31 2022 +0200 rewrite: imp code commit cc1660695341c558dbac6acaa31ac160a45f6105 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 16:19:27 2022 +0200 rewrite: imp code commit cf3840b76d45bf319630256c01586159dd1e85fe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 13:16:40 2022 +0200 rewrite: tests commit 6fd6f03ca4320d4345032139b43cb457b3ae4278 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 11:14:44 2022 +0200 rewrite: imp code commit 2ebd2a1e79afc8f486cf6533968c51ca61bc03ab Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 11:43:24 2022 +0200 rewrite: tests commit 7da987994303a3e7b16eb6b0baaa4b59a52b97be Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 10:54:57 2022 +0200 filtering: imp code commit ab98efc6710fac7cba28dab5bca9b60e9ec34ef7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Nov 28 13:31:12 2022 +0200 filtering: rewritehttp
2022-12-05 14:46:51 +03:00
for _, ent := range d.conf.Rewrites {
if ent.equal(entDel) {
log.Debug("rewrite: removed element: %s -> %s", ent.Domain, ent.Answer)
Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to master Squashed commit of the following: commit 6303107d6ca7dd88175e4e123128189e5958f060 Merge: e2040b95 09f88cf2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 13:38:01 2022 +0200 Merge remote-tracking branch 'origin/master' into 2499-rewrites-1 commit e2040b95dd3157d033d929bb45fc7662b9918a78 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 12:00:21 2022 +0200 rewrite: item commit c7278e8adeec1ba3a090cc93db30c80699617c52 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sun Dec 4 12:57:59 2022 +0200 rewrite: imp code commit d23a740262a4fbdd9b25f7449ced707c0d2be634 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:08:25 2022 +0200 rewrite: imp code commit 773a5211b6662afd03a34219e7114c6f1e2bb579 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:05:20 2022 +0200 rewrite: imp code commit 48b54e19da9844d9b868d0be7e428ad6bacae6a5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:02:47 2022 +0200 rewrite: tests item commit 62af2bd91f5559840e7948ac4bf7c36b1bee1dc2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:11:21 2022 +0200 rewrite: tests commit f040b609391cb2275b11d4732bbac0380c01de07 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:04:59 2022 +0200 rewrite: imp code commit 4592b8c4e6107e5a746261d3335282827ce36b74 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:02:31 2022 +0200 rewrite: imp code commit cc1660695341c558dbac6acaa31ac160a45f6105 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 16:19:27 2022 +0200 rewrite: imp code commit cf3840b76d45bf319630256c01586159dd1e85fe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 13:16:40 2022 +0200 rewrite: tests commit 6fd6f03ca4320d4345032139b43cb457b3ae4278 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 11:14:44 2022 +0200 rewrite: imp code commit 2ebd2a1e79afc8f486cf6533968c51ca61bc03ab Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 11:43:24 2022 +0200 rewrite: tests commit 7da987994303a3e7b16eb6b0baaa4b59a52b97be Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 10:54:57 2022 +0200 filtering: imp code commit ab98efc6710fac7cba28dab5bca9b60e9ec34ef7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Nov 28 13:31:12 2022 +0200 filtering: rewritehttp
2022-12-05 14:46:51 +03:00
continue
}
arr = append(arr, ent)
}
d.conf.Rewrites = arr
}()
Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to master Squashed commit of the following: commit 6303107d6ca7dd88175e4e123128189e5958f060 Merge: e2040b95 09f88cf2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 13:38:01 2022 +0200 Merge remote-tracking branch 'origin/master' into 2499-rewrites-1 commit e2040b95dd3157d033d929bb45fc7662b9918a78 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 12:00:21 2022 +0200 rewrite: item commit c7278e8adeec1ba3a090cc93db30c80699617c52 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sun Dec 4 12:57:59 2022 +0200 rewrite: imp code commit d23a740262a4fbdd9b25f7449ced707c0d2be634 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:08:25 2022 +0200 rewrite: imp code commit 773a5211b6662afd03a34219e7114c6f1e2bb579 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:05:20 2022 +0200 rewrite: imp code commit 48b54e19da9844d9b868d0be7e428ad6bacae6a5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:02:47 2022 +0200 rewrite: tests item commit 62af2bd91f5559840e7948ac4bf7c36b1bee1dc2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:11:21 2022 +0200 rewrite: tests commit f040b609391cb2275b11d4732bbac0380c01de07 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:04:59 2022 +0200 rewrite: imp code commit 4592b8c4e6107e5a746261d3335282827ce36b74 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:02:31 2022 +0200 rewrite: imp code commit cc1660695341c558dbac6acaa31ac160a45f6105 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 16:19:27 2022 +0200 rewrite: imp code commit cf3840b76d45bf319630256c01586159dd1e85fe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 13:16:40 2022 +0200 rewrite: tests commit 6fd6f03ca4320d4345032139b43cb457b3ae4278 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 11:14:44 2022 +0200 rewrite: imp code commit 2ebd2a1e79afc8f486cf6533968c51ca61bc03ab Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 11:43:24 2022 +0200 rewrite: tests commit 7da987994303a3e7b16eb6b0baaa4b59a52b97be Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 10:54:57 2022 +0200 filtering: imp code commit ab98efc6710fac7cba28dab5bca9b60e9ec34ef7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Nov 28 13:31:12 2022 +0200 filtering: rewritehttp
2022-12-05 14:46:51 +03:00
d.conf.ConfigModified()
Pull request: 2499 rewrite: storage vol.2 Merge in DNS/adguard-home from 2499-rewrites-1 to master Squashed commit of the following: commit 6303107d6ca7dd88175e4e123128189e5958f060 Merge: e2040b95 09f88cf2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 13:38:01 2022 +0200 Merge remote-tracking branch 'origin/master' into 2499-rewrites-1 commit e2040b95dd3157d033d929bb45fc7662b9918a78 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 5 12:00:21 2022 +0200 rewrite: item commit c7278e8adeec1ba3a090cc93db30c80699617c52 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sun Dec 4 12:57:59 2022 +0200 rewrite: imp code commit d23a740262a4fbdd9b25f7449ced707c0d2be634 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:08:25 2022 +0200 rewrite: imp code commit 773a5211b6662afd03a34219e7114c6f1e2bb579 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:05:20 2022 +0200 rewrite: imp code commit 48b54e19da9844d9b868d0be7e428ad6bacae6a5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 2 13:02:47 2022 +0200 rewrite: tests item commit 62af2bd91f5559840e7948ac4bf7c36b1bee1dc2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:11:21 2022 +0200 rewrite: tests commit f040b609391cb2275b11d4732bbac0380c01de07 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:04:59 2022 +0200 rewrite: imp code commit 4592b8c4e6107e5a746261d3335282827ce36b74 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 17:02:31 2022 +0200 rewrite: imp code commit cc1660695341c558dbac6acaa31ac160a45f6105 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 16:19:27 2022 +0200 rewrite: imp code commit cf3840b76d45bf319630256c01586159dd1e85fe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 13:16:40 2022 +0200 rewrite: tests commit 6fd6f03ca4320d4345032139b43cb457b3ae4278 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 1 11:14:44 2022 +0200 rewrite: imp code commit 2ebd2a1e79afc8f486cf6533968c51ca61bc03ab Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 11:43:24 2022 +0200 rewrite: tests commit 7da987994303a3e7b16eb6b0baaa4b59a52b97be Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Nov 30 10:54:57 2022 +0200 filtering: imp code commit ab98efc6710fac7cba28dab5bca9b60e9ec34ef7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Nov 28 13:31:12 2022 +0200 filtering: rewritehttp
2022-12-05 14:46:51 +03:00
}
Pull request: 1577: rewrite edit http api Merge in DNS/adguard-home from 1577-rewrite-edit to master Squashed commit of the following: commit d03bee2a14337d169eea950b3df18a447c02b422 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri May 12 12:54:15 2023 +0300 filtering: imp tests commit bd68320df6dc057d922d91551cd00c74ebfaad6c Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri May 12 10:38:12 2023 +0300 filtering: rewrite http tests commit 0d8bbcd0194c0db89a6d4b45927669423c9bbb59 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu May 11 12:06:30 2023 +0300 filtering: rewrite http tests commit 29080384dd8fa80d5286d2fac1a4429d712bbafa Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 17:24:00 2023 +0300 filtering: imp code commit 96c6b1c98debfae565c5e6254746959a4307744e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:56:32 2023 +0300 filtering: imp code commit b5d0c50ea11f9d829ba9d2b188fcc471a965e012 Merge: 5fa9e1c37 c77b2a0ce Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:37:19 2023 +0300 Merge remote-tracking branch 'origin/master' into 1577-rewrite-edit commit 5fa9e1c3714e107f893c03efa72227f3ed88691c Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:35:19 2023 +0300 filtering: imp code commit dd9dce8fbf0ce4bd200f2fc2fbf580e025920cd5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 13:06:43 2023 +0300 docs: rewrite http update commit 0c67b040e80787b084c4669bb20db8d6d145fc1b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 13:04:31 2023 +0300 filtering: rewrite http update
2023-05-12 13:04:19 +03:00
// 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()
Pull request: 1577: rewrite edit http api Merge in DNS/adguard-home from 1577-rewrite-edit to master Squashed commit of the following: commit d03bee2a14337d169eea950b3df18a447c02b422 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri May 12 12:54:15 2023 +0300 filtering: imp tests commit bd68320df6dc057d922d91551cd00c74ebfaad6c Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri May 12 10:38:12 2023 +0300 filtering: rewrite http tests commit 0d8bbcd0194c0db89a6d4b45927669423c9bbb59 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu May 11 12:06:30 2023 +0300 filtering: rewrite http tests commit 29080384dd8fa80d5286d2fac1a4429d712bbafa Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 17:24:00 2023 +0300 filtering: imp code commit 96c6b1c98debfae565c5e6254746959a4307744e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:56:32 2023 +0300 filtering: imp code commit b5d0c50ea11f9d829ba9d2b188fcc471a965e012 Merge: 5fa9e1c37 c77b2a0ce Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:37:19 2023 +0300 Merge remote-tracking branch 'origin/master' into 1577-rewrite-edit commit 5fa9e1c3714e107f893c03efa72227f3ed88691c Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:35:19 2023 +0300 filtering: imp code commit dd9dce8fbf0ce4bd200f2fc2fbf580e025920cd5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 13:06:43 2023 +0300 docs: rewrite http update commit 0c67b040e80787b084c4669bb20db8d6d145fc1b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 13:04:31 2023 +0300 filtering: rewrite http update
2023-05-12 13:04:19 +03:00
}
}()
d.confMu.Lock()
defer d.confMu.Unlock()
Pull request: 1577: rewrite edit http api Merge in DNS/adguard-home from 1577-rewrite-edit to master Squashed commit of the following: commit d03bee2a14337d169eea950b3df18a447c02b422 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri May 12 12:54:15 2023 +0300 filtering: imp tests commit bd68320df6dc057d922d91551cd00c74ebfaad6c Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri May 12 10:38:12 2023 +0300 filtering: rewrite http tests commit 0d8bbcd0194c0db89a6d4b45927669423c9bbb59 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu May 11 12:06:30 2023 +0300 filtering: rewrite http tests commit 29080384dd8fa80d5286d2fac1a4429d712bbafa Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 17:24:00 2023 +0300 filtering: imp code commit 96c6b1c98debfae565c5e6254746959a4307744e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:56:32 2023 +0300 filtering: imp code commit b5d0c50ea11f9d829ba9d2b188fcc471a965e012 Merge: 5fa9e1c37 c77b2a0ce Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:37:19 2023 +0300 Merge remote-tracking branch 'origin/master' into 1577-rewrite-edit commit 5fa9e1c3714e107f893c03efa72227f3ed88691c Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:35:19 2023 +0300 filtering: imp code commit dd9dce8fbf0ce4bd200f2fc2fbf580e025920cd5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 13:06:43 2023 +0300 docs: rewrite http update commit 0c67b040e80787b084c4669bb20db8d6d145fc1b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 13:04:31 2023 +0300 filtering: rewrite http update
2023-05-12 13:04:19 +03:00
index = slices.IndexFunc(d.conf.Rewrites, rwDel.equal)
Pull request: 1577: rewrite edit http api Merge in DNS/adguard-home from 1577-rewrite-edit to master Squashed commit of the following: commit d03bee2a14337d169eea950b3df18a447c02b422 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri May 12 12:54:15 2023 +0300 filtering: imp tests commit bd68320df6dc057d922d91551cd00c74ebfaad6c Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri May 12 10:38:12 2023 +0300 filtering: rewrite http tests commit 0d8bbcd0194c0db89a6d4b45927669423c9bbb59 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu May 11 12:06:30 2023 +0300 filtering: rewrite http tests commit 29080384dd8fa80d5286d2fac1a4429d712bbafa Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 17:24:00 2023 +0300 filtering: imp code commit 96c6b1c98debfae565c5e6254746959a4307744e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:56:32 2023 +0300 filtering: imp code commit b5d0c50ea11f9d829ba9d2b188fcc471a965e012 Merge: 5fa9e1c37 c77b2a0ce Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:37:19 2023 +0300 Merge remote-tracking branch 'origin/master' into 1577-rewrite-edit commit 5fa9e1c3714e107f893c03efa72227f3ed88691c Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:35:19 2023 +0300 filtering: imp code commit dd9dce8fbf0ce4bd200f2fc2fbf580e025920cd5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 13:06:43 2023 +0300 docs: rewrite http update commit 0c67b040e80787b084c4669bb20db8d6d145fc1b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 13:04:31 2023 +0300 filtering: rewrite http update
2023-05-12 13:04:19 +03:00
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)
Pull request: 1577: rewrite edit http api Merge in DNS/adguard-home from 1577-rewrite-edit to master Squashed commit of the following: commit d03bee2a14337d169eea950b3df18a447c02b422 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri May 12 12:54:15 2023 +0300 filtering: imp tests commit bd68320df6dc057d922d91551cd00c74ebfaad6c Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri May 12 10:38:12 2023 +0300 filtering: rewrite http tests commit 0d8bbcd0194c0db89a6d4b45927669423c9bbb59 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu May 11 12:06:30 2023 +0300 filtering: rewrite http tests commit 29080384dd8fa80d5286d2fac1a4429d712bbafa Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 17:24:00 2023 +0300 filtering: imp code commit 96c6b1c98debfae565c5e6254746959a4307744e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:56:32 2023 +0300 filtering: imp code commit b5d0c50ea11f9d829ba9d2b188fcc471a965e012 Merge: 5fa9e1c37 c77b2a0ce Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:37:19 2023 +0300 Merge remote-tracking branch 'origin/master' into 1577-rewrite-edit commit 5fa9e1c3714e107f893c03efa72227f3ed88691c Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 16:35:19 2023 +0300 filtering: imp code commit dd9dce8fbf0ce4bd200f2fc2fbf580e025920cd5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 13:06:43 2023 +0300 docs: rewrite http update commit 0c67b040e80787b084c4669bb20db8d6d145fc1b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 10 13:04:31 2023 +0300 filtering: rewrite http update
2023-05-12 13:04:19 +03:00
log.Debug("rewrite: removed element: %s -> %s", rwDel.Domain, rwDel.Answer)
log.Debug("rewrite: added element: %s -> %s", rwAdd.Domain, rwAdd.Answer)
}