mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-15 19:31:45 +03:00
aac36a2d2f
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: c69f9230be1f6229e5
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: cabb80ac12adc8624c
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
98 lines
3.1 KiB
Go
98 lines
3.1 KiB
Go
package websvc
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"net/netip"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/next/dnssvc"
|
|
)
|
|
|
|
// DNS Settings Handlers
|
|
|
|
// ReqPatchSettingsDNS describes the request to the PATCH /api/v1/settings/dns
|
|
// HTTP API.
|
|
type ReqPatchSettingsDNS struct {
|
|
// TODO(a.garipov): Add more as we go.
|
|
|
|
Addresses []netip.AddrPort `json:"addresses"`
|
|
BootstrapServers []string `json:"bootstrap_servers"`
|
|
UpstreamServers []string `json:"upstream_servers"`
|
|
DNS64Prefixes []netip.Prefix `json:"dns64_prefixes"`
|
|
UpstreamTimeout aghhttp.JSONDuration `json:"upstream_timeout"`
|
|
BootstrapPreferIPv6 bool `json:"bootstrap_prefer_ipv6"`
|
|
UseDNS64 bool `json:"use_dns64"`
|
|
}
|
|
|
|
// HTTPAPIDNSSettings are the DNS settings as used by the HTTP API. See the
|
|
// DnsSettings object in the OpenAPI specification.
|
|
type HTTPAPIDNSSettings struct {
|
|
// TODO(a.garipov): Add more as we go.
|
|
|
|
Addresses []netip.AddrPort `json:"addresses"`
|
|
BootstrapServers []string `json:"bootstrap_servers"`
|
|
UpstreamServers []string `json:"upstream_servers"`
|
|
DNS64Prefixes []netip.Prefix `json:"dns64_prefixes"`
|
|
UpstreamTimeout aghhttp.JSONDuration `json:"upstream_timeout"`
|
|
BootstrapPreferIPv6 bool `json:"bootstrap_prefer_ipv6"`
|
|
UseDNS64 bool `json:"use_dns64"`
|
|
}
|
|
|
|
// handlePatchSettingsDNS is the handler for the PATCH /api/v1/settings/dns HTTP
|
|
// API.
|
|
func (svc *Service) handlePatchSettingsDNS(w http.ResponseWriter, r *http.Request) {
|
|
req := &ReqPatchSettingsDNS{
|
|
Addresses: []netip.AddrPort{},
|
|
BootstrapServers: []string{},
|
|
UpstreamServers: []string{},
|
|
}
|
|
|
|
// TODO(a.garipov): Validate nulls and proper JSON patch.
|
|
|
|
err := json.NewDecoder(r.Body).Decode(&req)
|
|
if err != nil {
|
|
aghhttp.WriteJSONResponseError(w, r, fmt.Errorf("decoding: %w", err))
|
|
|
|
return
|
|
}
|
|
|
|
newConf := &dnssvc.Config{
|
|
Addresses: req.Addresses,
|
|
BootstrapServers: req.BootstrapServers,
|
|
UpstreamServers: req.UpstreamServers,
|
|
DNS64Prefixes: req.DNS64Prefixes,
|
|
UpstreamTimeout: time.Duration(req.UpstreamTimeout),
|
|
BootstrapPreferIPv6: req.BootstrapPreferIPv6,
|
|
UseDNS64: req.UseDNS64,
|
|
}
|
|
|
|
ctx := r.Context()
|
|
err = svc.confMgr.UpdateDNS(ctx, newConf)
|
|
if err != nil {
|
|
aghhttp.WriteJSONResponseError(w, r, fmt.Errorf("updating: %w", err))
|
|
|
|
return
|
|
}
|
|
|
|
newSvc := svc.confMgr.DNS()
|
|
err = newSvc.Start()
|
|
if err != nil {
|
|
aghhttp.WriteJSONResponseError(w, r, fmt.Errorf("starting new service: %w", err))
|
|
|
|
return
|
|
}
|
|
|
|
aghhttp.WriteJSONResponseOK(w, r, &HTTPAPIDNSSettings{
|
|
Addresses: newConf.Addresses,
|
|
BootstrapServers: newConf.BootstrapServers,
|
|
UpstreamServers: newConf.UpstreamServers,
|
|
DNS64Prefixes: newConf.DNS64Prefixes,
|
|
UpstreamTimeout: aghhttp.JSONDuration(newConf.UpstreamTimeout),
|
|
BootstrapPreferIPv6: newConf.BootstrapPreferIPv6,
|
|
UseDNS64: newConf.UseDNS64,
|
|
})
|
|
}
|