Skip to content

Commit cd2d1c6

Browse files
wwqgtxxwwqgtxx
committed
fix: skip-auth-prefixes not apply on listeners when users is unset
1 parent 88bfe7c commit cd2d1c6

File tree

11 files changed

+69
-48
lines changed

11 files changed

+69
-48
lines changed

‎component/auth/auth.go

+5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ type Authenticator interface {
55
Users() []string
66
}
77

8+
type AuthStore interface {
9+
Authenticator() Authenticator
10+
SetAuthenticator(Authenticator)
11+
}
12+
813
type AuthUser struct {
914
User string
1015
Pass string

‎hub/executor/executor.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func initInnerTcp() {
127127
func GetGeneral() *config.General {
128128
ports := listener.GetPorts()
129129
var authenticator []string
130-
if auth := authStore.Authenticator(); auth != nil {
130+
if auth := authStore.Default.Authenticator(); auth != nil {
131131
authenticator = auth.Users()
132132
}
133133

@@ -422,7 +422,7 @@ func updateGeneral(general *config.General) {
422422

423423
func updateUsers(users []auth.AuthUser) {
424424
authenticator := auth.NewAuthenticator(users)
425-
authStore.SetAuthenticator(authenticator)
425+
authStore.Default.SetAuthenticator(authenticator)
426426
if authenticator != nil {
427427
log.Infoln("Authentication of local server updated")
428428
}

‎listener/auth/auth.go

+22-6
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,30 @@ import (
44
"github.com/metacubex/mihomo/component/auth"
55
)
66

7-
var authenticator auth.Authenticator
7+
type authStore struct {
8+
authenticator auth.Authenticator
9+
}
10+
11+
func (a *authStore) Authenticator() auth.Authenticator {
12+
return a.authenticator
13+
}
14+
15+
func (a *authStore) SetAuthenticator(authenticator auth.Authenticator) {
16+
a.authenticator = authenticator
17+
}
818

9-
func Authenticator() auth.Authenticator {
10-
return authenticator
19+
func NewAuthStore(authenticator auth.Authenticator) auth.AuthStore {
20+
return &authStore{authenticator}
1121
}
1222

13-
func SetAuthenticator(au auth.Authenticator) {
14-
authenticator = au
23+
var Default auth.AuthStore = NewAuthStore(nil)
24+
25+
type nilAuthStore struct{}
26+
27+
func (a *nilAuthStore) Authenticator() auth.Authenticator {
28+
return nil
1529
}
1630

17-
func Nil() auth.Authenticator { return nil }
31+
func (a *nilAuthStore) SetAuthenticator(authenticator auth.Authenticator) {}
32+
33+
var Nil auth.AuthStore = (*nilAuthStore)(nil) // always return nil, even call SetAuthenticator() with a non-nil authenticator

‎listener/http/proxy.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (b *bodyWrapper) Read(p []byte) (n int, err error) {
3030
return n, err
3131
}
3232

33-
func HandleConn(c net.Conn, tunnel C.Tunnel, getAuth func() auth.Authenticator, additions ...inbound.Addition) {
33+
func HandleConn(c net.Conn, tunnel C.Tunnel, store auth.AuthStore, additions ...inbound.Addition) {
3434
additions = append(additions, inbound.Placeholder) // Add a placeholder for InUser
3535
inUserIdx := len(additions) - 1
3636
client := newClient(c, tunnel, additions)
@@ -41,7 +41,7 @@ func HandleConn(c net.Conn, tunnel C.Tunnel, getAuth func() auth.Authenticator,
4141

4242
conn := N.NewBufferedConn(c)
4343

44-
authenticator := getAuth()
44+
authenticator := store.Authenticator()
4545
keepAlive := true
4646
trusted := authenticator == nil // disable authenticate if lru is nil
4747
lastUser := ""

‎listener/http/server.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@ func (l *Listener) Close() error {
3232
}
3333

3434
func New(addr string, tunnel C.Tunnel, additions ...inbound.Addition) (*Listener, error) {
35-
return NewWithAuthenticator(addr, tunnel, authStore.Authenticator, additions...)
35+
return NewWithAuthenticator(addr, tunnel, authStore.Default, additions...)
3636
}
3737

3838
// NewWithAuthenticate
3939
// never change type traits because it's used in CMFA
4040
func NewWithAuthenticate(addr string, tunnel C.Tunnel, authenticate bool, additions ...inbound.Addition) (*Listener, error) {
41-
getAuth := authStore.Authenticator
41+
store := authStore.Default
4242
if !authenticate {
43-
getAuth = authStore.Nil
43+
store = authStore.Default
4444
}
45-
return NewWithAuthenticator(addr, tunnel, getAuth, additions...)
45+
return NewWithAuthenticator(addr, tunnel, store, additions...)
4646
}
4747

48-
func NewWithAuthenticator(addr string, tunnel C.Tunnel, getAuth func() auth.Authenticator, additions ...inbound.Addition) (*Listener, error) {
48+
func NewWithAuthenticator(addr string, tunnel C.Tunnel, store auth.AuthStore, additions ...inbound.Addition) (*Listener, error) {
4949
isDefault := false
5050
if len(additions) == 0 {
5151
isDefault = true
@@ -74,17 +74,17 @@ func NewWithAuthenticator(addr string, tunnel C.Tunnel, getAuth func() auth.Auth
7474
continue
7575
}
7676

77-
getAuth := getAuth
78-
if isDefault { // only apply on default listener
77+
store := store
78+
if isDefault || store == authStore.Default { // only apply on default listener
7979
if !inbound.IsRemoteAddrDisAllowed(conn.RemoteAddr()) {
8080
_ = conn.Close()
8181
continue
8282
}
8383
if inbound.SkipAuthRemoteAddr(conn.RemoteAddr()) {
84-
getAuth = authStore.Nil
84+
store = authStore.Nil
8585
}
8686
}
87-
go HandleConn(conn, tunnel, getAuth, additions...)
87+
go HandleConn(conn, tunnel, store, additions...)
8888
}
8989
}()
9090

‎listener/inbound/auth.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ type AuthUser struct {
1212

1313
type AuthUsers []AuthUser
1414

15-
func (a AuthUsers) GetAuth() func() auth.Authenticator {
15+
func (a AuthUsers) GetAuthStore() auth.AuthStore {
1616
if a != nil { // structure's Decode will ensure value not nil when input has value even it was set an empty array
1717
if len(a) == 0 {
1818
return authStore.Nil
@@ -25,7 +25,7 @@ func (a AuthUsers) GetAuth() func() auth.Authenticator {
2525
}
2626
}
2727
authenticator := auth.NewAuthenticator(users)
28-
return func() auth.Authenticator { return authenticator }
28+
return authStore.NewAuthStore(authenticator)
2929
}
30-
return authStore.Authenticator
30+
return authStore.Default
3131
}

‎listener/inbound/http.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func (h *HTTP) Address() string {
4545
// Listen implements constant.InboundListener
4646
func (h *HTTP) Listen(tunnel C.Tunnel) error {
4747
var err error
48-
h.l, err = http.NewWithAuthenticator(h.RawAddress(), tunnel, h.config.Users.GetAuth(), h.Additions()...)
48+
h.l, err = http.NewWithAuthenticator(h.RawAddress(), tunnel, h.config.Users.GetAuthStore(), h.Additions()...)
4949
if err != nil {
5050
return err
5151
}

‎listener/inbound/mixed.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (m *Mixed) Address() string {
5353
// Listen implements constant.InboundListener
5454
func (m *Mixed) Listen(tunnel C.Tunnel) error {
5555
var err error
56-
m.l, err = mixed.NewWithAuthenticator(m.RawAddress(), tunnel, m.config.Users.GetAuth(), m.Additions()...)
56+
m.l, err = mixed.NewWithAuthenticator(m.RawAddress(), tunnel, m.config.Users.GetAuthStore(), m.Additions()...)
5757
if err != nil {
5858
return err
5959
}

‎listener/inbound/socks.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (s *Socks) Address() string {
7171
// Listen implements constant.InboundListener
7272
func (s *Socks) Listen(tunnel C.Tunnel) error {
7373
var err error
74-
if s.stl, err = socks.NewWithAuthenticator(s.RawAddress(), tunnel, s.config.Users.GetAuth(), s.Additions()...); err != nil {
74+
if s.stl, err = socks.NewWithAuthenticator(s.RawAddress(), tunnel, s.config.Users.GetAuthStore(), s.Additions()...); err != nil {
7575
return err
7676
}
7777
if s.udp {

‎listener/mixed/mixed.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ func (l *Listener) Close() error {
3737
}
3838

3939
func New(addr string, tunnel C.Tunnel, additions ...inbound.Addition) (*Listener, error) {
40-
return NewWithAuthenticator(addr, tunnel, authStore.Authenticator, additions...)
40+
return NewWithAuthenticator(addr, tunnel, authStore.Default, additions...)
4141
}
4242

43-
func NewWithAuthenticator(addr string, tunnel C.Tunnel, getAuth func() auth.Authenticator, additions ...inbound.Addition) (*Listener, error) {
43+
func NewWithAuthenticator(addr string, tunnel C.Tunnel, store auth.AuthStore, additions ...inbound.Addition) (*Listener, error) {
4444
isDefault := false
4545
if len(additions) == 0 {
4646
isDefault = true
@@ -68,24 +68,24 @@ func NewWithAuthenticator(addr string, tunnel C.Tunnel, getAuth func() auth.Auth
6868
}
6969
continue
7070
}
71-
getAuth := getAuth
72-
if isDefault { // only apply on default listener
71+
store := store
72+
if isDefault || store == authStore.Default { // only apply on default listener
7373
if !inbound.IsRemoteAddrDisAllowed(c.RemoteAddr()) {
7474
_ = c.Close()
7575
continue
7676
}
7777
if inbound.SkipAuthRemoteAddr(c.RemoteAddr()) {
78-
getAuth = authStore.Nil
78+
store = authStore.Nil
7979
}
8080
}
81-
go handleConn(c, tunnel, getAuth, additions...)
81+
go handleConn(c, tunnel, store, additions...)
8282
}
8383
}()
8484

8585
return ml, nil
8686
}
8787

88-
func handleConn(conn net.Conn, tunnel C.Tunnel, getAuth func() auth.Authenticator, additions ...inbound.Addition) {
88+
func handleConn(conn net.Conn, tunnel C.Tunnel, store auth.AuthStore, additions ...inbound.Addition) {
8989
bufConn := N.NewBufferedConn(conn)
9090
head, err := bufConn.Peek(1)
9191
if err != nil {
@@ -94,10 +94,10 @@ func handleConn(conn net.Conn, tunnel C.Tunnel, getAuth func() auth.Authenticato
9494

9595
switch head[0] {
9696
case socks4.Version:
97-
socks.HandleSocks4(bufConn, tunnel, getAuth, additions...)
97+
socks.HandleSocks4(bufConn, tunnel, store, additions...)
9898
case socks5.Version:
99-
socks.HandleSocks5(bufConn, tunnel, getAuth, additions...)
99+
socks.HandleSocks5(bufConn, tunnel, store, additions...)
100100
default:
101-
http.HandleConn(bufConn, tunnel, getAuth, additions...)
101+
http.HandleConn(bufConn, tunnel, store, additions...)
102102
}
103103
}

‎listener/socks/tcp.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ func (l *Listener) Close() error {
3636
}
3737

3838
func New(addr string, tunnel C.Tunnel, additions ...inbound.Addition) (*Listener, error) {
39-
return NewWithAuthenticator(addr, tunnel, authStore.Authenticator, additions...)
39+
return NewWithAuthenticator(addr, tunnel, authStore.Default, additions...)
4040
}
4141

42-
func NewWithAuthenticator(addr string, tunnel C.Tunnel, getAuth func() auth.Authenticator, additions ...inbound.Addition) (*Listener, error) {
42+
func NewWithAuthenticator(addr string, tunnel C.Tunnel, store auth.AuthStore, additions ...inbound.Addition) (*Listener, error) {
4343
isDefault := false
4444
if len(additions) == 0 {
4545
isDefault = true
@@ -67,24 +67,24 @@ func NewWithAuthenticator(addr string, tunnel C.Tunnel, getAuth func() auth.Auth
6767
}
6868
continue
6969
}
70-
getAuth := getAuth
71-
if isDefault { // only apply on default listener
70+
store := store
71+
if isDefault || store == authStore.Default { // only apply on default listener
7272
if !inbound.IsRemoteAddrDisAllowed(c.RemoteAddr()) {
7373
_ = c.Close()
7474
continue
7575
}
7676
if inbound.SkipAuthRemoteAddr(c.RemoteAddr()) {
77-
getAuth = authStore.Nil
77+
store = authStore.Nil
7878
}
7979
}
80-
go handleSocks(c, tunnel, getAuth, additions...)
80+
go handleSocks(c, tunnel, store, additions...)
8181
}
8282
}()
8383

8484
return sl, nil
8585
}
8686

87-
func handleSocks(conn net.Conn, tunnel C.Tunnel, getAuth func() auth.Authenticator, additions ...inbound.Addition) {
87+
func handleSocks(conn net.Conn, tunnel C.Tunnel, store auth.AuthStore, additions ...inbound.Addition) {
8888
bufConn := N.NewBufferedConn(conn)
8989
head, err := bufConn.Peek(1)
9090
if err != nil {
@@ -94,16 +94,16 @@ func handleSocks(conn net.Conn, tunnel C.Tunnel, getAuth func() auth.Authenticat
9494

9595
switch head[0] {
9696
case socks4.Version:
97-
HandleSocks4(bufConn, tunnel, getAuth, additions...)
97+
HandleSocks4(bufConn, tunnel, store, additions...)
9898
case socks5.Version:
99-
HandleSocks5(bufConn, tunnel, getAuth, additions...)
99+
HandleSocks5(bufConn, tunnel, store, additions...)
100100
default:
101101
conn.Close()
102102
}
103103
}
104104

105-
func HandleSocks4(conn net.Conn, tunnel C.Tunnel, getAuth func() auth.Authenticator, additions ...inbound.Addition) {
106-
authenticator := getAuth()
105+
func HandleSocks4(conn net.Conn, tunnel C.Tunnel, store auth.AuthStore, additions ...inbound.Addition) {
106+
authenticator := store.Authenticator()
107107
addr, _, user, err := socks4.ServerHandshake(conn, authenticator)
108108
if err != nil {
109109
conn.Close()
@@ -113,8 +113,8 @@ func HandleSocks4(conn net.Conn, tunnel C.Tunnel, getAuth func() auth.Authentica
113113
tunnel.HandleTCPConn(inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS4, additions...))
114114
}
115115

116-
func HandleSocks5(conn net.Conn, tunnel C.Tunnel, getAuth func() auth.Authenticator, additions ...inbound.Addition) {
117-
authenticator := getAuth()
116+
func HandleSocks5(conn net.Conn, tunnel C.Tunnel, store auth.AuthStore, additions ...inbound.Addition) {
117+
authenticator := store.Authenticator()
118118
target, command, user, err := socks5.ServerHandshake(conn, authenticator)
119119
if err != nil {
120120
conn.Close()

0 commit comments

Comments
 (0)