Skip to content

Commit fc9d5cf

Browse files
wwqgtxxwwqgtxx
committed
feat: add external-controller-cors can config allow-origins and allow-private-network 
1 parent 2647135 commit fc9d5cf

File tree

6 files changed

+56
-26
lines changed

6 files changed

+56
-26
lines changed

‎config/config.go

+20
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,12 @@ type Controller struct {
107107
ExternalUI string
108108
ExternalDohServer string
109109
Secret string
110+
Cors Cors
111+
}
112+
113+
type Cors struct {
114+
AllowOrigins []string
115+
AllowPrivateNetwork bool
110116
}
111117

112118
// Experimental config
@@ -191,6 +197,11 @@ type Config struct {
191197
TLS *TLS
192198
}
193199

200+
type RawCors struct {
201+
AllowOrigins []string `yaml:"allow-origins" json:"allow-origins"`
202+
AllowPrivateNetwork bool `yaml:"allow-private-network" json:"allow-private-network"`
203+
}
204+
194205
type RawDNS struct {
195206
Enable bool `yaml:"enable" json:"enable"`
196207
PreferH3 bool `yaml:"prefer-h3" json:"prefer-h3"`
@@ -368,6 +379,7 @@ type RawConfig struct {
368379
ExternalControllerPipe string `yaml:"external-controller-pipe" json:"external-controller-pipe"`
369380
ExternalControllerUnix string `yaml:"external-controller-unix" json:"external-controller-unix"`
370381
ExternalControllerTLS string `yaml:"external-controller-tls" json:"external-controller-tls"`
382+
ExternalControllerCors RawCors `yaml:"external-controller-cors" json:"external-controller-cors"`
371383
ExternalUI string `yaml:"external-ui" json:"external-ui"`
372384
ExternalUIURL string `yaml:"external-ui-url" json:"external-ui-url"`
373385
ExternalUIName string `yaml:"external-ui-name" json:"external-ui-name"`
@@ -541,6 +553,10 @@ func DefaultRawConfig() *RawConfig {
541553
OverrideDest: true,
542554
},
543555
ExternalUIURL: "https://github.com/MetaCubeX/metacubexd/archive/refs/heads/gh-pages.zip",
556+
ExternalControllerCors: RawCors{
557+
AllowOrigins: []string{"*"},
558+
AllowPrivateNetwork: true,
559+
},
544560
}
545561
}
546562

@@ -775,6 +791,10 @@ func parseController(cfg *RawConfig) (*Controller, error) {
775791
ExternalControllerUnix: cfg.ExternalControllerUnix,
776792
ExternalControllerTLS: cfg.ExternalControllerTLS,
777793
ExternalDohServer: cfg.ExternalDohServer,
794+
Cors: Cors{
795+
AllowOrigins: cfg.ExternalControllerCors.AllowOrigins,
796+
AllowPrivateNetwork: cfg.ExternalControllerCors.AllowPrivateNetwork,
797+
},
778798
}, nil
779799
}
780800

‎docs/config.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ external-controller: 0.0.0.0:9093 # RESTful API 监听地址
5858
external-controller-tls: 0.0.0.0:9443 # RESTful API HTTPS 监听地址，需要配置 tls 部分配置文件
5959
# secret: "123456" # `Authorization:Bearer ${secret}`
6060

61+
# RESTful API CORS标头配置
62+
external-controller-cors:
63+
allow-origins:
64+
- *
65+
allow-private-network: true
66+
6167
# RESTful API Unix socket 监听地址（ windows版本大于17063也可以使用，即大于等于1803/RS4版本即可使用 ）
6268
# ！！！注意： 从Unix socket访问api接口不会验证secret， 如果开启请自行保证安全问题 ！！！
6369
# 测试方法： curl -v --unix-socket "mihomo.sock" http://localhost/

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ require (
88
github.com/coreos/go-iptables v0.7.0
99
github.com/dlclark/regexp2 v1.11.4
1010
github.com/go-chi/chi/v5 v5.1.0
11-
github.com/go-chi/cors v1.2.1
1211
github.com/go-chi/render v1.0.3
1312
github.com/gobwas/ws v1.4.0
1413
github.com/gofrs/uuid/v5 v5.3.0
@@ -37,6 +36,7 @@ require (
3736
github.com/openacid/low v0.1.21
3837
github.com/oschwald/maxminddb-golang v1.12.0
3938
github.com/puzpuzpuz/xsync/v3 v3.4.0
39+
github.com/sagernet/cors v1.2.1
4040
github.com/sagernet/fswatch v0.1.1
4141
github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a
4242
github.com/sagernet/sing v0.5.0-alpha.13

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXb
4242
github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
4343
github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
4444
github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
45-
github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
46-
github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
4745
github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
4846
github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
4947
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -160,6 +158,8 @@ github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
160158
github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
161159
github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
162160
github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
161+
github.com/sagernet/cors v1.2.1 h1:Cv5Z8y9YSD6Gm+qSpNrL3LO4lD3eQVvbFYJSG7JCMHQ=
162+
github.com/sagernet/cors v1.2.1/go.mod h1:O64VyOjjhrkLmQIjF4KGRrJO/5dVXFdpEmCW/eISRAI=
163163
github.com/sagernet/fswatch v0.1.1 h1:YqID+93B7VRfqIH3PArW/XpJv5H4OLEVWDfProGoRQs=
164164
github.com/sagernet/fswatch v0.1.1/go.mod h1:nz85laH0mkQqJfaOrqPpkwtU1znMFNVTpT/5oRsVz/o=
165165
github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=

‎hub/hub.go

+4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ func applyRoute(cfg *config.Config) {
5959
PrivateKey: cfg.TLS.PrivateKey,
6060
DohServer: cfg.Controller.ExternalDohServer,
6161
IsDebug: cfg.General.LogLevel == log.DEBUG,
62+
Cors: route.Cors{
63+
AllowOrigins: cfg.Controller.Cors.AllowOrigins,
64+
AllowPrivateNetwork: cfg.Controller.Cors.AllowPrivateNetwork,
65+
},
6266
})
6367
}
6468

