Pull request 2347: AGDNS-2690-global-context

Merge in DNS/adguard-home from AGDNS-2690-global-context to master Squashed commit of the following: commit 58d5999e5d9112b3391f988ed76e87eff2919d6b Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Feb 19 18:51:41 2025 +0300 home: imp naming commit cfb371df59c816be1022d499cc41ffaf2b72d124 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Feb 19 18:42:52 2025 +0300 home: global context
2025-02-19 19:02:56 +03:00
parent a5b073d070
commit 1e0873aa71
16 changed files with 203 additions and 203 deletions
--- a/internal/home/mobileconfig_internal_test.go
+++ b/internal/home/mobileconfig_internal_test.go
@@ -0,0 +1,180 @@
+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
+	prevTLS := globalContext.tls
+	t.Cleanup(func() {
+		config = prevConfig
+		globalContext.tls = prevTLS
+	})
+
+	config = &configuration{
+		DNS: dnsConfig{
+			BindHosts: []netip.Addr{netip.IPv4Unspecified()},
+			Port:      defaultPortDNS,
+		},
+	}
+
+	globalContext.tls = &tlsManager{}
+}
+
+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) {
+		oldTLSConf := globalContext.tls
+		t.Cleanup(func() { globalContext.tls = oldTLSConf })
+
+		globalContext.tls = &tlsManager{conf: tlsConfigSettings{}}
+
+		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) {
+		oldTLSConf := globalContext.tls
+		t.Cleanup(func() { globalContext.tls = oldTLSConf })
+
+		globalContext.tls = &tlsManager{conf: tlsConfigSettings{}}
+
+		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)
+	})
+}