mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-10-25 07:15:01 +03:00
e0d2a0c58c
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.
204 lines
5.6 KiB
Go
204 lines
5.6 KiB
Go
package service
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
type FallbackService struct{}
|
|
|
|
// FallbackInput is the payload shape POSTed by the inbound form.
|
|
type FallbackInput struct {
|
|
ChildId int `json:"childId"`
|
|
Name string `json:"name"`
|
|
Alpn string `json:"alpn"`
|
|
Path string `json:"path"`
|
|
Dest string `json:"dest"`
|
|
Xver int `json:"xver"`
|
|
SortOrder int `json:"sortOrder"`
|
|
}
|
|
|
|
// GetByMaster returns every fallback rule attached to the master inbound.
|
|
func (s *FallbackService) GetByMaster(masterId int) ([]model.InboundFallback, error) {
|
|
var rows []model.InboundFallback
|
|
err := database.GetDB().
|
|
Where("master_id = ?", masterId).
|
|
Order("sort_order ASC, id ASC").
|
|
Find(&rows).Error
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return rows, nil
|
|
}
|
|
|
|
// GetParentForChild finds the first fallback rule that points at childId.
|
|
// Used by client-link generation: when a child inbound is attached as a
|
|
// fallback, its client links should advertise the master's address+port
|
|
// and TLS instead of the child's loopback listen.
|
|
func (s *FallbackService) GetParentForChild(childId int) (*model.InboundFallback, error) {
|
|
var row model.InboundFallback
|
|
err := database.GetDB().
|
|
Where("child_id = ?", childId).
|
|
Order("sort_order ASC, id ASC").
|
|
First(&row).Error
|
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
|
return nil, nil
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &row, nil
|
|
}
|
|
|
|
// SetByMaster replaces the master's entire fallback list atomically.
|
|
func (s *FallbackService) SetByMaster(masterId int, items []FallbackInput) error {
|
|
db := database.GetDB()
|
|
return db.Transaction(func(tx *gorm.DB) error {
|
|
if err := tx.Where("master_id = ?", masterId).Delete(&model.InboundFallback{}).Error; err != nil {
|
|
return err
|
|
}
|
|
for i, c := range items {
|
|
childId := c.ChildId
|
|
if childId == masterId {
|
|
childId = 0
|
|
}
|
|
if childId <= 0 && strings.TrimSpace(c.Dest) == "" {
|
|
continue
|
|
}
|
|
row := model.InboundFallback{
|
|
MasterId: masterId,
|
|
ChildId: childId,
|
|
Name: c.Name,
|
|
Alpn: c.Alpn,
|
|
Path: c.Path,
|
|
Dest: c.Dest,
|
|
Xver: c.Xver,
|
|
SortOrder: c.SortOrder,
|
|
}
|
|
if row.SortOrder == 0 {
|
|
row.SortOrder = i
|
|
}
|
|
if err := tx.Create(&row).Error; err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
}
|
|
|
|
func (s *FallbackService) BuildFallbacksJSON(tx *gorm.DB, masterId int) ([]map[string]any, error) {
|
|
if tx == nil {
|
|
tx = database.GetDB()
|
|
}
|
|
var rows []model.InboundFallback
|
|
err := tx.Where("master_id = ?", masterId).
|
|
Order("sort_order ASC, id ASC").
|
|
Find(&rows).Error
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if len(rows) == 0 {
|
|
return nil, nil
|
|
}
|
|
|
|
childIds := make([]int, 0, len(rows))
|
|
for i := range rows {
|
|
childIds = append(childIds, rows[i].ChildId)
|
|
}
|
|
var children []model.Inbound
|
|
if err := tx.Where("id IN ?", childIds).Find(&children).Error; err != nil {
|
|
return nil, err
|
|
}
|
|
byId := make(map[int]*model.Inbound, len(children))
|
|
for i := range children {
|
|
byId[children[i].Id] = &children[i]
|
|
}
|
|
|
|
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 {
|
|
continue
|
|
}
|
|
listen := strings.TrimSpace(child.Listen)
|
|
if listen == "" || listen == "0.0.0.0" || listen == "::" || listen == "::0" {
|
|
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,
|
|
}
|
|
if r.Name != "" {
|
|
entry["name"] = r.Name
|
|
}
|
|
if r.Alpn != "" {
|
|
entry["alpn"] = r.Alpn
|
|
}
|
|
if r.Path != "" {
|
|
entry["path"] = r.Path
|
|
}
|
|
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
|
|
}
|