mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-17 13:11:42 +03:00
96e83a133f
Merge in DNS/adguard-home from 2358-mobileconfig to master
Updates #2358.
Squashed commit of the following:
commit ab3c7a75ae21f6978904f2dc237cb84cbedff7ab
Merge: fa002e400 b4a35fa88
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 25 16:11:06 2020 +0300
Merge branch 'master' into 2358-mobileconfig
commit fa002e40004656db08d32c926892c6c820fb1338
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 25 15:19:00 2020 +0300
home: improve mobileconfig http api
141 lines
4.1 KiB
Go
141 lines
4.1 KiB
Go
package home
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"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)
|
|
assert.Nil(t, err)
|
|
|
|
w := httptest.NewRecorder()
|
|
|
|
handleMobileConfigDOH(w, r)
|
|
assert.Equal(t, http.StatusOK, w.Code)
|
|
|
|
var mc MobileConfig
|
|
_, err = plist.Unmarshal(w.Body.Bytes(), &mc)
|
|
assert.Nil(t, err)
|
|
|
|
if assert.Equal(t, 1, len(mc.PayloadContent)) {
|
|
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
|
|
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
|
|
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
|
|
assert.Equal(t, "https://example.org/dns-query", mc.PayloadContent[0].DNSSettings.ServerURL)
|
|
}
|
|
})
|
|
|
|
t.Run("success_no_host", func(t *testing.T) {
|
|
oldTLSConf := Context.tls
|
|
t.Cleanup(func() { Context.tls = oldTLSConf })
|
|
|
|
Context.tls = &TLSMod{
|
|
conf: tlsConfigSettings{ServerName: "example.org"},
|
|
}
|
|
|
|
r, err := http.NewRequest(http.MethodGet, "https://example.com:12345/apple/doh.mobileconfig", nil)
|
|
assert.Nil(t, err)
|
|
|
|
w := httptest.NewRecorder()
|
|
|
|
handleMobileConfigDOH(w, r)
|
|
assert.Equal(t, http.StatusOK, w.Code)
|
|
|
|
var mc MobileConfig
|
|
_, err = plist.Unmarshal(w.Body.Bytes(), &mc)
|
|
assert.Nil(t, err)
|
|
|
|
if assert.Equal(t, 1, len(mc.PayloadContent)) {
|
|
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].Name)
|
|
assert.Equal(t, "example.org DoH", mc.PayloadContent[0].PayloadDisplayName)
|
|
assert.Equal(t, "example.org", mc.PayloadContent[0].DNSSettings.ServerName)
|
|
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)
|
|
assert.Nil(t, err)
|
|
|
|
w := httptest.NewRecorder()
|
|
|
|
handleMobileConfigDOH(w, r)
|
|
assert.Equal(t, http.StatusInternalServerError, w.Code)
|
|
})
|
|
}
|
|
|
|
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)
|
|
assert.Nil(t, err)
|
|
|
|
w := httptest.NewRecorder()
|
|
|
|
handleMobileConfigDOT(w, r)
|
|
assert.Equal(t, http.StatusOK, w.Code)
|
|
|
|
var mc MobileConfig
|
|
_, err = plist.Unmarshal(w.Body.Bytes(), &mc)
|
|
assert.Nil(t, err)
|
|
|
|
if assert.Equal(t, 1, len(mc.PayloadContent)) {
|
|
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("success_no_host", func(t *testing.T) {
|
|
oldTLSConf := Context.tls
|
|
t.Cleanup(func() { Context.tls = oldTLSConf })
|
|
|
|
Context.tls = &TLSMod{
|
|
conf: tlsConfigSettings{ServerName: "example.org"},
|
|
}
|
|
|
|
r, err := http.NewRequest(http.MethodGet, "https://example.com:12345/apple/dot.mobileconfig", nil)
|
|
assert.Nil(t, err)
|
|
|
|
w := httptest.NewRecorder()
|
|
|
|
handleMobileConfigDOT(w, r)
|
|
assert.Equal(t, http.StatusOK, w.Code)
|
|
|
|
var mc MobileConfig
|
|
_, err = plist.Unmarshal(w.Body.Bytes(), &mc)
|
|
assert.Nil(t, err)
|
|
|
|
if assert.Equal(t, 1, len(mc.PayloadContent)) {
|
|
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)
|
|
assert.Nil(t, err)
|
|
|
|
w := httptest.NewRecorder()
|
|
|
|
handleMobileConfigDOT(w, r)
|
|
assert.Equal(t, http.StatusInternalServerError, w.Code)
|
|
})
|
|
}
|