Skip to content

Commit de61e81

Browse files
wwqgtxxwwqgtxx
committed
feat: support external-doh-server 
1 parent 4eb13a7 commit de61e81

File tree

5 files changed

+87
-8
lines changed

5 files changed

+87
-8
lines changed

‎config/config.go

+3
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ type Controller struct {
9696
ExternalControllerTLS string `json:"-"`
9797
ExternalControllerUnix string `json:"-"`
9898
ExternalUI string `json:"-"`
99+
ExternalDohServer string `json:"-"`
99100
Secret string `json:"-"`
100101
}
101102

@@ -322,6 +323,7 @@ type RawConfig struct {
322323
ExternalUI string `yaml:"external-ui"`
323324
ExternalUIURL string `yaml:"external-ui-url" json:"external-ui-url"`
324325
ExternalUIName string `yaml:"external-ui-name" json:"external-ui-name"`
326+
ExternalDohServer string `yaml:"external-doh-server"`
325327
Secret string `yaml:"secret"`
326328
Interface string `yaml:"interface-name"`
327329
RoutingMark int `yaml:"routing-mark"`
@@ -697,6 +699,7 @@ func parseGeneral(cfg *RawConfig) (*General, error) {
697699
Secret: cfg.Secret,
698700
ExternalControllerUnix: cfg.ExternalControllerUnix,
699701
ExternalControllerTLS: cfg.ExternalControllerTLS,
702+
ExternalDohServer: cfg.ExternalDohServer,
700703
},
701704
UnifiedDelay: cfg.UnifiedDelay,
702705
Mode: cfg.Mode,

‎docs/config.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ external-ui: /path/to/ui/folder/
7070
external-ui-name: xd
7171
external-ui-url: "https://github.com/MetaCubeX/metacubexd/archive/refs/heads/gh-pages.zip"
7272

73+
# 在RESTful API端口上开启DOH服务器
74+
# ！！！该URL不会验证secret， 如果开启请自行保证安全问题 ！！！
75+
external-doh-server: /dns-query
76+
7377
# interface-name: en0 # 设置出口网卡
7478

7579
# 全局 TLS 指纹，优先低于 proxy 内的 client-fingerprint

‎hub/hub.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,12 @@ func Parse(options ...Option) error {
5050

5151
if cfg.General.ExternalController != "" {
5252
go route.Start(cfg.General.ExternalController, cfg.General.ExternalControllerTLS,
53-
cfg.General.Secret, cfg.TLS.Certificate, cfg.TLS.PrivateKey, cfg.General.LogLevel == log.DEBUG)
53+
cfg.General.Secret, cfg.TLS.Certificate, cfg.TLS.PrivateKey, cfg.General.ExternalDohServer,
54+
cfg.General.LogLevel == log.DEBUG)
5455
}
5556

5657
if cfg.General.ExternalControllerUnix != "" {
57-
go route.StartUnix(cfg.General.ExternalControllerUnix, cfg.General.LogLevel == log.DEBUG)
58+
go route.StartUnix(cfg.General.ExternalControllerUnix, cfg.General.ExternalDohServer, cfg.General.LogLevel == log.DEBUG)
5859
}
5960

6061
executor.ApplyConfig(cfg, true)

‎hub/route/doh.go

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
package route
2+
3+
import (
4+
"context"
5+
"encoding/base64"
6+
"io"
7+
"net/http"
8+
9+
"github.com/metacubex/mihomo/component/resolver"
10+
11+
"github.com/go-chi/render"
12+
)
13+
14+
func dohRouter() http.Handler {
15+
return http.HandlerFunc(dohHandler)
16+
}
17+
18+
func dohHandler(w http.ResponseWriter, r *http.Request) {
19+
if resolver.DefaultResolver == nil {
20+
render.Status(r, http.StatusInternalServerError)
21+
render.JSON(w, r, newError("DNS section is disabled"))
22+
return
23+
}
24+
25+
if r.Header.Get("Accept") != "application/dns-message" {
26+
render.Status(r, http.StatusInternalServerError)
27+
render.JSON(w, r, newError("invalid accept header"))
28+
return
29+
}
30+
31+
var dnsData []byte
32+
var err error
33+
switch r.Method {
34+
case "GET":
35+
dnsData, err = base64.RawURLEncoding.DecodeString(r.URL.Query().Get("dns"))
36+
case "POST":
37+
if r.Header.Get("Content-Type") != "application/dns-message" {
38+
render.Status(r, http.StatusInternalServerError)
39+
render.JSON(w, r, newError("invalid content-type"))
40+
return
41+
}
42+
dnsData, err = io.ReadAll(r.Body)
43+
_ = r.Body.Close()
44+
default:
45+
render.Status(r, http.StatusMethodNotAllowed)
46+
render.JSON(w, r, newError("method not allowed"))
47+
return
48+
}
49+
if err != nil {
50+
render.Status(r, http.StatusInternalServerError)
51+
render.JSON(w, r, newError(err.Error()))
52+
return
53+
}
54+
55+
ctx, cancel := context.WithTimeout(context.Background(), resolver.DefaultDNSTimeout)
56+
defer cancel()
57+
58+
dnsData, err = resolver.RelayDnsPacket(ctx, dnsData, dnsData)
59+
if err != nil {
60+
render.Status(r, http.StatusInternalServerError)
61+
render.JSON(w, r, newError(err.Error()))
62+
return
63+
}
64+
65+
render.Status(r, http.StatusOK)
66+
render.Data(w, r, dnsData)
67+
}

‎hub/route/server.go

+10-6
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func SetUIPath(path string) {
5050
uiPath = C.Path.Resolve(path)
5151
}
5252

53-
func router(isDebug bool, withAuth bool) *chi.Mux {
53+
func router(isDebug bool, withAuth bool, dohServer string) *chi.Mux {
5454
r := chi.NewRouter()
5555
corsM := cors.New(cors.Options{
5656
AllowedOrigins: []string{"*"},
@@ -104,11 +104,15 @@ func router(isDebug bool, withAuth bool) *chi.Mux {
104104
})
105105
})
106106
}
107+
if len(dohServer) > 0 && dohServer[0] == '/' {
108+
r.Mount(dohServer, dohRouter())
109+
}
110+
107111
return r
108112
}
109113

