mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-22 13:05:36 +03:00
47c9c946a3
Merge in DNS/adguard-home from 4871-imp-filtering to master
Closes #4871.
Squashed commit of the following:
commit 618e7c558447703c114332708c94ef1b34362cf9
Merge: 41ff8ab7 11e4f091
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 22 19:27:08 2022 +0300
Merge branch 'master' into 4871-imp-filtering
commit 41ff8ab755a87170e7334dedcae00f01dcca238a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 22 19:26:11 2022 +0300
filtering: imp code, log
commit e4ae1d1788406ffd7ef0fcc6df896a22b0c2db37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 22 14:11:07 2022 +0300
filtering: move handlers into single func
commit f7a340b4c10980f512ae935a156f02b0133a1627
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 21 19:21:09 2022 +0300
all: imp code
commit e064bf4d3de0283e4bda2aaf5b9822bb8a08f4a6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 20 20:12:16 2022 +0300
all: imp name
commit e7eda3905762f0821e1be1ac3cf77e0ecbedeff4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 20 17:51:23 2022 +0300
all: finally get rid of filtering
commit 188550d873e625cc2951583bb3a2eaad036745f5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 20 17:36:03 2022 +0300
filtering: merge refresh
commit e54ed9c7952b17e66b790c835269b28fbc26f9ca
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 20 17:16:23 2022 +0300
filtering: merge filters
commit 32da31b754a319487d5f9d5e81e607d349b90180
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 20 14:48:13 2022 +0300
filtering: imp docs
commit 43b0cafa7a27bb9b620c2ba50ccdddcf32cfcecc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 20 14:38:04 2022 +0300
all: imp code
commit 253a2ea6c92815d364546e34d631e406dd604644
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 19 20:43:15 2022 +0300
filtering: rm important flag
commit 1b87f08f946389d410f13412c7e486290d5e752d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 19 17:05:40 2022 +0300
all: move filtering to the package
commit daa13499f1dd4fe475c4b75769e34f1eb0915bdf
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 19 15:13:55 2022 +0300
all: finish merging
commit d6db75eb2e1f23528e9200ea51507eb793eefa3c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Sep 16 18:18:14 2022 +0300
all: continue merging
commit 45b4c484deb7198a469aa18d719bb9dbe81e5d22
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 14 15:44:22 2022 +0300
all: merge filtering types
196 lines
5.1 KiB
Go
196 lines
5.1 KiB
Go
package home
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"net"
|
|
"net/http"
|
|
"net/url"
|
|
"path"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
|
|
"github.com/AdguardTeam/golibs/errors"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/google/uuid"
|
|
"howett.net/plist"
|
|
)
|
|
|
|
// dnsSettings is the DNSSetting.DNSSettings mobileconfig profile.
|
|
//
|
|
// See https://developer.apple.com/documentation/devicemanagement/dnssettings/dnssettings.
|
|
type dnsSettings struct {
|
|
// DNSProtocol is the required protocol to be used. The valid values
|
|
// are "HTTPS" and "TLS".
|
|
DNSProtocol string
|
|
|
|
// ServerURL is the URI template of the DoH server. It must be empty if
|
|
// DNSProtocol is not "HTTPS".
|
|
ServerURL string `plist:",omitempty"`
|
|
|
|
// ServerName is the hostname of the DoT server. It must be empty if
|
|
// DNSProtocol is not "TLS".
|
|
ServerName string `plist:",omitempty"`
|
|
|
|
// ServerAddresses is a list IP addresses of the server.
|
|
//
|
|
// TODO(a.garipov): Allow users to set this.
|
|
//
|
|
// See https://github.com/AdguardTeam/AdGuardHome/issues/3607.
|
|
ServerAddresses []net.IP `plist:",omitempty"`
|
|
}
|
|
|
|
// payloadContent is a Device Management Profile payload.
|
|
//
|
|
// See https://developer.apple.com/documentation/devicemanagement/configuring_multiple_devices_using_profiles#3234127.
|
|
type payloadContent struct {
|
|
DNSSettings *dnsSettings
|
|
|
|
PayloadType string
|
|
PayloadIdentifier string
|
|
PayloadDisplayName string
|
|
PayloadDescription string
|
|
PayloadUUID uuid.UUID
|
|
PayloadVersion int
|
|
}
|
|
|
|
// dnsSettingsPayloadType is the payload type for a DNSSettings profile.
|
|
const dnsSettingsPayloadType = "com.apple.dnsSettings.managed"
|
|
|
|
// mobileConfig contains the TopLevel properties for configuring Device
|
|
// Management Profiles.
|
|
//
|
|
// See https://developer.apple.com/documentation/devicemanagement/toplevel.
|
|
type mobileConfig struct {
|
|
PayloadDescription string
|
|
PayloadDisplayName string
|
|
PayloadType string
|
|
PayloadContent []*payloadContent
|
|
PayloadIdentifier uuid.UUID
|
|
PayloadUUID uuid.UUID
|
|
PayloadVersion int
|
|
PayloadRemovalDisallowed bool
|
|
}
|
|
|
|
const (
|
|
dnsProtoHTTPS = "HTTPS"
|
|
dnsProtoTLS = "TLS"
|
|
)
|
|
|
|
func encodeMobileConfig(d *dnsSettings, clientID string) ([]byte, error) {
|
|
var dspName string
|
|
switch proto := d.DNSProtocol; proto {
|
|
case dnsProtoHTTPS:
|
|
dspName = fmt.Sprintf("%s DoH", d.ServerName)
|
|
u := &url.URL{
|
|
Scheme: aghhttp.SchemeHTTPS,
|
|
Host: d.ServerName,
|
|
Path: path.Join("/dns-query", clientID),
|
|
}
|
|
d.ServerURL = u.String()
|
|
|
|
// Empty the ServerName field since it is only must be presented
|
|
// in DNS-over-TLS configuration.
|
|
d.ServerName = ""
|
|
case dnsProtoTLS:
|
|
dspName = fmt.Sprintf("%s DoT", d.ServerName)
|
|
if clientID != "" {
|
|
d.ServerName = clientID + "." + d.ServerName
|
|
}
|
|
default:
|
|
return nil, fmt.Errorf("bad dns protocol %q", proto)
|
|
}
|
|
|
|
payloadID := fmt.Sprintf("%s.%s", dnsSettingsPayloadType, uuid.New())
|
|
data := &mobileConfig{
|
|
PayloadDescription: "Adds AdGuard Home to macOS Big Sur and iOS 14 or newer systems",
|
|
PayloadDisplayName: dspName,
|
|
PayloadType: "Configuration",
|
|
PayloadContent: []*payloadContent{{
|
|
DNSSettings: d,
|
|
|
|
PayloadType: dnsSettingsPayloadType,
|
|
PayloadIdentifier: payloadID,
|
|
PayloadDisplayName: dspName,
|
|
PayloadDescription: "Configures device to use AdGuard Home",
|
|
PayloadUUID: uuid.New(),
|
|
PayloadVersion: 1,
|
|
}},
|
|
PayloadIdentifier: uuid.New(),
|
|
PayloadUUID: uuid.New(),
|
|
PayloadVersion: 1,
|
|
PayloadRemovalDisallowed: false,
|
|
}
|
|
|
|
return plist.MarshalIndent(data, plist.XMLFormat, "\t")
|
|
}
|
|
|
|
func respondJSONError(w http.ResponseWriter, status int, msg string) {
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
err := json.NewEncoder(w).Encode(&jsonError{
|
|
Message: msg,
|
|
})
|
|
if err != nil {
|
|
log.Debug("writing %d json response: %s", status, err)
|
|
}
|
|
}
|
|
|
|
const errEmptyHost errors.Error = "no host in query parameters and no server_name"
|
|
|
|
func handleMobileConfig(w http.ResponseWriter, r *http.Request, dnsp string) {
|
|
var err error
|
|
|
|
q := r.URL.Query()
|
|
host := q.Get("host")
|
|
if host == "" {
|
|
respondJSONError(w, http.StatusInternalServerError, string(errEmptyHost))
|
|
|
|
return
|
|
}
|
|
|
|
clientID := q.Get("client_id")
|
|
if clientID != "" {
|
|
err = dnsforward.ValidateClientID(clientID)
|
|
if err != nil {
|
|
respondJSONError(w, http.StatusBadRequest, err.Error())
|
|
|
|
return
|
|
}
|
|
}
|
|
|
|
d := &dnsSettings{
|
|
DNSProtocol: dnsp,
|
|
ServerName: host,
|
|
}
|
|
|
|
mobileconfig, err := encodeMobileConfig(d, clientID)
|
|
if err != nil {
|
|
respondJSONError(w, http.StatusInternalServerError, err.Error())
|
|
|
|
return
|
|
}
|
|
|
|
w.Header().Set("Content-Type", "application/xml")
|
|
|
|
const (
|
|
dohContDisp = `attachment; filename=doh.mobileconfig`
|
|
dotContDisp = `attachment; filename=dot.mobileconfig`
|
|
)
|
|
|
|
contDisp := dohContDisp
|
|
if dnsp == dnsProtoTLS {
|
|
contDisp = dotContDisp
|
|
}
|
|
|
|
w.Header().Set("Content-Disposition", contDisp)
|
|
|
|
_, _ = w.Write(mobileconfig)
|
|
}
|
|
|
|
func handleMobileConfigDoH(w http.ResponseWriter, r *http.Request) {
|
|
handleMobileConfig(w, r, dnsProtoHTTPS)
|
|
}
|
|
|
|
func handleMobileConfigDoT(w http.ResponseWriter, r *http.Request) {
|
|
handleMobileConfig(w, r, dnsProtoTLS)
|
|
}
|