From eb4791a1cdabebbf0b0d5a81a40ecc7d88924656 Mon Sep 17 00:00:00 2001 From: pwnnex Date: Wed, 22 Apr 2026 18:55:09 +0300 Subject: 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 --- sub/subService.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'sub/subService.go') diff --git a/sub/subService.go b/sub/subService.go index dd6bbcc9..44549390 100644 --- a/sub/subService.go +++ b/sub/subService.go @@ -115,12 +115,14 @@ func (s *SubService) GetSubs(subId string, host string) ([]string, int64, xray.C func (s *SubService) getInboundsBySubId(subId string) ([]*model.Inbound, error) { db := database.GetDB() var inbounds []*model.Inbound + // allow "hysteria2" so imports stored with the literal v2 protocol + // string still surface here (#4081) err := db.Model(model.Inbound{}).Preload("ClientStats").Where(`id in ( SELECT DISTINCT inbounds.id FROM inbounds, - JSON_EACH(JSON_EXTRACT(inbounds.settings, '$.clients')) AS client + JSON_EACH(JSON_EXTRACT(inbounds.settings, '$.clients')) AS client WHERE - protocol in ('vmess','vless','trojan','shadowsocks','hysteria') + protocol in ('vmess','vless','trojan','shadowsocks','hysteria','hysteria2') AND JSON_EXTRACT(client.value, '$.subId') = ? AND enable = ? )`, subId, true).Find(&inbounds).Error if err != nil { @@ -171,7 +173,7 @@ func (s *SubService) getLink(inbound *model.Inbound, email string) string { return s.genTrojanLink(inbound, email) case "shadowsocks": return s.genShadowsocksLink(inbound, email) - case "hysteria": + case "hysteria", "hysteria2": return s.genHysteriaLink(inbound, email) } return "" @@ -906,7 +908,7 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st } func (s *SubService) genHysteriaLink(inbound *model.Inbound, email string) string { - if inbound.Protocol != model.Hysteria { + if !model.IsHysteria(inbound.Protocol) { return "" } var stream map[string]interface{} -- cgit v1.2.3