* Fix Hysteria External Proxy + include Hysteria in Clash subscription (#4053) Two related gaps on the Hysteria side of the subscription layer: 1) `genHysteriaLink` ignored `externalProxy` entirely, so an admin who pointed a Hysteria inbound at an alternate endpoint (e.g. a CDN hostname forwarding UDP back to the node) still got a link with the original server address. Mirror what `genVlessLink` / `genTrojanLink` already do: fan out one link per entry, substituting `dest` / `port` and picking up the entry's remark suffix. As a bonus, the salamander obfs password is now copied into the URL too — the panel-side link generator already did this, so the subscription output was lagging behind it. 2) `buildProxy` in `subClashService.go` had a protocol switch with cases for VMESS / VLESS / Trojan / Shadowsocks and a `default: return nil`. Hysteria inbounds fell into the default branch and silently vanished from the Clash YAML. Route Hysteria to a dedicated `buildHysteriaProxy` helper before the transport/security helpers run (applyTransport / applySecurity model xray streams, which Hysteria doesn't use). `buildHysteriaProxy` reads `inbound.StreamSettings` directly instead of going through `streamData` / `tlsData`, because those prune fields (`allowInsecure`, the salamander `finalmask.udp` block) that the mihomo Hysteria proxy wants preserved. Output shape matches mihomo's expectations: type: hysteria2 # or "hysteria" for v1 password / auth-str: <client auth> sni, alpn, skip-cert-verify, client-fingerprint obfs: salamander obfs-password: <finalmask.udp[salamander].settings.password> The existing `getProxies` fanout over `externalProxy` already plugs in for Clash, so with Hysteria now recognised, External Proxy entries also flow through to the Clash output for Hysteria inbounds. Closes #4053 * gofmt: align map keys in buildHysteriaProxy --------- Co-authored-by: pwnnex <eternxles@gmail.com>
This commit is contained in:
+49
-3
@@ -906,7 +906,6 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st
|
||||
}
|
||||
|
||||
func (s *SubService) genHysteriaLink(inbound *model.Inbound, email string) string {
|
||||
address := s.address
|
||||
if inbound.Protocol != model.Hysteria {
|
||||
return ""
|
||||
}
|
||||
@@ -921,7 +920,6 @@ func (s *SubService) genHysteriaLink(inbound *model.Inbound, email string) strin
|
||||
}
|
||||
}
|
||||
auth := clients[clientIndex].Auth
|
||||
port := inbound.Port
|
||||
params := make(map[string]string)
|
||||
|
||||
params["security"] = "tls"
|
||||
@@ -950,6 +948,26 @@ func (s *SubService) genHysteriaLink(inbound *model.Inbound, email string) strin
|
||||
}
|
||||
}
|
||||
|
||||
// salamander obfs (Hysteria2). The panel-side link generator already
|
||||
// emits these; keep the subscription output in sync so a client has
|
||||
// the obfs password to match the server.
|
||||
if finalmask, ok := stream["finalmask"].(map[string]interface{}); ok {
|
||||
if udpMasks, ok := finalmask["udp"].([]interface{}); ok {
|
||||
for _, m := range udpMasks {
|
||||
mask, _ := m.(map[string]interface{})
|
||||
if mask == nil || mask["type"] != "salamander" {
|
||||
continue
|
||||
}
|
||||
settings, _ := mask["settings"].(map[string]interface{})
|
||||
if pw, ok := settings["password"].(string); ok && pw != "" {
|
||||
params["obfs"] = "salamander"
|
||||
params["obfs-password"] = pw
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var settings map[string]interface{}
|
||||
json.Unmarshal([]byte(inbound.Settings), &settings)
|
||||
version, _ := settings["version"].(float64)
|
||||
@@ -958,7 +976,35 @@ func (s *SubService) genHysteriaLink(inbound *model.Inbound, email string) strin
|
||||
protocol = "hysteria"
|
||||
}
|
||||
|
||||
link := fmt.Sprintf("%s://%s@%s:%d", protocol, auth, address, port)
|
||||
// Fan out one link per External Proxy entry if any. Previously this
|
||||
// generator ignored `externalProxy` entirely, so the link kept the
|
||||
// server's own IP/port even when the admin configured an alternate
|
||||
// endpoint (e.g. a CDN hostname + port that forwards to the node).
|
||||
// Matches the behaviour of genVlessLink / genTrojanLink / ….
|
||||
externalProxies, _ := stream["externalProxy"].([]interface{})
|
||||
if len(externalProxies) > 0 {
|
||||
links := make([]string, 0, len(externalProxies))
|
||||
for _, externalProxy := range externalProxies {
|
||||
ep, _ := externalProxy.(map[string]interface{})
|
||||
dest, _ := ep["dest"].(string)
|
||||
epPort := int(ep["port"].(float64))
|
||||
epRemark, _ := ep["remark"].(string)
|
||||
|
||||
link := fmt.Sprintf("%s://%s@%s:%d", protocol, auth, dest, epPort)
|
||||
u, _ := url.Parse(link)
|
||||
q := u.Query()
|
||||
for k, v := range params {
|
||||
q.Add(k, v)
|
||||
}
|
||||
u.RawQuery = q.Encode()
|
||||
u.Fragment = s.genRemark(inbound, email, epRemark)
|
||||
links = append(links, u.String())
|
||||
}
|
||||
return strings.Join(links, "\n")
|
||||
}
|
||||
|
||||
// No external proxy configured — fall back to the request host.
|
||||
link := fmt.Sprintf("%s://%s@%s:%d", protocol, auth, s.address, inbound.Port)
|
||||
url, _ := url.Parse(link)
|
||||
q := url.Query()
|
||||
for k, v := range params {
|
||||
|
||||
Reference in New Issue
Block a user