mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-02 19:25:05 +03:00
fix(xray): bound what the in-process config loader is asked to expand
The panel runs xray-core's conf.Build() in its own process on inbounds and on outbounds that come from pushes and subscriptions. Some values make it allocate or loop without bound (an XHTTP sessionIDLength, udphop port lists, any number of finalmask entries, each xmc one costing an RSA key), and certificate paths are read whole whatever they name. Refuse those before any build: sessionIDLength above 1024, more than one port range's worth of udphop ports per stream, more than 16 masks per stream, more than 64 xmc masks per outbound subscription, and certificate or key files that are not regular files of at most 1 MiB. Inbound saves, the TUIC readers and the certificate-pin helper apply the file rule too; the pin helper also stops looking at paths that name files on a node.
This commit is contained in:
@@ -19,6 +19,7 @@ import (
|
|||||||
"github.com/xtls/xray-core/transport/internet/hysteria/congestion/bbr"
|
"github.com/xtls/xray-core/transport/internet/hysteria/congestion/bbr"
|
||||||
|
|
||||||
"github.com/mhsanaei/3x-ui/v3/internal/logger"
|
"github.com/mhsanaei/3x-ui/v3/internal/logger"
|
||||||
|
"github.com/mhsanaei/3x-ui/v3/internal/xray"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Server is an in-process native Go TUIC v5 server terminating QUIC
|
// Server is an in-process native Go TUIC v5 server terminating QUIC
|
||||||
@@ -1089,6 +1090,12 @@ func loadCertificate(certInput, keyInput string) (tls.Certificate, error) {
|
|||||||
if strings.Contains(certInput, "-----BEGIN CERTIFICATE-----") {
|
if strings.Contains(certInput, "-----BEGIN CERTIFICATE-----") {
|
||||||
return tls.X509KeyPair([]byte(certInput), []byte(keyInput))
|
return tls.X509KeyPair([]byte(certInput), []byte(keyInput))
|
||||||
}
|
}
|
||||||
|
// A pushed inbound names these paths, and both are read whole.
|
||||||
|
for _, path := range []string{certInput, keyInput} {
|
||||||
|
if err := xray.CheckCertFile(path); err != nil {
|
||||||
|
return tls.Certificate{}, err
|
||||||
|
}
|
||||||
|
}
|
||||||
return tls.LoadX509KeyPair(certInput, keyInput)
|
return tls.LoadX509KeyPair(certInput, keyInput)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
||||||
|
"github.com/mhsanaei/3x-ui/v3/internal/xray"
|
||||||
)
|
)
|
||||||
|
|
||||||
type TuicServerSettings struct {
|
type TuicServerSettings struct {
|
||||||
@@ -73,7 +74,7 @@ func (inst Instance) StructuralFingerprint() string {
|
|||||||
|
|
||||||
func fingerprintMaterial(value string) string {
|
func fingerprintMaterial(value string) string {
|
||||||
material := []byte(value)
|
material := []byte(value)
|
||||||
if value != "" && !strings.Contains(value, "-----BEGIN ") {
|
if value != "" && !strings.Contains(value, "-----BEGIN ") && xray.CheckCertFile(value) == nil {
|
||||||
if file, err := os.ReadFile(value); err == nil {
|
if file, err := os.ReadFile(value); err == nil {
|
||||||
material = file
|
material = file
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package tuic
|
|||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
||||||
@@ -158,3 +159,23 @@ func TestBindTo(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A pushed TUIC inbound names any path on this host, and both readers take the file
|
||||||
|
// whole, so a device or an oversized file is refused before either opens it.
|
||||||
|
func TestCertificateReadersRefuseWhatIsNoBoundedRegularFile(t *testing.T) {
|
||||||
|
big := filepath.Join(t.TempDir(), "big.pem")
|
||||||
|
if err := os.WriteFile(big, make([]byte, 1<<20+1), 0o600); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := loadCertificate(big, big); err == nil || !strings.Contains(err.Error(), "regular file") {
|
||||||
|
t.Fatalf("loadCertificate(oversized) = %v, want the path refused before the read", err)
|
||||||
|
}
|
||||||
|
inst := Instance{Certificate: big}
|
||||||
|
before := inst.StructuralFingerprint()
|
||||||
|
if err := os.WriteFile(big, append(make([]byte, 1<<20), 1, 2), 0o600); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if inst.StructuralFingerprint() != before {
|
||||||
|
t.Fatal("the oversized certificate file was read into the fingerprint")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -713,6 +713,18 @@ func canonicalizeStreamNetworkKey(streamSettings string) string {
|
|||||||
return string(out)
|
return string(out)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// validateInboundBuildInput refuses what xray-core's in-process build would expand without
|
||||||
|
// bound; certificate paths are checked only where this host is the one opening them.
|
||||||
|
func validateInboundBuildInput(inbound *model.Inbound) error {
|
||||||
|
if err := xray.CheckStreamBuildCost([]byte(inbound.StreamSettings)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if inbound.NodeID != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return xray.CheckConfigCertFiles([]byte(inbound.StreamSettings))
|
||||||
|
}
|
||||||
|
|
||||||
// validateInboundTLSCertificates rejects incomplete TLS credentials before a save
|
// validateInboundTLSCertificates rejects incomplete TLS credentials before a save
|
||||||
// can restart Xray. File paths belong to the node, so only presence is checked.
|
// can restart Xray. File paths belong to the node, so only presence is checked.
|
||||||
func validateInboundTLSCertificates(streamSettings string) error {
|
func validateInboundTLSCertificates(streamSettings string) error {
|
||||||
@@ -1290,6 +1302,9 @@ func (s *InboundService) AddInbound(inbound *model.Inbound) (*model.Inbound, boo
|
|||||||
return inbound, false, err
|
return inbound, false, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if err := validateInboundBuildInput(inbound); err != nil {
|
||||||
|
return inbound, false, err
|
||||||
|
}
|
||||||
if err := validateFinalMaskRealityCombo(inbound.StreamSettings); err != nil {
|
if err := validateFinalMaskRealityCombo(inbound.StreamSettings); err != nil {
|
||||||
return inbound, false, err
|
return inbound, false, err
|
||||||
}
|
}
|
||||||
@@ -2007,6 +2022,9 @@ func (s *InboundService) UpdateInbound(inbound *model.Inbound) (*model.Inbound,
|
|||||||
}
|
}
|
||||||
inbound.SubSortIndex = normalizeSubSortIndex(inbound.SubSortIndex)
|
inbound.SubSortIndex = normalizeSubSortIndex(inbound.SubSortIndex)
|
||||||
|
|
||||||
|
if err := validateInboundBuildInput(inbound); err != nil {
|
||||||
|
return inbound, false, err
|
||||||
|
}
|
||||||
// Grandfather a row that was already stored incomplete so it stays editable;
|
// Grandfather a row that was already stored incomplete so it stays editable;
|
||||||
// only a save that breaks a previously valid TLS block is refused.
|
// only a save that breaks a previously valid TLS block is refused.
|
||||||
if !s.FromNodeSync {
|
if !s.FromNodeSync {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package service
|
package service
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"path/filepath"
|
||||||
"reflect"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
@@ -183,3 +184,34 @@ func TestUpdateInboundAllowsUntouchedLegacyTLSCertificates(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A push names any path on this host, and xray-core reads it whole in the panel process
|
||||||
|
// (a device never ends, /dev/zero never stops growing), so it is refused before storing.
|
||||||
|
func TestAddInboundRefusesACertificatePathThatIsNoRegularFile(t *testing.T) {
|
||||||
|
setupConflictDB(t)
|
||||||
|
mgr := useTestRuntimeManager(t)
|
||||||
|
fake := &fakeNodeRuntime{}
|
||||||
|
mgr.SetLocalRuntimeOverride(fake)
|
||||||
|
|
||||||
|
dir := filepath.ToSlash(t.TempDir())
|
||||||
|
inbound := &model.Inbound{
|
||||||
|
Tag: "tls-device-44311",
|
||||||
|
Enable: true,
|
||||||
|
Listen: "0.0.0.0",
|
||||||
|
Port: 44311,
|
||||||
|
Protocol: model.VLESS,
|
||||||
|
StreamSettings: `{"network":"tcp","security":"tls","tlsSettings":{"certificates":[{"certificateFile":"` + dir + `","KeyFile":"` + dir + `"}]}}`,
|
||||||
|
Settings: `{"clients":[]}`,
|
||||||
|
}
|
||||||
|
_, _, err := (&InboundService{FromNodeSync: true}).AddInbound(inbound)
|
||||||
|
if err == nil || !strings.Contains(err.Error(), "regular file") {
|
||||||
|
t.Fatalf("AddInbound = %v, want the certificate path refused", err)
|
||||||
|
}
|
||||||
|
var count int64
|
||||||
|
if err := database.GetDB().Model(&model.Inbound{}).Count(&count).Error; err != nil || count != 0 {
|
||||||
|
t.Fatalf("refused push stored %d row(s) (%v)", count, err)
|
||||||
|
}
|
||||||
|
if fake.addInbound.Load() != 0 {
|
||||||
|
t.Fatal("refused push reached the runtime")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -486,9 +486,14 @@ func (s *OutboundSubscriptionService) fetchOutbounds(sub *model.OutboundSubscrip
|
|||||||
// persisted (filtered) list, so positions must be counted in that same list.
|
// persisted (filtered) list, so positions must be counted in that same list.
|
||||||
var dropped []string
|
var dropped []string
|
||||||
ownPorts := xrayOwnPorts()
|
ownPorts := xrayOwnPorts()
|
||||||
|
xmcBudget := maxSubscriptionXMCMasks
|
||||||
keptLinks, keptIdentities := parsed[:0], identities[:0]
|
keptLinks, keptIdentities := parsed[:0], identities[:0]
|
||||||
for i, ob := range parsed {
|
for i, ob := range parsed {
|
||||||
if reason := internalDialTarget(map[string]any(ob), sub.AllowPrivate, ownPorts); reason != "" {
|
reason := internalDialTarget(map[string]any(ob), sub.AllowPrivate, ownPorts)
|
||||||
|
if reason == "" && !spendXMCBudget(map[string]any(ob), &xmcBudget) {
|
||||||
|
reason = fmt.Sprintf("the subscription uses more than %d xmc masks", maxSubscriptionXMCMasks)
|
||||||
|
}
|
||||||
|
if reason != "" {
|
||||||
logger.Warningf("outbound sub %d: dropping outbound %.64q: %s", sub.Id, ob["tag"], reason)
|
logger.Warningf("outbound sub %d: dropping outbound %.64q: %s", sub.Id, ob["tag"], reason)
|
||||||
dropped = append(dropped, fmt.Sprintf("%.64s: %s", ob["tag"], reason))
|
dropped = append(dropped, fmt.Sprintf("%.64s: %s", ob["tag"], reason))
|
||||||
continue
|
continue
|
||||||
@@ -531,6 +536,27 @@ func (s *OutboundSubscriptionService) fetchOutbounds(sub *model.OutboundSubscrip
|
|||||||
return fetched, nil
|
return fetched, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// maxSubscriptionXMCMasks bounds the RSA keys one subscription costs the core per build;
|
||||||
|
// the masks can be spread over links, so a per-stream cap alone does not bound it.
|
||||||
|
const maxSubscriptionXMCMasks = 64
|
||||||
|
|
||||||
|
func spendXMCBudget(outbound any, budget *int) bool {
|
||||||
|
ob, ok := outbound.(map[string]any)
|
||||||
|
if !ok {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
stream, err := json.Marshal(ob["streamSettings"])
|
||||||
|
if err != nil {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
n := xray.CountXMCMasks(stream)
|
||||||
|
if n > *budget {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
*budget -= n
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
// withoutRequestURL keeps only the host of the URL net/url and net/http quote in their
|
// withoutRequestURL keeps only the host of the URL net/url and net/http quote in their
|
||||||
// errors: a subscription URL is a credential, and these errors are logged and stored.
|
// errors: a subscription URL is a credential, and these errors are logged and stored.
|
||||||
func withoutRequestURL(err error) error {
|
func withoutRequestURL(err error) error {
|
||||||
@@ -652,6 +678,7 @@ func (s *OutboundSubscriptionService) activeOutboundsSplit() (prepend []any, app
|
|||||||
}
|
}
|
||||||
ownPorts := xrayOwnPorts()
|
ownPorts := xrayOwnPorts()
|
||||||
for _, sub := range subs {
|
for _, sub := range subs {
|
||||||
|
xmcBudget := maxSubscriptionXMCMasks
|
||||||
if strings.TrimSpace(sub.LastFetchedOutbounds) == "" {
|
if strings.TrimSpace(sub.LastFetchedOutbounds) == "" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -663,6 +690,9 @@ func (s *OutboundSubscriptionService) activeOutboundsSplit() (prepend []any, app
|
|||||||
// Rows stored before the fetch refused these, or while allowPrivate was on.
|
// Rows stored before the fetch refused these, or while allowPrivate was on.
|
||||||
arr = slices.DeleteFunc(arr, func(ob any) bool {
|
arr = slices.DeleteFunc(arr, func(ob any) bool {
|
||||||
reason := internalDialTarget(ob, sub.AllowPrivate, ownPorts)
|
reason := internalDialTarget(ob, sub.AllowPrivate, ownPorts)
|
||||||
|
if reason == "" && !spendXMCBudget(ob, &xmcBudget) {
|
||||||
|
reason = "over the subscription's xmc mask budget"
|
||||||
|
}
|
||||||
if reason != "" {
|
if reason != "" {
|
||||||
logger.Warningf("outbound sub %d: dropping a stored outbound: %s", sub.Id, reason)
|
logger.Warningf("outbound sub %d: dropping a stored outbound: %s", sub.Id, reason)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -695,3 +695,25 @@ func TestOutboundSubscriptionCreateKeepsItDisabled(t *testing.T) {
|
|||||||
t.Fatalf("stored enabled = %v (%v), want the subscription created disabled", stored.Enabled, err)
|
t.Fatalf("stored enabled = %v (%v), want the subscription created disabled", stored.Enabled, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The core derives an RSA key per xmc mask on every build, so the masks a document may
|
||||||
|
// spread over its links are budgeted per subscription, before anything is built.
|
||||||
|
func TestOutboundSubscriptionRefreshCapsXMCMasks(t *testing.T) {
|
||||||
|
setupSettingTestDB(t)
|
||||||
|
const xmc = `{"type":"xmc","settings":{"password":"p","profiles":[{"username":"abc","uuid":"00000000-0000-0000-0000-000000000000","texturesValue":"a","texturesSignature":"a"}]}}`
|
||||||
|
server := func(address string, masks ...string) string {
|
||||||
|
return "vless://00000000-0000-4000-8000-000000000000@" + address + ":443?security=tls&type=tcp&fm=" +
|
||||||
|
url.QueryEscape(`{"tcp":[`+strings.Join(masks, ",")+`]}`) + "#" + address + "\n"
|
||||||
|
}
|
||||||
|
four := []string{xmc, xmc, xmc, xmc}
|
||||||
|
subID := serveOutboundSubscription(t, "p-", func(int) string {
|
||||||
|
return server("1.1.1.1", slices.Repeat([]string{xmc}, 400)...) +
|
||||||
|
strings.Repeat(server("1.1.1.3", four...), maxSubscriptionXMCMasks/4) +
|
||||||
|
server("1.1.1.4", xmc) +
|
||||||
|
server("1.1.1.5", `{"type":"sudoku","settings":{"password":"p"}}`)
|
||||||
|
})
|
||||||
|
tags, byAddress := refreshOutboundTags(t, subID)
|
||||||
|
if _, plain := byAddress["1.1.1.5"]; len(tags) != maxSubscriptionXMCMasks/4+1 || len(byAddress) != 2 || !plain {
|
||||||
|
t.Fatalf("kept %d outbounds, tags by address = %v", len(tags), byAddress)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -2687,6 +2687,9 @@ func (s *ServerService) GetCertHash(certFile string, certContent string) ([]stri
|
|||||||
if !ok {
|
if !ok {
|
||||||
return nil, common.NewError("certificate file is not referenced by any inbound or panel setting")
|
return nil, common.NewError("certificate file is not referenced by any inbound or panel setting")
|
||||||
}
|
}
|
||||||
|
if err := xray.CheckCertFile(known); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
b, err := os.ReadFile(known)
|
b, err := os.ReadFile(known)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -2760,6 +2763,10 @@ func (s *ServerService) knownCertFiles() []string {
|
|||||||
}
|
}
|
||||||
if inbounds, err := s.inboundService.GetAllInbounds(); err == nil {
|
if inbounds, err := s.inboundService.GetAllInbounds(); err == nil {
|
||||||
for _, inbound := range inbounds {
|
for _, inbound := range inbounds {
|
||||||
|
// A node row's path names a file on the node's host, not on this one.
|
||||||
|
if inbound.NodeID != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
files = collectCertFiles(inbound.StreamSettings, files)
|
files = collectCertFiles(inbound.StreamSettings, files)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,9 +6,14 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
||||||
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
||||||
"github.com/mhsanaei/3x-ui/v3/internal/util/netsafe"
|
"github.com/mhsanaei/3x-ui/v3/internal/util/netsafe"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -36,3 +41,22 @@ func TestGetRemoteCertHashGuardsPrivateTargets(t *testing.T) {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A node reports its inbounds' certificate paths; they name files on the node, so the
|
||||||
|
// master must not read its own file of that name when the admin asks for a pin.
|
||||||
|
func TestGetCertHashIgnoresPathsANodeReports(t *testing.T) {
|
||||||
|
setupSettingTestDB(t)
|
||||||
|
certFile := filepath.Join(t.TempDir(), "cert.pem")
|
||||||
|
if err := os.WriteFile(certFile, []byte("not a certificate"), 0o600); err != nil {
|
||||||
|
t.Fatalf("write cert: %v", err)
|
||||||
|
}
|
||||||
|
nodeID := 1
|
||||||
|
stream := `{"security":"tls","tlsSettings":{"certificates":[{"certificateFile":` + strconv.Quote(certFile) + `}]}}`
|
||||||
|
if err := database.GetDB().Create(&model.Inbound{Tag: "node-in", Port: 44312, Protocol: model.VLESS, NodeID: &nodeID, StreamSettings: stream}).Error; err != nil {
|
||||||
|
t.Fatalf("seed node inbound: %v", err)
|
||||||
|
}
|
||||||
|
_, err := (&ServerService{}).GetCertHash(certFile, "")
|
||||||
|
if err == nil || !strings.Contains(err.Error(), "not referenced") {
|
||||||
|
t.Fatalf("GetCertHash(node-reported path) = %v, want it treated as unknown", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -150,6 +150,9 @@ func (x *XrayAPI) AddInbound(inbound []byte) error {
|
|||||||
logger.Debug("Failed to unmarshal inbound:", err)
|
logger.Debug("Failed to unmarshal inbound:", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if err := checkUntrustedBuildInput(conf.StreamSetting, inbound); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
localizeNoiseScripts(conf.StreamSetting)
|
localizeNoiseScripts(conf.StreamSetting)
|
||||||
config, err := conf.Build()
|
config, err := conf.Build()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -196,6 +199,9 @@ func ValidateOutboundConfig(outbound []byte) (err error) {
|
|||||||
if err := json.Unmarshal(outbound, detour); err != nil {
|
if err := json.Unmarshal(outbound, detour); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if err := checkUntrustedBuildInput(detour.StreamSetting, outbound); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
localizeNoiseScripts(detour.StreamSetting)
|
localizeNoiseScripts(detour.StreamSetting)
|
||||||
built, err := detour.Build()
|
built, err := detour.Build()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -314,6 +320,9 @@ func (x *XrayAPI) AddOutbound(outbound []byte) error {
|
|||||||
logger.Debug("Failed to unmarshal outbound:", err)
|
logger.Debug("Failed to unmarshal outbound:", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if err := checkUntrustedBuildInput(conf.StreamSetting, outbound); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
localizeNoiseScripts(conf.StreamSetting)
|
localizeNoiseScripts(conf.StreamSetting)
|
||||||
config, err := conf.Build()
|
config, err := conf.Build()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -0,0 +1,183 @@
|
|||||||
|
package xray
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/mhsanaei/3x-ui/v3/internal/util/common"
|
||||||
|
|
||||||
|
"github.com/xtls/xray-core/common/platform"
|
||||||
|
"github.com/xtls/xray-core/infra/conf"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// A session ID travels in a path segment, a header, a cookie or a query value.
|
||||||
|
maxXHTTPSessionIDLength = 1024
|
||||||
|
maxUDPHopPorts = 65536
|
||||||
|
maxStreamMasks = 16
|
||||||
|
maxCertFileBytes = 1 << 20
|
||||||
|
)
|
||||||
|
|
||||||
|
// CheckStreamBuildCost refuses stream settings that conf.Build(), which runs in the panel
|
||||||
|
// process, would expand without bound; settings the core cannot decode are left to it.
|
||||||
|
func CheckStreamBuildCost(raw []byte) error {
|
||||||
|
if len(raw) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
stream := new(conf.StreamConfig)
|
||||||
|
if json.Unmarshal(raw, stream) != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return checkStreamBuildCost(stream)
|
||||||
|
}
|
||||||
|
|
||||||
|
func checkStreamBuildCost(stream *conf.StreamConfig) error {
|
||||||
|
masks, hopPorts := 0, 0
|
||||||
|
return walkStreams(stream, func(s *conf.StreamConfig, xhttp *conf.SplitHTTPConfig) error {
|
||||||
|
if xhttp != nil {
|
||||||
|
if length := xhttp.SessionIDLength; length.From < 0 || length.To > maxXHTTPSessionIDLength {
|
||||||
|
return common.NewErrorf("xhttp sessionIDLength %s is outside 0-%d", length.String(), maxXHTTPSessionIDLength)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if s.FinalMask == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// Every mask costs a build, and an xmc one an RSA key derivation.
|
||||||
|
if masks += len(s.FinalMask.Tcp) + len(s.FinalMask.Udp); masks > maxStreamMasks {
|
||||||
|
return common.NewErrorf("finalmask lists more than %d masks", maxStreamMasks)
|
||||||
|
}
|
||||||
|
for _, mask := range s.FinalMask.Udp {
|
||||||
|
if !strings.EqualFold(mask.Type, "udphop") || mask.Settings == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
hop := new(conf.UDPHop)
|
||||||
|
if json.Unmarshal(*mask.Settings, hop) != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, r := range hop.RemotePorts.Range {
|
||||||
|
// A bare number skips the core's range check, and its uint32 loop never ends on the largest.
|
||||||
|
if r.To > 65535 {
|
||||||
|
return common.NewErrorf("udphop remotePorts names port %d", r.To)
|
||||||
|
}
|
||||||
|
if r.From <= r.To {
|
||||||
|
hopPorts += int(r.To-r.From) + 1
|
||||||
|
}
|
||||||
|
if hopPorts > maxUDPHopPorts {
|
||||||
|
return common.NewErrorf("udphop remotePorts names more than %d ports", maxUDPHopPorts)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// CountXMCMasks counts the xmc tcp masks of a stream, nested download streams included:
|
||||||
|
// each costs the core a fresh RSA key on every build.
|
||||||
|
func CountXMCMasks(raw []byte) int {
|
||||||
|
stream := new(conf.StreamConfig)
|
||||||
|
if len(raw) == 0 || json.Unmarshal(raw, stream) != nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
count := 0
|
||||||
|
_ = walkStreams(stream, func(s *conf.StreamConfig, _ *conf.SplitHTTPConfig) error {
|
||||||
|
if s.FinalMask != nil {
|
||||||
|
for _, mask := range s.FinalMask.Tcp {
|
||||||
|
if strings.EqualFold(mask.Type, "xmc") {
|
||||||
|
count++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
return count
|
||||||
|
}
|
||||||
|
|
||||||
|
// walkStreams visits stream and the download streams nested in its xhttp settings, with the
|
||||||
|
// xhttp settings the core builds: xhttpSettings over splithttpSettings, "extra" over both.
|
||||||
|
func walkStreams(stream *conf.StreamConfig, visit func(*conf.StreamConfig, *conf.SplitHTTPConfig) error) error {
|
||||||
|
for stream != nil {
|
||||||
|
xhttp := stream.XHTTPSettings
|
||||||
|
if xhttp == nil {
|
||||||
|
xhttp = stream.SplitHTTPSettings
|
||||||
|
}
|
||||||
|
if xhttp != nil && xhttp.Extra != nil {
|
||||||
|
extra := new(conf.SplitHTTPConfig)
|
||||||
|
if json.Unmarshal(xhttp.Extra, extra) != nil {
|
||||||
|
extra = nil
|
||||||
|
}
|
||||||
|
xhttp = extra
|
||||||
|
}
|
||||||
|
if err := visit(stream, xhttp); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
stream = nil
|
||||||
|
if xhttp != nil {
|
||||||
|
stream = xhttp.DownloadSettings
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// CheckConfigCertFiles refuses a certificateFile or keyFile, at any depth and in any key
|
||||||
|
// case, that is not a bounded regular file: the core reads it whole inside the panel.
|
||||||
|
func CheckConfigCertFiles(raw []byte) error {
|
||||||
|
var decoded any
|
||||||
|
if len(raw) == 0 || json.Unmarshal(raw, &decoded) != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return checkCertFileKeys(decoded)
|
||||||
|
}
|
||||||
|
|
||||||
|
func checkCertFileKeys(v any) error {
|
||||||
|
switch v := v.(type) {
|
||||||
|
case map[string]any:
|
||||||
|
for key, child := range v {
|
||||||
|
if path, ok := child.(string); ok && path != "" && (strings.EqualFold(key, "certificateFile") || strings.EqualFold(key, "keyFile")) {
|
||||||
|
if !filepath.IsAbs(path) {
|
||||||
|
path = platform.GetCertLocation(path)
|
||||||
|
}
|
||||||
|
if err := CheckCertFile(path); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := checkCertFileKeys(child); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case []any:
|
||||||
|
for _, child := range v {
|
||||||
|
if err := checkCertFileKeys(child); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// CheckCertFile refuses a path that exists but is a device, FIFO or oversized file; a
|
||||||
|
// missing one is left to the reader, whose open fails at once.
|
||||||
|
func CheckCertFile(path string) error {
|
||||||
|
if path == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
info, err := os.Stat(path)
|
||||||
|
if err != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// procfs nodes such as /proc/kmsg report a regular file of size 0.
|
||||||
|
if !info.Mode().IsRegular() || info.Size() == 0 || info.Size() > maxCertFileBytes {
|
||||||
|
return common.NewErrorf("certificate file %q must be a regular file of at most %d bytes", path, maxCertFileBytes)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// checkUntrustedBuildInput runs before every in-process conf.Build(): inbounds arrive from
|
||||||
|
// node pushes and outbounds from third-party subscriptions.
|
||||||
|
func checkUntrustedBuildInput(stream *conf.StreamConfig, raw []byte) error {
|
||||||
|
if err := checkStreamBuildCost(stream); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return CheckConfigCertFiles(raw)
|
||||||
|
}
|
||||||
@@ -150,3 +150,37 @@ func TestValidateOutboundConfig_RejectsLinksTheHandlerConstructorRefuses(t *test
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// conf.Build() runs inside the panel; these values make it allocate or loop without
|
||||||
|
// bound, so they must be refused before it, whoever supplied the outbound.
|
||||||
|
func TestValidateOutboundConfig_RefusesWhatTheLoaderWouldExpandWithoutBound(t *testing.T) {
|
||||||
|
big := filepath.Join(t.TempDir(), "big.pem")
|
||||||
|
if err := os.WriteFile(big, make([]byte, maxCertFileBytes+1), 0o600); err != nil {
|
||||||
|
t.Fatalf("write cert: %v", err)
|
||||||
|
}
|
||||||
|
vless := func(stream string) string {
|
||||||
|
return `{"protocol": "vless", "settings": {"address": "1.2.3.4", "port": 443, "id": "b831381d-6324-4d53-ad4f-8cda48b30811", "encryption": "none"}, "streamSettings": ` + stream + `}`
|
||||||
|
}
|
||||||
|
hop := `{"type": "udphop", "settings": {"mode": "intervalRemote", "remotePorts": "0-65535"}}`
|
||||||
|
masks := strings.TrimSuffix(strings.Repeat(`{"type": "noise"},`, maxStreamMasks+1), ",")
|
||||||
|
for name, tc := range map[string]struct{ outbound, wantErr string }{
|
||||||
|
"xhttp sessionIDLength in extra": {vless(`{"network": "xhttp", "security": "tls", "xhttpSettings": {"extra": {"sessionIDTable": "abcdefgh", "sessionIDLength": "2147483647"}}}`), "sessionIDLength"},
|
||||||
|
"nested download sessionIDLength": {vless(`{"network": "xhttp", "security": "tls", "xhttpSettings": {"downloadSettings": {"network": "xhttp", "xhttpSettings": {"sessionIDTable": "ab", "sessionIDLength": "64-100000"}}}}`), "sessionIDLength"},
|
||||||
|
"udphop ports across masks": {vless(`{"network": "tcp", "security": "tls", "finalmask": {"udp": [` + hop + `,` + hop + `]}}`), "udphop"},
|
||||||
|
"udphop bare port": {vless(`{"network": "tcp", "security": "tls", "finalmask": {"UDP": [{"type": "UDPHOP", "settings": {"mode": "intervalRemote", "remotePorts": 4294967295}}]}}`), "udphop"},
|
||||||
|
"too many masks": {vless(`{"network": "tcp", "security": "tls", "finalmask": {"tcp": [` + masks + `]}}`), "masks"},
|
||||||
|
"certificate is a directory": {vless(`{"network": "tcp", "security": "tls", "tlsSettings": {"certificates": [{"CertificateFile": "` + filepath.ToSlash(t.TempDir()) + `"}]}}`), "regular file"},
|
||||||
|
"oversized key file": {vless(`{"network": "tcp", "security": "tls", "tlsSettings": {"certificates": [{"keyFile": "` + filepath.ToSlash(big) + `"}]}}`), "regular file"},
|
||||||
|
} {
|
||||||
|
if err := ValidateOutboundConfig([]byte(tc.outbound)); err == nil || !strings.Contains(err.Error(), tc.wantErr) {
|
||||||
|
t.Errorf("%s: ValidateOutboundConfig = %v, want an error naming %q", name, err, tc.wantErr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCountXMCMasksFollowsTheStreamsTheCoreBuilds(t *testing.T) {
|
||||||
|
stream := `{"finalmask": {"tcp": [{"type": "XMC"}, {"type": "noise"}]}, "xhttpSettings": {"extra": {"downloadSettings": {"finalmask": {"tcp": [{"type": "xmc"}]}}}}}`
|
||||||
|
if got := CountXMCMasks([]byte(stream)); got != 2 {
|
||||||
|
t.Fatalf("CountXMCMasks = %d, want 2 (one top-level, one in the download stream inside extra)", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user