pjandro/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-11-02 11:15:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(sub): encode the link host and the VLESS id in share links

Browse Source 
joinHostPort wrote an endpoint address into the authority of every URL
share link unencoded, and genVlessLink alone skipped encodeUserinfo for
the client id. Both can come from a node's sync (an externalProxy dest,
an adopted host row, the client id), the finished link is never
re-parsed, and the raw subscription is one link per line: a line break
in either added lines of the node's choosing to the master's
subscription, and an id carrying "@" moved the client's VLESS links on
other inbounds to another server.

Whitespace, control characters and URI delimiters in the host are now
percent-encoded, which leaves host names, IP literals and zone ids
unchanged, and the VLESS id is encoded as userinfo like every other
protocol's credential.
This commit is contained in:
MHSanaei
2026-11-01 00:10:23 +01:00
parent d3df3e9ea7
commit 05abd00bf6
2 changed files with 67 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/sub/service.go
+17 -3
View File
@@ -1359,7 +1359,7 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
params,
security,
func(ep map[string]any, dest string, port int) string {
return fmt.Sprintf("vless://%s@%s", applyVlessRoute(uuid, hostVlessRoute(ep)), joinHostPort(dest, port))
return fmt.Sprintf("vless://%s@%s", encodeUserinfo(applyVlessRoute(uuid, hostVlessRoute(ep))), joinHostPort(dest, port))
},
func(ep map[string]any) string {
return s.endpointRemark(inbound, email, ep, streamNetwork)
@@ -1367,7 +1367,7 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
)
}
link := fmt.Sprintf("vless://%s@%s", uuid, joinHostPort(address, port))
link := fmt.Sprintf("vless://%s@%s", encodeUserinfo(uuid), joinHostPort(address, port))
return buildLinkWithParams(link, params, s.genRemark(inbound, email, "", streamNetwork))
}
@@ -1441,7 +1441,21 @@ func encodeUserinfo(s string) string {
// callers don't have to normalize upstream.
func joinHostPort(host string, port int) string {
host = strings.Trim(host, "[]")
return net.JoinHostPort(host, strconv.Itoa(port))
return net.JoinHostPort(escapeLinkHost(host), strconv.Itoa(port))
}
// escapeLinkHost percent-encodes whitespace, control characters and URI delimiters: a
// node-reported address is never re-parsed, so a raw line break would end the link's line.
func escapeLinkHost(host string) string {
var sb strings.Builder
for _, r := range host {
if r == ' ' || !strconv.IsPrint(r) || strings.ContainsRune("\"#/<>?@[\\]^`{|}", r) {
sb.WriteString(encodeURIComponent(string(r)))
} else {
sb.WriteRune(r)
}
}
return sb.String()
}
func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) string {