diff options
| author | pwnnex <eternxles@gmail.com> | 2026-04-22 18:55:09 +0300 |
|---|---|---|
| committer | pwnnex <eternxles@gmail.com> | 2026-04-22 18:55:09 +0300 |
| commit | eb4791a1cdabebbf0b0d5a81a40ecc7d88924656 (patch) | |
| tree | 9c8e302bd2e0594f3d64341561716f83c4b1c56f /web/service | |
| parent | e6d0c33937f5776911e5fc1e9d8015d8a9323450 (diff) | |
hysteria: also accept "hysteria2" protocol string
UI stores v1 and v2 both as "hysteria" with settings.version, but
inbounds that came in from imports / manual SQL can carry the
literal "hysteria2" string and get silently dropped everywhere we
switch on protocol.
Add Hysteria2 constant + IsHysteria helper, use it in the places
that gate on protocol (sub SQL, getLink, genHysteriaLink, clash
buildProxy, json gen, inbound.go validation, xray AddUser).
Existing "hysteria" inbounds are untouched.
closes #4081
Diffstat (limited to 'web/service')
| -rw-r--r-- | web/service/inbound.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/web/service/inbound.go b/web/service/inbound.go index 5153b700..19c3d80c 100644 --- a/web/service/inbound.go +++ b/web/service/inbound.go @@ -270,7 +270,7 @@ func (s *InboundService) AddInbound(inbound *model.Inbound) (*model.Inbound, boo if client.Email == "" { return inbound, false, common.NewError("empty client ID") } - case "hysteria": + case "hysteria", "hysteria2": if client.Auth == "" { return inbound, false, common.NewError("empty client ID") } @@ -675,7 +675,7 @@ func (s *InboundService) AddInboundClient(data *model.Inbound) (bool, error) { if client.Email == "" { return false, common.NewError("empty client ID") } - case "hysteria": + case "hysteria", "hysteria2": if client.Auth == "" { return false, common.NewError("empty client ID") } @@ -769,7 +769,7 @@ func (s *InboundService) DelInboundClient(inboundId int, clientId string) (bool, client_key = "password" case "shadowsocks": client_key = "email" - case "hysteria": + case "hysteria", "hysteria2": client_key = "auth" } @@ -877,7 +877,7 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin case "shadowsocks": oldClientId = oldClient.Email newClientId = clients[0].Email - case "hysteria": + case "hysteria", "hysteria2": oldClientId = oldClient.Auth newClientId = clients[0].Auth default: |
