feat(amneziawg): replace the TPROXY bridge with a SOCKS5 relay inbound (Phase 3 start)

Hard cutover, part 1: injectAmneziawgnetSocks replaces injectAmneziawgEgress
as the AmneziaWG-side Xray config injector. Every enabled AmneziaWG inbound
now gets an always-on loopback SOCKS5 inbound (built by
amneziawgnet.SocksInboundSettings) instead of an opt-in dokodemo-door TPROXY
bridge -- there's no RouteThroughXray gate anymore since the embedded path
has no alternative datapath once traffic is decapsulated in gVisor. Reuses
the real inbound's own tag, same as before, so per-inbound stats totals
keep matching.

internal/amneziawgnet gains SOCKSPortForInbound (deterministic port
derivation, its own range distinct from the kernel-module bridge's) and
SocksPassword (a process-wide, lazily-generated, not-persisted password --
this traffic never leaves loopback).

port_conflict.go's port-reservation check is updated to match: the new
SOCKS5 relay port is reserved unconditionally for every qualifying
AmneziaWG inbound, not gated on RouteThroughXray.

Not yet done (tracked in the migration plan): swapping the actual manager
call sites (cron job, immediate-apply CRUD, shutdown) from the kernel-module
Manager to amneziawgnet's, and deleting the now-dead TPROXY/awg-quick code.
This commit could not be locally verified beyond internal/amneziawgnet
itself (this machine has no C compiler, so internal/database and anything
that imports it -- including internal/web/service -- can't be built or
vetted here); pushing for real CI feedback before continuing.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Kuzz007
2026-08-02 14:33:35 +03:00
parent d163e6ac2d
commit 3450d872d9
5 changed files with 249 additions and 167 deletions
+66 -78
View File
@@ -11,6 +11,7 @@ import (
"sync"
"github.com/mhsanaei/3x-ui/v3/internal/amneziawg"
"github.com/mhsanaei/3x-ui/v3/internal/amneziawgnet"
"github.com/mhsanaei/3x-ui/v3/internal/config"
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
"github.com/mhsanaei/3x-ui/v3/internal/logger"
@@ -367,14 +368,16 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
injectMtprotoEgress(xrayConfig, inbound)
}
// Route opted-in AmneziaWG peers through the core's router. Unlike mtg,
// AmneziaWG has no sidecar process of its own making outbound connections
// to dial through a bridge — it's a kernel tunnel interface, so the host
// side (internal/amneziawg's defaultPostUpDown) TPROXYs each opted-in
// peer's traffic to one loopback bridge shared by every AmneziaWG
// instance; this call is what creates that bridge and, per peer, the
// routing rule matching its preserved source IP to its chosen outbound.
injectAmneziawgEgress(xrayConfig, inbounds)
// Every AmneziaWG inbound is embedded (internal/amneziawgnet: amneziawg-go
// over a gVisor netstack, no kernel module) and relays every peer's
// decapsulated traffic into its own loopback SOCKS5 inbound, always on —
// unlike mtproto's bridge above, there's no opt-in gate here: once
// traffic is decapsulated in gVisor, Xray's own freedom outbound is the
// only way it reaches the real internet at all, not an optional extra
// hop. Whether it goes anywhere beyond Xray's default routing is up to
// whatever rules the admin adds through the stock Routing page, exactly
// like routing any other protocol.
injectAmneziawgnetSocks(xrayConfig, inbounds)
// Wire the panel's own HTTP traffic through the configured outbound, after
// the subscription merge so subscription outbound tags are valid targets.
@@ -670,61 +673,40 @@ func injectMtprotoEgress(cfg *xray.Config, inbound *model.Inbound) {
})
}
// amneziawgEgressDokodemoSettings is the dokodemo-door settings block for the
// shared AmneziaWG TPROXY bridge: accept both TCP and UDP, and (per this
// fork's existing "Tunnel" protocol convention — see
// frontend/src/lib/xray/inbound-tag.ts) use followRedirect mode so the
// destination comes from the TPROXY-preserved original address rather than a
// fixed port/address pair.
const amneziawgEgressDokodemoSettings = `{"allowedNetwork":"tcp,udp","followRedirect":true}`
// amneziawgEgressStreamSettings turns the bridge's listening socket into a
// TPROXY target, matching internal/amneziawg's iptables `-j TPROXY` rules —
// without this, the kernel-redirected packets never reach a listening
// socket.
const amneziawgEgressStreamSettings = `{"sockopt":{"tproxy":"tproxy"}}`
// amneziawgEgressSniffingSettings enables sniffing on the bridge, matching
// this fork's own normal per-inbound default (see default.json's "mixed"
// inbound). Without this, domain-based Routing rules can never match a
// single byte of RouteThroughXray traffic: an AmneziaWG peer resolves DNS
// amneziawgEgressSniffingSettings enables sniffing on the AmneziaWG SOCKS5
// relay inbound, matching this fork's own normal per-inbound default (see
// default.json's "mixed" inbound). Without this, domain-based Routing rules
// can never match a single byte of AmneziaWG traffic: a peer resolves DNS
// itself, through the tunnel, before ever sending a packet — by the time
// TPROXY hands the decapsulated traffic to this bridge, the destination is
// already a bare IP, with no domain name attached at the network layer at
// all. Sniffing recovers it from the payload itself (TLS SNI / HTTP Host /
// QUIC) the same way it already does for every other inbound; without it,
// only tag/IP/network-based rules can ever match this bridge's traffic,
// and any domain rule above it in the list is silently unreachable.
// the embedded forwarder recovers the decapsulated traffic, the destination
// is already a bare IP, with no domain name attached at the network layer
// at all. Sniffing recovers it from the payload itself (TLS SNI / HTTP Host
// / QUIC) the same way it already does for every other inbound; without
// it, only tag/IP/network-based rules can ever match this traffic, and any
// domain rule above it in the list is silently unreachable.
const amneziawgEgressSniffingSettings = `{"enabled":true,"destOverride":["http","tls","quic","fakedns"]}`
// injectAmneziawgEgress gives every enabled, RouteThroughXray-opted-in
// AmneziaWG inbound with at least one qualifying peer its own loopback
// dokodemo-door bridge — tagged with that inbound's own real tag, so it's
// already selectable in the panel's stock Routing page's inbound-tag
// picker, exactly the way an mtproto inbound's own bridge already is (see
// injectMtprotoEgress): the picker's tag list comes from
// InboundService.GetInboundTags(), a plain,
// protocol-blind SELECT over every inbound row's tag, so reusing a real
// inbound's own tag needs no dedicated UI plumbing at all.
// injectAmneziawgnetSocks gives every enabled AmneziaWG inbound with at
// least one qualifying peer its own loopback SOCKS5 inbound for the
// embedded (amneziawg-go) relay path (internal/amneziawgnet) -- always on,
// unlike injectAmneziawgEgress's opt-in RouteThroughXray bridge above, since
// there is no alternative datapath once traffic is decapsulated in gVisor:
// Xray's own freedom outbound is how it reaches the real internet at all
// (see internal/amneziawgnet/relay.go's doc comment, Finding 3 of the
// migration plan). Tagged with the inbound's own real tag, for the same two
// reasons injectAmneziawgEgress already is: it's already selectable in the
// panel's stock Routing page (InboundService.GetInboundTags is
// protocol-blind), and per-inbound traffic totals
// (internal/web/service/inbound_traffic.go's addClientTraffic) match by
// exact tag -- reusing it isn't a style choice.
//
// RouteThroughXray is a per-inbound opt-in, off by default: when it's off,
// no bridge is created at all and the tunnel has no Xray dependency
// whatsoever. When it's on, every peer's traffic lands on the bridge —
// internal/amneziawg's defaultPostUpDown TPROXYs it there, there is no
// further per-peer opt-in — but this function never generates a routing
// rule of its own. Whether that traffic goes anywhere beyond Xray's default
// routing is entirely up to whatever rules the admin adds through that same
// stock Routing page (inboundTag + an optional sourceIP to target one
// specific peer + outboundTag, exactly like routing any other protocol).
//
// An inbound is skipped, individually, when its own tag is already taken by
// another config entry — mirroring injectMtprotoEgress/injectPanelEgress's
// own defensive check, even though a real collision shouldn't be possible
// (inbound tags are unique, and the main GenXrayInboundConfig loop already
// excludes mtproto/amneziawg inbounds from ever claiming their own tag
// there). Generated state is hot-appliable and never modifies the stored
// template or restarts the core.
func injectAmneziawgEgress(cfg *xray.Config, inbounds []*model.Inbound) {
// No RouteThroughXray gate, no qualifying-peer IPv4 check the way
// injectAmneziawgEgress needs one: amneziawg.InstanceFromInbound already
// returns ok=false for zero qualifying peers (Enable && PublicKey != "" &&
// len(AllowedIPs) > 0), and peer identity here comes from Email directly,
// not an IPv4 lookup, so a v6-only peer is just as valid an account as any
// other.
func injectAmneziawgnetSocks(cfg *xray.Config, inbounds []*model.Inbound) {
existingTags := make(map[string]struct{}, len(cfg.InboundConfigs))
for i := range cfg.InboundConfigs {
existingTags[cfg.InboundConfigs[i].Tag] = struct{}{}
@@ -735,32 +717,38 @@ func injectAmneziawgEgress(cfg *xray.Config, inbounds []*model.Inbound) {
continue
}
inst, ok := amneziawg.InstanceFromInbound(inbound)
if !ok || !inst.RouteThroughXray {
continue
}
hasQualifyingPeer := false
for _, p := range inst.Peers {
if amneziawg.FirstIPv4(p.AllowedIPs) != "" {
hasQualifyingPeer = true
break
}
}
if !hasQualifyingPeer {
if !ok {
continue
}
if _, taken := existingTags[inbound.Tag]; taken {
logger.Warning("amneziawg egress: inbound tag [", inbound.Tag, "] already present in generated config, skipping its bridge")
logger.Warning("amneziawgnet socks: inbound tag [", inbound.Tag, "] already present in generated config, skipping its relay inbound")
continue
}
emails := make([]string, 0, len(inst.Peers))
for _, p := range inst.Peers {
if p.Email != "" {
emails = append(emails, p.Email)
}
}
if len(emails) == 0 {
continue
}
settings, err := amneziawgnet.SocksInboundSettings(emails, amneziawgnet.SocksPassword())
if err != nil {
logger.Warning("amneziawgnet socks: building settings for inbound [", inbound.Tag, "]: ", err)
continue
}
existingTags[inbound.Tag] = struct{}{}
cfg.InboundConfigs = append(cfg.InboundConfigs, xray.InboundConfig{
Listen: json_util.RawMessage(`"127.0.0.1"`),
Port: amneziawg.EgressPortForInbound(inbound.Id),
Protocol: "dokodemo-door",
Settings: json_util.RawMessage(amneziawgEgressDokodemoSettings),
StreamSettings: json_util.RawMessage(amneziawgEgressStreamSettings),
Sniffing: json_util.RawMessage(amneziawgEgressSniffingSettings),
Tag: inbound.Tag,
Listen: json_util.RawMessage(`"127.0.0.1"`),
Port: amneziawgnet.SOCKSPortForInbound(inbound.Id),
Protocol: "socks",
Settings: json_util.RawMessage(settings),
Sniffing: json_util.RawMessage(amneziawgEgressSniffingSettings),
Tag: inbound.Tag,
})
}
}