fix(fallback): derive a linked fallback's PROXY protocol header from its child (#6880)

Turning on Proxy Protocol for a local fallback target behind a VLESS/Trojan TLS
master broke the fallback: the row was saved with xver 0, so the master sent no
PROXY header and the child, now expecting one, rejected every connection (#6835).

A fallback without an explicit dest already takes its address from the child at
build time; it now also sends header v1 when the child accepts PROXY protocol
(sockopt or the raw/ws/httpupgrade transport flag) and the row sets no xver of
its own, so either order of enabling it works, from the panel or the API. Editing
a child's listen, port or PROXY flag rebuilds the masters that derive from it,
since re-adding only the child left them stale. Fixes #6835.
This commit is contained in:
Matt Van Horn
2026-10-23 22:30:09 -07:00
committed by GitHub
parent 136c1c4d50
commit e0d2a0c58c
3 changed files with 140 additions and 2 deletions
+50 -2
View File
@@ -1,6 +1,7 @@
package service
import (
"encoding/json"
"errors"
"fmt"
"strings"
@@ -123,6 +124,7 @@ func (s *FallbackService) BuildFallbacksJSON(tx *gorm.DB, masterId int) ([]map[s
out := make([]map[string]any, 0, len(rows))
for _, r := range rows {
dest := strings.TrimSpace(r.Dest)
xver := r.Xver
if dest == "" {
child, ok := byId[r.ChildId]
if !ok {
@@ -133,6 +135,11 @@ func (s *FallbackService) BuildFallbacksJSON(tx *gorm.DB, masterId int) ([]map[s
listen = "127.0.0.1"
}
dest = fmt.Sprintf("%s:%d", listen, child.Port)
// A child that accepts PROXY protocol rejects a fallback without the header (#6835);
// deriving it here keeps the row right through either order of toggling.
if xver == 0 && acceptsProxyProtocol(child.StreamSettings) {
xver = 1
}
}
entry := map[string]any{
"dest": dest,
@@ -146,10 +153,51 @@ func (s *FallbackService) BuildFallbacksJSON(tx *gorm.DB, masterId int) ([]map[s
if r.Path != "" {
entry["path"] = r.Path
}
if r.Xver > 0 {
entry["xver"] = r.Xver
if xver > 0 {
entry["xver"] = xver
}
out = append(out, entry)
}
return out, nil
}
// HasDerivedFallbackTo reports whether a master's fallback takes its dest and xver from childId.
func (s *FallbackService) HasDerivedFallbackTo(tx *gorm.DB, childId int) (bool, error) {
var n int64
err := tx.Model(&model.InboundFallback{}).Where("child_id = ? AND TRIM(dest) = ''", childId).Count(&n).Error
return n > 0, err
}
// fallbackTargetChanged reports whether an edit changed what a derived fallback is built from.
func fallbackTargetChanged(before, after *model.Inbound) bool {
return before.Listen != after.Listen || before.Port != after.Port ||
acceptsProxyProtocol(before.StreamSettings) != acceptsProxyProtocol(after.StreamSettings)
}
// proxyProtocolTransportKey maps the transports whose settings carry acceptProxyProtocol;
// RAW is stored as tcp, older rows say raw.
var proxyProtocolTransportKey = map[string]string{
"tcp": "tcpSettings",
"raw": "tcpSettings",
"ws": "wsSettings",
"httpupgrade": "httpupgradeSettings",
}
// acceptsProxyProtocol reports whether an inbound's listener expects a PROXY header, via
// sockopt or its transport, the two places xray-core wraps the listener.
func acceptsProxyProtocol(streamSettings string) bool {
var stream map[string]any
if json.Unmarshal([]byte(streamSettings), &stream) != nil {
return false
}
if sockopt, _ := stream["sockopt"].(map[string]any); sockopt["acceptProxyProtocol"] == true {
return true
}
network, _ := stream["network"].(string)
key, ok := proxyProtocolTransportKey[strings.ToLower(network)]
if !ok {
return false
}
transport, _ := stream[key].(map[string]any)
return transport["acceptProxyProtocol"] == true
}