110114
func Start(addr string, tlsAddr string, secret string,
111-
certificate, privateKey string, isDebug bool) {
115+
certificate, privateKey string, dohServer string, isDebug bool) {
112116
if serverAddr != "" {
113117
return
114118
}
@@ -133,7 +137,7 @@ func Start(addr string, tlsAddr string, secret string,
133137
serverAddr = l.Addr().String()
134138
log.Infoln("RESTful API tls listening at: %s", serverAddr)
135139
tlsServe := &http.Server{
136-
Handler: router(isDebug, true),
140+
Handler: router(isDebug, true, dohServer),
137141
TLSConfig: &tls.Config{
138142
Certificates: []tls.Certificate{c},
139143
},
@@ -152,13 +156,13 @@ func Start(addr string, tlsAddr string, secret string,
152156
serverAddr = l.Addr().String()
153157
log.Infoln("RESTful API listening at: %s", serverAddr)
154158

155-
if err = http.Serve(l, router(isDebug, true)); err != nil {
159+
if err = http.Serve(l, router(isDebug, true, dohServer)); err != nil {
156160
log.Errorln("External controller serve error: %s", err)
157161
}
158162

159163
}
160164

161-
func StartUnix(addr string, isDebug bool) {
165+
func StartUnix(addr string, dohServer string, isDebug bool) {
162166
addr = C.Path.Resolve(addr)
163167

164168
dir := filepath.Dir(addr)
@@ -186,7 +190,7 @@ func StartUnix(addr string, isDebug bool) {
186190
serverAddr = l.Addr().String()
187191
log.Infoln("RESTful API unix listening at: %s", serverAddr)
188192

189-
if err = http.Serve(l, router(isDebug, false)); err != nil {
193+
if err = http.Serve(l, router(isDebug, false, dohServer)); err != nil {
190194
log.Errorln("External controller unix serve error: %s", err)
191195
}
192196
}

0 commit comments

Comments
 (0)