mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-17 13:11:42 +03:00
3f1fd56b17
Merge in DNS/adguard-home from 3172-mobileconfig to master
Updates #3172.
Updates #2497.
Squashed commit of the following:
commit 30549ef4eda9d88f0738089e901492d7369caa25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 21:00:17 2021 +0300
all: log changes
commit 9b9429447430a8e5656b992c04c4a74606dc5f9f
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jun 1 17:56:59 2021 +0300
client: always show port input
commit 6d6a0bdfaa849220a5ddb4a17502ab05379d7a1c
Merge: 13a3bffd 77946a7f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 17:50:41 2021 +0300
Merge branch 'master' into 3172-mobileconfig
commit 13a3bffd4dd6ccabf3d261f17b2c758a5c61eb9c
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jun 1 17:20:17 2021 +0300
client: add port to mobile config form
commit f6abe0b6044572f3801c31b683e76f90c4a28487
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon May 31 19:43:37 2021 +0300
home: imp cyclo
commit c304a0bacdca6f8b5ffd21f3d00c8244ea9e4e36
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon May 31 18:19:46 2021 +0300
home: reduce allocs
commit 10a7678861079b710bb0ef14569c60a09612ec70
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon May 24 20:05:08 2021 +0300
all: make the host parameter required
139 lines
4.1 KiB
Go
139 lines
4.1 KiB
Go
package home
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"howett.net/plist"
|
|
)
|
|
|
|
func TestHandleMobileConfigDOH(t *testing.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].Name)
|
|
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
|
|
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL)
|
|
})
|
|
|
|
t.Run("error_no_host", func(t *testing.T) {
|
|
oldTLSConf := Context.tls
|
|
t.Cleanup(func() { Context.tls = oldTLSConf })
|
|
|
|
Context.tls = &TLSMod{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].Name)
|
|
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
|
|
assert.Equal(t, "https://example.org/dns-query/cli42", mc.PayloadContent[0].DNSSettings.ServerURL)
|
|
})
|
|
}
|
|
|
|
func TestHandleMobileConfigDOT(t *testing.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].Name)
|
|
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
|
|
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
|
|
})
|
|
|
|
t.Run("error_no_host", func(t *testing.T) {
|
|
oldTLSConf := Context.tls
|
|
t.Cleanup(func() { Context.tls = oldTLSConf })
|
|
|
|
Context.tls = &TLSMod{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].Name)
|
|
assert.Equal(t, "example.org DoT", mc.PayloadContent[0].PayloadDisplayName)
|
|
assert.Equal(t, "cli42.example.org", mc.PayloadContent[0].DNSSettings.ServerName)
|
|
})
|
|
}
|