‎hub/route/server.go

+23-23
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323

2424
"github.com/go-chi/chi/v5"
2525
"github.com/go-chi/chi/v5/middleware"
26-
"github.com/go-chi/cors"
2726
"github.com/go-chi/render"
2827
"github.com/gobwas/ws"
2928
"github.com/gobwas/ws/wsutil"
29+
"github.com/sagernet/cors"
3030
)
3131

3232
var (
@@ -58,6 +58,22 @@ type Config struct {
5858
PrivateKey string
5959
DohServer string
6060
IsDebug bool
61+
Cors Cors
62+
}
63+
64+
type Cors struct {
65+
AllowOrigins []string
66+
AllowPrivateNetwork bool
67+
}
68+
69+
func (c Cors) Apply(r chi.Router) {
70+
r.Use(cors.New(cors.Options{
71+
AllowedOrigins: c.AllowOrigins,
72+
AllowedMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE"},
73+
AllowedHeaders: []string{"Content-Type", "Authorization"},
74+
AllowPrivateNetwork: c.AllowPrivateNetwork,
75+
MaxAge: 300,
76+
}).Handler)
6177
}
6278

6379
func ReCreateServer(cfg *Config) {
@@ -73,16 +89,9 @@ func SetUIPath(path string) {
7389
uiPath = C.Path.Resolve(path)
7490
}
7591

76-
func router(isDebug bool, secret string, dohServer string) *chi.Mux {
92+
func router(isDebug bool, secret string, dohServer string, cors Cors) *chi.Mux {
7793
r := chi.NewRouter()
78-
corsM := cors.New(cors.Options{
79-
AllowedOrigins: []string{"*"},
80-
AllowedMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE"},
81-
AllowedHeaders: []string{"Content-Type", "Authorization"},
82-
MaxAge: 300,
83-
})
84-
r.Use(setPrivateNetworkAccess)
85-
r.Use(corsM.Handler)
94+
cors.Apply(r)
8695
if isDebug {
8796
r.Mount("/debug", func() http.Handler {
8897
r := chi.NewRouter()
@@ -151,7 +160,7 @@ func start(cfg *Config) {
151160
log.Infoln("RESTful API listening at: %s", l.Addr().String())
152161

153162
server := &http.Server{
154-
Handler: router(cfg.IsDebug, cfg.Secret, cfg.DohServer),
163+
Handler: router(cfg.IsDebug, cfg.Secret, cfg.DohServer, cfg.Cors),
155164
}
156165
httpServer = server
157166
if err = server.Serve(l); err != nil {
@@ -183,7 +192,7 @@ func startTLS(cfg *Config) {
183192

184193
log.Infoln("RESTful API tls listening at: %s", l.Addr().String())
185194
server := &http.Server{
186-
Handler: router(cfg.IsDebug, cfg.Secret, cfg.DohServer),
195+
Handler: router(cfg.IsDebug, cfg.Secret, cfg.DohServer, cfg.Cors),
187196
TLSConfig: &tls.Config{
188197
Certificates: []tls.Certificate{c},
189198
},
@@ -232,7 +241,7 @@ func startUnix(cfg *Config) {
232241
log.Infoln("RESTful API unix listening at: %s", l.Addr().String())
233242

234243
server := &http.Server{
235-
Handler: router(cfg.IsDebug, "", cfg.DohServer),
244+
Handler: router(cfg.IsDebug, "", cfg.DohServer, cfg.Cors),
236245
}
237246
unixServer = server
238247
if err = server.Serve(l); err != nil {
@@ -263,7 +272,7 @@ func startPipe(cfg *Config) {
263272
log.Infoln("RESTful API pipe listening at: %s", l.Addr().String())
264273

265274
server := &http.Server{
266-
Handler: router(cfg.IsDebug, "", cfg.DohServer),
275+
Handler: router(cfg.IsDebug, "", cfg.DohServer, cfg.Cors),
267276
}
268277
pipeServer = server
269278
if err = server.Serve(l); err != nil {
@@ -272,15 +281,6 @@ func startPipe(cfg *Config) {
272281
}
273282
}
274283

275-
func setPrivateNetworkAccess(next http.Handler) http.Handler {
276-
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
277-
if r.Method == http.MethodOptions && r.Header.Get("Access-Control-Request-Method") != "" {
278-
w.Header().Add("Access-Control-Allow-Private-Network", "true")
279-
}
280-
next.ServeHTTP(w, r)
281-
})
282-
}
283-
284284
func safeEuqal(a, b string) bool {
285285
aBuf := utils.ImmutableBytesFromString(a)
286286
bBuf := utils.ImmutableBytesFromString(b)

0 commit comments

Comments
 (0)