mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-26 08:38:18 +03:00
d3cc2dc930
Merge in DNS/adguard-home from websvc-patch to master Squashed commit of the following: commit b2a10faf12b16f13f617b3ed3ef3e81cb0479ff8 Merge:38f749106
8f53f6505
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 11 17:33:15 2024 +0300 Merge branch 'master' into websvc-patch commit38f7491069
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 10 19:57:54 2024 +0300 next: add json merge patch utils
76 lines
2.3 KiB
Go
76 lines
2.3 KiB
Go
package websvc_test
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/netip"
|
|
"net/url"
|
|
"sync/atomic"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/next/agh"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/next/dnssvc"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/next/websvc"
|
|
"github.com/AdguardTeam/golibs/netutil/urlutil"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestService_HandlePatchSettingsDNS(t *testing.T) {
|
|
wantDNS := &websvc.HTTPAPIDNSSettings{
|
|
Addresses: []netip.AddrPort{netip.MustParseAddrPort("127.0.1.1:53")},
|
|
BootstrapServers: []string{"1.0.0.1"},
|
|
UpstreamServers: []string{"1.1.1.1"},
|
|
DNS64Prefixes: []netip.Prefix{netip.MustParsePrefix("1234::/64")},
|
|
UpstreamTimeout: aghhttp.JSONDuration(2 * time.Second),
|
|
BootstrapPreferIPv6: true,
|
|
UseDNS64: true,
|
|
}
|
|
|
|
var started atomic.Bool
|
|
confMgr := newConfigManager()
|
|
confMgr.onDNS = func() (s agh.ServiceWithConfig[*dnssvc.Config]) {
|
|
return &aghtest.ServiceWithConfig[*dnssvc.Config]{
|
|
OnStart: func(_ context.Context) (err error) {
|
|
started.Store(true)
|
|
|
|
return nil
|
|
},
|
|
OnShutdown: func(_ context.Context) (err error) { panic("not implemented") },
|
|
OnConfig: func() (c *dnssvc.Config) { return &dnssvc.Config{} },
|
|
}
|
|
}
|
|
confMgr.onUpdateDNS = func(ctx context.Context, c *dnssvc.Config) (err error) {
|
|
return nil
|
|
}
|
|
|
|
_, addr := newTestServer(t, confMgr)
|
|
u := &url.URL{
|
|
Scheme: urlutil.SchemeHTTP,
|
|
Host: addr.String(),
|
|
Path: websvc.PathPatternV1SettingsDNS,
|
|
}
|
|
|
|
req := jobj{
|
|
"addresses": wantDNS.Addresses,
|
|
"bootstrap_servers": wantDNS.BootstrapServers,
|
|
"upstream_servers": wantDNS.UpstreamServers,
|
|
"dns64_prefixes": wantDNS.DNS64Prefixes,
|
|
"upstream_timeout": wantDNS.UpstreamTimeout,
|
|
"bootstrap_prefer_ipv6": wantDNS.BootstrapPreferIPv6,
|
|
"use_dns64": wantDNS.UseDNS64,
|
|
}
|
|
|
|
respBody := httpPatch(t, u, req, http.StatusOK)
|
|
resp := &websvc.HTTPAPIDNSSettings{}
|
|
err := json.Unmarshal(respBody, resp)
|
|
require.NoError(t, err)
|
|
|
|
assert.True(t, started.Load())
|
|
assert.Equal(t, wantDNS, resp)
|
|
assert.Equal(t, wantDNS, resp)
|
|
}
|