mirror of
https://github.com/XTLS/Xray-core.git
synced 2026-05-08 14:13:22 +00:00
Hysteria inbound: Use transport's authentication when there are no clients (#5942)
This commit is contained in:
@@ -450,6 +450,7 @@ func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.Me
|
||||
}
|
||||
|
||||
requireDatagram := hyCtx.RequireDatagramFromContext(ctx)
|
||||
dest.Network = net.Network_UDP
|
||||
config := streamSettings.ProtocolSettings.(*Config)
|
||||
|
||||
initmanager.Do(func() {
|
||||
@@ -464,8 +465,8 @@ func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.Me
|
||||
},
|
||||
}).Start()
|
||||
})
|
||||
|
||||
manager.mutex.Lock()
|
||||
dest.Network = net.Network_UDP
|
||||
c, ok := manager.m[dialerConf{Destination: dest, MemoryStreamConfig: streamSettings}]
|
||||
if !ok {
|
||||
c = &client{
|
||||
|
||||
@@ -175,10 +175,10 @@ func (h *httpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
var user *protocol.MemoryUser
|
||||
var ok bool
|
||||
if h.validator != nil {
|
||||
if h.validator != nil && h.validator.GetCount() > 0 {
|
||||
user = h.validator.Get(auth)
|
||||
} else if auth == h.config.Auth {
|
||||
ok = true
|
||||
} else if h.config.Auth != "" {
|
||||
ok = auth == h.config.Auth
|
||||
}
|
||||
|
||||
if user != nil || ok {
|
||||
|
||||
Reference in New Issue
Block a user