Merge in DNS/adguard-home from AGDNS-2690-global-context-tls to master Squashed commit of the following: commit ae1d9e6f3f3b8abefbc5e776eb256577f7fbbb0f Merge: 6f30f488abf9be98c7Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 10 18:15:24 2025 +0300 Merge branch 'master' into AGDNS-2690-global-context-tls commit 6f30f488aa2305e518000dc6c1028ede83bf1cc6 Merge: baa187ab066fba942cAuthor: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 10 15:08:47 2025 +0300 Merge branch 'master' into AGDNS-2690-global-context-tls commit baa187ab0b6db7f41e49dece7b4d0430409e7cae Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 10 15:08:39 2025 +0300 home: imp docs commit 96a09389c5049a84bb30ed285cc5e1df9aaa438f Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Mar 6 20:15:05 2025 +0300 home: imp docs commit 1cd007707af4a7a5160c8fe21b20b84543d59e5a Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Mar 6 18:54:07 2025 +0300 home: imp docs commit ad3d2b6616c2c3aba566a2158ffc597e5802929f Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 4 19:38:45 2025 +0300 home: global context tls
167 lines
4.3 KiB
Go
167 lines
4.3 KiB
Go
package home
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"net/netip"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"howett.net/plist"
|
|
)
|
|
|
|
// setupDNSIPs is a helper that sets up the server IP address configuration for
|
|
// tests and also tears it down in a cleanup function.
|
|
func setupDNSIPs(t testing.TB) {
|
|
t.Helper()
|
|
|
|
prevConfig := config
|
|
t.Cleanup(func() {
|
|
config = prevConfig
|
|
})
|
|
|
|
config = &configuration{
|
|
DNS: dnsConfig{
|
|
BindHosts: []netip.Addr{netip.IPv4Unspecified()},
|
|
Port: defaultPortDNS,
|
|
},
|
|
}
|
|
}
|
|
|
|
func TestHandleMobileConfigDoH(t *testing.T) {
|
|
setupDNSIPs(t)
|
|
|
|
t.Run("success", func(t *testing.T) {
|
|
r, err := http.NewRequest(http.MethodGet, "https://example.com:12345/apple/doh.mobileconfig?host=example.org", nil)
|
|
require.NoError(t, err)
|
|
|
|
w := httptest.NewRecorder()
|
|
|
|
handleMobileConfigDoH(w, r)
|
|
require.Equal(t, http.StatusOK, w.Code)
|
|
|
|
var mc mobileConfig
|
|
_, err = plist.Unmarshal(w.Body.Bytes(), &mc)
|
|
require.NoError(t, err)
|
|
require.Len(t, mc.PayloadContent, 1)
|
|
|
|
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
|
|
|
|
s := mc.PayloadContent[0].DNSSettings
|
|
require.NotNil(t, s)
|
|
|
|
assert.Empty(t, s.ServerName)
|
|
assert.Equal(t, "https://example.org/dns-query", s.ServerURL)
|
|
})
|
|
|
|
t.Run("error_no_host", func(t *testing.T) {
|
|
r, err := http.NewRequest(http.MethodGet, "https://example.com:12345/apple/doh.mobileconfig", nil)
|
|
require.NoError(t, err)
|
|
|
|
b := &bytes.Buffer{}
|
|
err = json.NewEncoder(b).Encode(&jsonError{
|
|
Message: errEmptyHost.Error(),
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
w := httptest.NewRecorder()
|
|
|
|
handleMobileConfigDoH(w, r)
|
|
assert.Equal(t, http.StatusInternalServerError, w.Code)
|
|
assert.JSONEq(t, w.Body.String(), b.String())
|
|
})
|
|
|
|
t.Run("client_id", func(t *testing.T) {
|
|
r, err := http.NewRequest(http.MethodGet, "https://example.com:12345/apple/doh.mobileconfig?host=example.org&client_id=cli42", nil)
|
|
require.NoError(t, err)
|
|
|
|
w := httptest.NewRecorder()
|
|
|
|
handleMobileConfigDoH(w, r)
|
|
require.Equal(t, http.StatusOK, w.Code)
|
|
|
|
var mc mobileConfig
|
|
_, err = plist.Unmarshal(w.Body.Bytes(), &mc)
|
|
require.NoError(t, err)
|
|
require.Len(t, mc.PayloadContent, 1)
|
|
|
|
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
|
|
|
|
s := mc.PayloadContent[0].DNSSettings
|
|
require.NotNil(t, s)
|
|
|
|
assert.Empty(t, s.ServerName)
|
|
assert.Equal(t, "https://example.org/dns-query/cli42", s.ServerURL)
|
|
})
|
|
}
|
|
|
|
func TestHandleMobileConfigDoT(t *testing.T) {
|
|
setupDNSIPs(t)
|
|
|
|
t.Run("success", func(t *testing.T) {
|
|
r, err := http.NewRequest(http.MethodGet, "https://example.com:12345/apple/dot.mobileconfig?host=example.org", nil)
|
|
require.NoError(t, err)
|
|
|
|
w := httptest.NewRecorder()
|
|
|
|
handleMobileConfigDoT(w, r)
|
|
require.Equal(t, http.StatusOK, w.Code)
|
|
|
|
var mc mobileConfig
|
|
_, err = plist.Unmarshal(w.Body.Bytes(), &mc)
|
|
require.NoError(t, err)
|
|
require.Len(t, mc.PayloadContent, 1)
|
|
|
|
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
|
|
|
|
s := mc.PayloadContent[0].DNSSettings
|
|
require.NotNil(t, s)
|
|
|
|
assert.Equal(t, "example.org", s.ServerName)
|
|
assert.Empty(t, s.ServerURL)
|
|
})
|
|
|
|
t.Run("error_no_host", func(t *testing.T) {
|
|
r, err := http.NewRequest(http.MethodGet, "https://example.com:12345/apple/dot.mobileconfig", nil)
|
|
require.NoError(t, err)
|
|
|
|
b := &bytes.Buffer{}
|
|
err = json.NewEncoder(b).Encode(&jsonError{
|
|
Message: errEmptyHost.Error(),
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
w := httptest.NewRecorder()
|
|
|
|
handleMobileConfigDoT(w, r)
|
|
assert.Equal(t, http.StatusInternalServerError, w.Code)
|
|
assert.JSONEq(t, w.Body.String(), b.String())
|
|
})
|
|
|
|
t.Run("client_id", func(t *testing.T) {
|
|
r, err := http.NewRequest(http.MethodGet, "https://example.com:12345/apple/dot.mobileconfig?host=example.org&client_id=cli42", nil)
|
|
require.NoError(t, err)
|
|
|
|
w := httptest.NewRecorder()
|
|
|
|
handleMobileConfigDoT(w, r)
|
|
require.Equal(t, http.StatusOK, w.Code)
|
|
|
|
var mc mobileConfig
|
|
_, err = plist.Unmarshal(w.Body.Bytes(), &mc)
|
|
require.NoError(t, err)
|
|
require.Len(t, mc.PayloadContent, 1)
|
|
|
|
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
|
|
|
|
s := mc.PayloadContent[0].DNSSettings
|
|
require.NotNil(t, s)
|
|
|
|
assert.Equal(t, "cli42.example.org", s.ServerName)
|
|
assert.Empty(t, s.ServerURL)
|
|
})
|
|
}
|