mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-03-23 18:49:07 +03:00
Merge in DNS/adguard-home from AGDNS-2690-signal-handler to master Squashed commit of the following: commit b6822142312ac814e7c206218bb079a4f364192a Merge:f597ea1fd
8b2ab8ea8
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 3 18:10:27 2025 +0300 Merge branch 'master' into AGDNS-2690-signal-handler commitf597ea1fd2
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Feb 27 20:45:55 2025 +0300 all: fix logger commit582e315eca
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Feb 27 18:40:57 2025 +0300 home: imp code commit1e0f48d32a
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Feb 27 15:26:19 2025 +0300 home: imp docs commitaa43bbc1b2
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 24 17:24:33 2025 +0300 home: signal handler
65 lines
1.5 KiB
Go
65 lines
1.5 KiB
Go
package home
|
|
|
|
import (
|
|
"net"
|
|
"net/netip"
|
|
"testing"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/client"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
|
|
"github.com/AdguardTeam/golibs/logutil/slogutil"
|
|
"github.com/AdguardTeam/golibs/testutil"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// newClientsContainer is a helper that creates a new clients container for
|
|
// tests.
|
|
func newClientsContainer(t *testing.T) (c *clientsContainer) {
|
|
t.Helper()
|
|
|
|
c = &clientsContainer{
|
|
testing: true,
|
|
}
|
|
|
|
ctx := testutil.ContextWithTimeout(t, testTimeout)
|
|
err := c.Init(
|
|
ctx,
|
|
slogutil.NewDiscardLogger(),
|
|
nil,
|
|
client.EmptyDHCP{},
|
|
nil,
|
|
nil,
|
|
&filtering.Config{},
|
|
newSignalHandler(nil, nil),
|
|
)
|
|
|
|
require.NoError(t, err)
|
|
|
|
return c
|
|
}
|
|
|
|
func TestClientsCustomUpstream(t *testing.T) {
|
|
clients := newClientsContainer(t)
|
|
ctx := testutil.ContextWithTimeout(t, testTimeout)
|
|
|
|
// Add client with upstreams.
|
|
err := clients.storage.Add(ctx, &client.Persistent{
|
|
Name: "client1",
|
|
UID: client.MustNewUID(),
|
|
IPs: []netip.Addr{netip.MustParseAddr("1.1.1.1"), netip.MustParseAddr("1:2:3::4")},
|
|
Upstreams: []string{
|
|
"1.1.1.1",
|
|
"[/example.org/]8.8.8.8",
|
|
},
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
upsConf, err := clients.UpstreamConfigByID("1.2.3.4", net.DefaultResolver)
|
|
assert.Nil(t, upsConf)
|
|
assert.NoError(t, err)
|
|
|
|
upsConf, err = clients.UpstreamConfigByID("1.1.1.1", net.DefaultResolver)
|
|
require.NotNil(t, upsConf)
|
|
assert.NoError(t, err)
|
|
}
|