mirror of
https://git.vectorsigma.ru/public/AdGuardHome.git
synced 2026-08-04 02:39:17 +00:00
5e44582236
Merge in DNS/adguard-home from next-fix-ups-logger to master Squashed commit of the following: commit 94a0c3508cb16e1b4e7f7793b1ee6a8da0c24de7 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Jun 27 18:11:12 2025 +0300 next: typos commit 6358dc11c90464b3464d39eb302e5265a3e61cdd Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Jun 27 17:32:03 2025 +0300 next: imp upstream; add more settings
84 lines
2.4 KiB
Go
84 lines
2.4 KiB
Go
package websvc_test
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/netip"
|
|
"net/url"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/next/agh"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/next/dnssvc"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/next/websvc"
|
|
"github.com/AdguardTeam/dnsproxy/proxy"
|
|
"github.com/AdguardTeam/golibs/logutil/slogutil"
|
|
"github.com/AdguardTeam/golibs/netutil/urlutil"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestService_HandleGetSettingsAll(t *testing.T) {
|
|
// TODO(a.garipov): Add all currently supported parameters.
|
|
|
|
wantDNS := &websvc.HTTPAPIDNSSettings{
|
|
UpstreamMode: proxy.UpstreamModeParallel,
|
|
Addresses: []netip.AddrPort{netip.MustParseAddrPort("127.0.0.1:53")},
|
|
BootstrapServers: []string{"94.140.14.140", "94.140.14.141"},
|
|
UpstreamServers: []string{"94.140.14.14", "1.1.1.1"},
|
|
UpstreamTimeout: aghhttp.JSONDuration(1 * time.Second),
|
|
Ratelimit: 100,
|
|
CacheSize: 1048576,
|
|
BootstrapPreferIPv6: true,
|
|
RefuseAny: true,
|
|
UseDNS64: true,
|
|
}
|
|
|
|
confMgr := newConfigManager()
|
|
confMgr.onDNS = func() (s agh.ServiceWithConfig[*dnssvc.Config]) {
|
|
c, err := dnssvc.New(&dnssvc.Config{
|
|
Logger: slogutil.NewDiscardLogger(),
|
|
UpstreamMode: proxy.UpstreamModeParallel,
|
|
Addresses: wantDNS.Addresses,
|
|
UpstreamServers: wantDNS.UpstreamServers,
|
|
BootstrapServers: wantDNS.BootstrapServers,
|
|
UpstreamTimeout: time.Duration(wantDNS.UpstreamTimeout),
|
|
CacheSize: 1048576,
|
|
Ratelimit: 100,
|
|
BootstrapPreferIPv6: true,
|
|
RefuseAny: true,
|
|
UseDNS64: true,
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
return c
|
|
}
|
|
|
|
svc, addr := newTestServer(t, confMgr)
|
|
u := &url.URL{
|
|
Scheme: urlutil.SchemeHTTP,
|
|
Host: addr.String(),
|
|
Path: websvc.PathPatternV1SettingsAll,
|
|
}
|
|
|
|
confMgr.onWeb = func() (s agh.ServiceWithConfig[*websvc.Config]) {
|
|
return svc
|
|
}
|
|
|
|
wantWeb := &websvc.HTTPAPIHTTPSettings{
|
|
Addresses: []netip.AddrPort{addr},
|
|
SecureAddresses: nil,
|
|
Timeout: aghhttp.JSONDuration(testTimeout),
|
|
ForceHTTPS: false,
|
|
}
|
|
|
|
body := httpGet(t, u, http.StatusOK)
|
|
resp := &websvc.RespGetV1SettingsAll{}
|
|
err := json.Unmarshal(body, resp)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, wantDNS, resp.DNS)
|
|
assert.Equal(t, wantWeb, resp.HTTP)
|
|
}
|