Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-06-06 21:24:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: Clash proxy entries missing reality-opts, client-fingerprint, network

Browse source 
- Fix REALITY settings extraction: publicKey/shortIds/fingerprint are
  nested under realitySettings.settings, not directly under realitySettings
- Add network field to all proxy entries (default "tcp")
- Move non-REALITY fingerprint into else branch to avoid duplication
This commit is contained in:
root 2026-04-25 20:32:30 +08:00
parent 25cf22d161
commit 0366a21d6d
2 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
docs/Tasktracking/2026-04-25-fix-clash-reality-opts.md Normal file
View file

@ -0,0 +1,13 @@
# Fix: Clash proxy entries missing reality-opts, client-fingerprint, network
## Date: 2026-04-25
## Changes
### Bug Fixes
- `sub/subClashService.go` — Fixed REALITY settings extraction: `publicKey` is at `realitySettings.settings.publicKey`, not `realitySettings.publicKey`. `shortIds` is an array (use first element). `fingerprint` is at `realitySettings.settings.fingerprint`.
- `sub/subClashService.go` — Added `network` field to all proxy entries (default "tcp")
- `sub/subClashService.go` — Moved non-REALITY fingerprint code inside the `else` branch to avoid duplication
### Version
- `config/version` — Bumped to v1.7.2.1

26
sub/subClashService.go
View file

@ -291,10 +291,12 @@ func (s *SubClashService) buildProxyEntry(inbound *model.Inbound, client model.C
parts = append(parts, "tls: true")
if security == "reality" {
realitySetting, _ := stream["realitySettings"].(map[string]any)
if publicKey, ok := realitySetting["publicKey"].(string); ok && publicKey != "" {
// publicKey and fingerprint are nested under realitySettings.settings
realityInner, _ := realitySetting["settings"].(map[string]any)
if publicKey, ok := realityInner["publicKey"].(string); ok && publicKey != "" {
realityOpts := fmt.Sprintf("reality-opts:\n public-key: %q", publicKey)
if shortId, ok := realitySetting["shortId"].(string); ok && shortId != "" {
realityOpts += fmt.Sprintf("\n short-id: %q", shortId)
if shortIds, ok := realitySetting["shortIds"].([]any); ok && len(shortIds) > 0 {
realityOpts += fmt.Sprintf("\n short-id: %q", fmt.Sprintf("%v", shortIds[0]))
}
parts = append(parts, realityOpts)
}
@ -304,6 +306,10 @@ func (s *SubClashService) buildProxyEntry(inbound *model.Inbound, client model.C
sni := fmt.Sprintf("%v", serverNames[0])
parts = append(parts, fmt.Sprintf("sni: %q", sni))
}
// Fingerprint from reality settings inner
if fp, ok := realityInner["fingerprint"].(string); ok && fp != "" {
parts = append(parts, fmt.Sprintf("client-fingerprint: %q", fp))
}
} else {
// TLS settings
tlsSetting, _ := stream["tlsSettings"].(map[string]any)
@ -317,10 +323,10 @@ func (s *SubClashService) buildProxyEntry(inbound *model.Inbound, client model.C
}
parts = append(parts, fmt.Sprintf("alpn: [%s]", strings.Join(alpnStrs, ", ")))
}
}
// Fingerprint
if fp, ok := stream["fingerprint"].(string); ok && fp != "" {
parts = append(parts, fmt.Sprintf("client-fingerprint: %q", fp))
// Fingerprint for non-REALITY TLS
if fp, ok := stream["fingerprint"].(string); ok && fp != "" {
parts = append(parts, fmt.Sprintf("client-fingerprint: %q", fp))
}
}
} else {
parts = append(parts, "tls: false")
@ -328,6 +334,12 @@ func (s *SubClashService) buildProxyEntry(inbound *model.Inbound, client model.C
parts = append(parts, "udp: true")
// Network type
if network == "" {
network = "tcp"
}
parts = append(parts, fmt.Sprintf("network: %s", network))
// Network-specific settings
switch network {
case "ws":