mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-10-27 00:04:59 +03:00
56ac8d0fc7
* feat(amneziawg): add opt-in Linux kernel datapath Add the kernel backend as an explicit per-inbound option while keeping the embedded backend as the default. Include host preflight, UI/API support, the bundled installer CLI, lifecycle and accounting integration, regression tests, and upstream-facing documentation. Kernel mode is NAT-only and rejects unsupported routing, IPv6, forwarding, and pinned-listen configurations. Local saves check the local host; remote nodes check their own host during apply. Preserve adopted interface accounting across panel restarts, retain manager state after failed teardown so the job can retry, prevent embedded startup while a kernel interface remains live, and prune collector state for removed peers. Tested the restart accounting path on Debian 13 with XanMod 7.1.11 on x86_64; Docker and cross-kernel coverage are not claimed. * fix(amneziawg): align readiness and endpoint reporting Expire endpoint sightings using the latest handshake and sweep stale addresses for the polled interface. Keep the readiness API schema, generated client types, and ready-host empty blocker list consistent; watch the nested form field and defer local readiness checks for remote targets. Document safe rollback before using a build without kernel support. Regression evidence: the idle endpoint test failed before the collector change because the old address remained visible after 31 minutes; endpoint tests pass after the fix. The form component suite passes 3 tests; restoring the invalid array watch made its off-mode severity test fail, while the corrected dot-path watch passes. Targeted Go regressions across amneziawgkern, job, and service pass. * style(amneziawg): format readiness test * test: reproduce kernel AWG client validation gaps * test(service): cover kernel AWG shared client fanout * fix(amneziawg): validate kernel client fanout and config values * test(amneziawgkern): cover owned interface lifecycle recovery * fix(amneziawgkern): recover owned interfaces on restart * test(amneziawgkern): retain visibility after recovered cleanup failure * fix(amneziawgkern): report recovered interfaces while cleanup retries * style(amneziawgkern): satisfy static analysis * test(amneziawgkern): cover long rendered peer comments * fix(amneziawgkern): accept long generated config comments * test(amneziawgkern): refuse foreign occupied interfaces Capture the current Ensure ordering failure with real temporary config paths and manager side-effect boundaries. * test(amneziawgkern): cover stale interface collisions Extend the Ensure regression across absent links, mismatched live interfaces, cached manager state, and Remove teardown. * fix(amneziawgkern): verify interface ownership before mutation Refuse to replace or tear down links unless the canonical config is a valid panel-owned file and its key matches the live interface. Preserve normal adoption and key rotation, and document migration of legacy unmarked configs. Validation: go test ./internal/amneziawgkern -count=1; go test -race ./internal/amneziawgkern -count=1; golangci-lint run ./internal/amneziawgkern/...; git diff --check. * build: update Go toolchain to 1.27.3 * test(amneziawg): reproduce unsafe key rotation recovery Keep the previous owned config authoritative until teardown succeeds, and require fresh managers to rebuild structural key changes. These regressions expose the stuck live-key/disk-key mismatch after teardown failure. * fix(amneziawg): recover interrupted key rotations Keep the old owned config on disk until a structural rebuild has confirmed the previous interface is down. Fresh managers only adopt when the live config and desired structural identity match, so retries and removals retain the key needed to prove ownership. * fix(scanner): align Go image with module version * fix(docs): pin pnpm release with bootstrap fix pnpm 12.9.1 restores a Node launcher before its postinstall replaces the target with ELF; pnpm 11 then runs that binary as JavaScript. Pin 12.10.0, which includes the shim fix, so the docs CI bootstrap can switch versions safely. * fix(xray): build core from pinned module The configured Xray release asset tag is unpublished, and the latest published binary lacks GetUsersStats used by the panel. Build the packaged core from the exact Xray module version already selected in go.mod for Docker and release targets. * fix(tests): stabilize local network fixtures Keep the TUIC stream fragmentation check on a working UDP loopback path, allocate the AmneziaWG fixture ports dynamically, and wait for a real Xray stats response before starting API mutation assertions. Recreate failed readiness channels so an early connection cannot stall the probe. Verified host and offline parallel Go suites, repeated occupied-port and UDP tests, race/shuffle runs, and golangci-lint. Production behavior and dependency versions are unchanged. * fix(i18n): add the kernel-mode AmneziaWG keys to sk-SK main gained the sk-SK locale after this branch added its kernel-mode keys to the other 13, so i18n-dead-keys.test.ts failed on the merged tree. * refactor(amneziawgkern): apply kernel interfaces with direct commands, no awg-quick awg-quick evaluates PostUp/PostDown through a root shell, so every value the panel rendered into its config was one validation slip away from root command execution. The interface is now built with direct ip/awg/nft execs from a setconf-only file: link add, awg setconf, address, mtu, an atomically replaced nftables table per inbound, and the IPv4 forwarding sysctl written directly. - Panel-owned names and paths: xui-awg<id> interfaces, xui_awg<id> NAT tables and configs under the panel's data dir, so nothing collides with an operator's own awg0/awg1 awg-quick tunnels in /etc/amnezia/amneziawg. - FORWARD accepts (comment 3x-ui:xui-awg<id>) when iptables is present: Docker and ufw set the FORWARD policy to DROP, which silently black-holed the tunnel. - A full panel stop records the final counters and tears the interfaces down, like the embedded datapath; a stopped panel enforces no quota or expiry. Crash survivors are still adopted without a rebuild. - The job reads counters before reconciling, and from every managed interface, so a client disabled for quota, or a removed inbound, is charged for its last interval instead of losing it with the dropped peer. - An unchanged reconcile tick forks no process (it probed the live key with `awg show` every 10s); readiness no longer loads the module from a GET. Verified on the real module (WSL2 6.6 kernel, v3.1.20260906): create, peer and egress changes in place, SIGKILL adoption with the same ifindex, SIGTERM teardown leaving no link, table, FORWARD rule or config behind. * fix(amneziawg): gate kernel host readiness only when a save starts the datapath Every save of a kernel-mode inbound re-ran the host preflight, so a host that lost its module (a kernel upgrade without a DKMS rebuild) refused even disabling the inbound or switching it back to embedded mode. Host blockers now apply only when the save starts the kernel datapath: a new inbound, a switch from embedded, or enabling a disabled one. Feature blockers (IPv6, forwarded ports, pinned listen) still apply to every save. * feat(nodes): refuse kernel-mode AmneziaWG pushes to nodes that predate it A node built before kernel mode drops the unknown kernelMode field and serves the inbound on the embedded datapath while the master's form shows kernel mode on. Nodes now advertise awg-kernel in X-3x-Node-Caps, and Remote refuses to push a kernel-mode inbound to a node that has not advertised it, learning the caps with an inbound list first when this Remote has not heard from it. * fix(amneziawg): pin the kernel module installer to verified commits The installer ran as root and built whatever upstream tag sorted newest at install time. It now clones fixed tags (module v3.1.20260906, tools v3.1.20260812) and refuses unless each resolves to its recorded commit. The udp_tunnel perl patch is gone: those releases carry the kernel 7.1.5 compat upstream, so the patch never matched. * fix(i18n): translate the kernel-mode AmneziaWG strings All thirteen non-English locales carried the English text verbatim. * fix(amneziawg): skip the kernel traffic flush when no kernel interface runs Shutdown listed the desired AmneziaWG inbounds from the database even on a panel with no kernel interface, an unneeded query on every stop. A server stopped before its database was opened panicked on it, which turned TestServerStopWhenXrayNotRunningSucceeds red whenever it ran first. --------- Co-authored-by: MHSanaei <ho3ein.sanaei@gmail.com>
249 lines
11 KiB
Go
249 lines
11 KiB
Go
// Package amneziawg holds AmneziaWG's DB-backed shapes and derives an Instance from an inbound row, with no OS
|
|
// dependency; internal/amneziawgnet (embedded, default) and internal/amneziawgkern (opt-in kernel module) run it.
|
|
package amneziawg
|
|
|
|
import "github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
|
|
// Obfuscation31 is an AmneziaWG 3.1 obfuscation parameter set (junk packets,
|
|
// padding, magic headers, the five CPS signature-packet slots, and the 3.x
|
|
// header-protection/content-padding/timing/boolean fields). The same values
|
|
// must be applied on both ends of a tunnel, so the server stores them and
|
|
// every client config inherits them verbatim.
|
|
type Obfuscation31 struct {
|
|
Jc int `json:"jc"`
|
|
Jmin int `json:"jmin"`
|
|
Jmax int `json:"jmax"`
|
|
S1 int `json:"s1"`
|
|
S2 int `json:"s2"`
|
|
S3 int `json:"s3"`
|
|
S4 int `json:"s4"`
|
|
H1 string `json:"h1"`
|
|
H2 string `json:"h2"`
|
|
H3 string `json:"h3"`
|
|
H4 string `json:"h4"`
|
|
// I1-I5 are the real protocol's five CPS signature-packet slots
|
|
// (confirmed against amneziawg-go v3.0.3's device/uapi.go: "i1"
|
|
// through "i5" are five independent UAPI setters, device.ipackets[0..4],
|
|
// all parsed via the identical newObfChain grammar).
|
|
I1 string `json:"i1,omitempty"`
|
|
I2 string `json:"i2,omitempty"`
|
|
I3 string `json:"i3,omitempty"`
|
|
I4 string `json:"i4,omitempty"`
|
|
I5 string `json:"i5,omitempty"`
|
|
|
|
// HeaderProtectionKey is a base64 32-byte key shared by both ends; the
|
|
// ranges/booleans below are 3.x-only and optional.
|
|
HeaderProtectionKey string `json:"headerProtectionKey,omitempty"`
|
|
ContentPaddingAddition string `json:"contentPaddingAddition,omitempty"`
|
|
RekeyAfterTime string `json:"rekeyAfterTime,omitempty"`
|
|
RekeyTimeout string `json:"rekeyTimeout,omitempty"`
|
|
RejectAfterTime string `json:"rejectAfterTime,omitempty"`
|
|
KeepaliveTimeout string `json:"keepaliveTimeout,omitempty"`
|
|
MaxHandshakeAttempts string `json:"maxHandshakeAttempts,omitempty"`
|
|
RandomTrailers bool `json:"randomTrailers,omitempty"`
|
|
DisableCookies bool `json:"disableCookies,omitempty"`
|
|
}
|
|
|
|
// Peer is one desired AmneziaWG peer: a client device the interface accepts.
|
|
// Email attributes traffic and online status back to the owning client, the
|
|
// same role SecretEntry.Name plays for mtproto.
|
|
type Peer struct {
|
|
Email string
|
|
PublicKey string
|
|
PresharedKey string
|
|
AllowedIPs []string
|
|
|
|
// ForwardedPorts is a raw, user-supplied port list ("80, 443, 8000-8100")
|
|
// forwarded to this peer's tunnel address by internal/amneziawgnet's
|
|
// PortForwardSet listener supervisor. Empty means no port-forwarding.
|
|
ForwardedPorts string
|
|
}
|
|
|
|
// Instance is the desired runtime configuration of one AmneziaWG inbound: a
|
|
// single interface (e.g. awg1) with a set of peers, mirroring how one mtproto
|
|
// inbound maps to one mtg process (internal/mtproto.Instance).
|
|
type Instance struct {
|
|
Id int
|
|
Tag string
|
|
InterfaceName string
|
|
ListenPort int
|
|
// Listen is an optional host bind address (e.g. "203.0.113.10").
|
|
// Empty/wildcard keeps dual-stack StdNetBind; a real IP pins the UDP socket.
|
|
Listen string
|
|
PrivateKey string
|
|
PublicKey string
|
|
// Address holds the interface's own tunnel address(es), e.g. "10.8.1.1/24".
|
|
// Carries both the IPv4 and (when enabled) IPv6 server address.
|
|
Address []string
|
|
MTU int
|
|
|
|
// Obfuscation carries the full AmneziaWG 3.1 parameter set, including
|
|
// the 3.x header-protection/content-padding/timing/boolean fields (see
|
|
// Obfuscation31's own doc comment) -- amneziawgnet.DeviceOptions is
|
|
// what actually consumes it when building the embedded Device's UAPI
|
|
// config.
|
|
Obfuscation Obfuscation31
|
|
|
|
Peers []Peer
|
|
|
|
// ExternalInterface named the host NIC PostUp/PostDown NAT rules
|
|
// attached to under the retired kernel-module architecture. Also the
|
|
// fallback host NIC internal/amneziawgnet's IPv6-address-alias
|
|
// mechanism (desiredV6Aliases) uses when IPv6ExternalInterface is left
|
|
// blank.
|
|
ExternalInterface string
|
|
|
|
// IPv6Enabled/IPv6ExternalInterface gate internal/amneziawgnet's
|
|
// IPv6-address-alias mechanism (desiredV6Aliases,
|
|
// internal/web/service/xray.go's injectAmneziawgV6Egress): each peer
|
|
// with an IPv6 AllowedIPs entry gets that address aliased onto this
|
|
// host NIC (ip -6 addr add) and a dedicated Xray freedom outbound bound
|
|
// to it, giving that peer's own outbound connections a distinct public
|
|
// source identity. Narrower in scope than these identically-named
|
|
// fields' role under the retired kernel-module architecture, which used
|
|
// per-peer NDP-proxy entries (ip -6 neigh add proxy) to also support
|
|
// unsolicited inbound connections toward the peer -- that capability is
|
|
// the separate, not-yet-built Phase 3.6 (port-forwarding).
|
|
IPv6Enabled bool
|
|
IPv6ExternalInterface string
|
|
|
|
// RouteThroughXray gated the kernel-module architecture's opt-in
|
|
// TPROXY-into-Xray bridge. The embedded path (internal/amneziawgnet)
|
|
// has no equivalent opt-in at all -- every peer's traffic already goes
|
|
// through Xray's own SOCKS5 inbound unconditionally, since there's no
|
|
// other way for decapsulated gVisor traffic to reach the real internet
|
|
// -- so this field is now vestigial: read from existing stored settings
|
|
// for backward compatibility, but not acted on by anything. Slated for
|
|
// removal alongside the frontend toggle in a follow-up.
|
|
RouteThroughXray bool
|
|
|
|
// KernelMode selects internal/amneziawgkern over internal/amneziawgnet as
|
|
// this inbound's datapath. See ServerSettings.KernelMode.
|
|
KernelMode bool
|
|
}
|
|
|
|
// ServerSettings is the "server" block of an AmneziaWG inbound's Settings
|
|
// JSON: the interface-level configuration shared by every client/peer. The
|
|
// listen port is deliberately not duplicated here — it lives on the inbound
|
|
// row itself (Inbound.Port), like every other protocol.
|
|
type ServerSettings struct {
|
|
PrivateKey string `json:"privateKey"`
|
|
PublicKey string `json:"publicKey"`
|
|
|
|
SubnetIP string `json:"subnetIp"`
|
|
SubnetCIDR int `json:"subnetCidr"`
|
|
MTU int `json:"mtu,omitempty"`
|
|
|
|
// PrimaryDNS/SecondaryDNS seed client configs' DNS line. Blank is
|
|
// meaningful, so no omitempty: a dropped key resurrects frontend defaults.
|
|
PrimaryDNS string `json:"primaryDns"`
|
|
SecondaryDNS string `json:"secondaryDns"`
|
|
|
|
// ExternalInterface, IPv6Enabled, and IPv6ExternalInterface are live
|
|
// again as of Phase 3.5 -- see the matching fields on Instance for what
|
|
// they gate (internal/amneziawgnet's IPv6-address-alias mechanism).
|
|
// IPv6Subnet was never actually vestigial either: InstanceFromInbound
|
|
// already consumes it (via serverAddressV6) to build the server's own
|
|
// tunnel address, same as always. Only RouteThroughXray, below, remains
|
|
// genuinely vestigial as of the hard cutover to the embedded path
|
|
// (internal/amneziawgnet) -- read from existing stored settings for
|
|
// backward compatibility, but not acted on by anything.
|
|
ExternalInterface string `json:"externalInterface,omitempty"`
|
|
|
|
IPv6Enabled bool `json:"ipv6Enabled,omitempty"`
|
|
IPv6Subnet string `json:"ipv6Subnet,omitempty"`
|
|
IPv6ExternalInterface string `json:"ipv6ExternalInterface,omitempty"`
|
|
|
|
RouteThroughXray bool `json:"routeThroughXray,omitempty"`
|
|
|
|
// KernelMode runs this inbound on the AmneziaWG kernel module (internal/amneziawgkern)
|
|
// instead of the embedded amneziawg-go + gVisor stack.
|
|
KernelMode bool `json:"kernelMode,omitempty"`
|
|
|
|
// Obfuscation31's fields, repeated flat (not embedded) rather than
|
|
// nested under their own key: encoding/json would happily inline an
|
|
// embedded Obfuscation31 the same way, but the frontend's Go->Zod/TS
|
|
// generator (tools/openapigen) does not — it emits a genuinely nested
|
|
// `obfuscation31` object, which would silently diverge from the real
|
|
// wire JSON. See Obfuscation() below for the manager-facing conversion.
|
|
Jc int `json:"jc"`
|
|
Jmin int `json:"jmin"`
|
|
Jmax int `json:"jmax"`
|
|
S1 int `json:"s1"`
|
|
S2 int `json:"s2"`
|
|
S3 int `json:"s3"`
|
|
S4 int `json:"s4"`
|
|
H1 string `json:"h1"`
|
|
H2 string `json:"h2"`
|
|
H3 string `json:"h3"`
|
|
H4 string `json:"h4"`
|
|
I1 string `json:"i1,omitempty"`
|
|
I2 string `json:"i2,omitempty"`
|
|
I3 string `json:"i3,omitempty"`
|
|
I4 string `json:"i4,omitempty"`
|
|
I5 string `json:"i5,omitempty"`
|
|
|
|
// HeaderProtectionKey and ContentPaddingAddition are AmneziaWG 3.0
|
|
// fields, flat and top-level for the same tools/openapigen reason as
|
|
// the block above; Obfuscation() below folds them back into
|
|
// Obfuscation31's own identically named fields.
|
|
// HeaderProtectionKey is a base64 32-byte key; empty (the default)
|
|
// disables AWG 3.0 header protection. A non-empty value requires
|
|
// every one of S1-S4 above to be >= 12 -- ValidateObfuscation
|
|
// enforces this at save time, not just at IpcSet time.
|
|
// ContentPaddingAddition is a "low-high" range or bare integer, the
|
|
// same grammar and uint32 cap as H1-H4.
|
|
HeaderProtectionKey string `json:"headerProtectionKey,omitempty"`
|
|
ContentPaddingAddition string `json:"contentPaddingAddition,omitempty"`
|
|
|
|
// RekeyAfterTime/RekeyTimeout/RejectAfterTime/KeepaliveTimeout/
|
|
// MaxHandshakeAttempts mirror Instance's identically named fields --
|
|
// see that type's own doc comment for the grammar/width/real-default
|
|
// details. Flat and top-level for the same tools/openapigen reason as
|
|
// the rest of this struct.
|
|
RekeyAfterTime string `json:"rekeyAfterTime,omitempty"`
|
|
RekeyTimeout string `json:"rekeyTimeout,omitempty"`
|
|
RejectAfterTime string `json:"rejectAfterTime,omitempty"`
|
|
KeepaliveTimeout string `json:"keepaliveTimeout,omitempty"`
|
|
MaxHandshakeAttempts string `json:"maxHandshakeAttempts,omitempty"`
|
|
|
|
// RandomTrailers/DisableCookies mirror Instance's identically named
|
|
// AmneziaWG 3.1 fields -- see that type's own doc comment for the real
|
|
// protocol/interop details. Both real bool fields (not omitempty):
|
|
// buildUAPIConfig always emits both lines explicitly so the
|
|
// reconfigure-in-place diff correctly notices a true->false edit, not
|
|
// just false->true.
|
|
RandomTrailers bool `json:"randomTrailers"`
|
|
DisableCookies bool `json:"disableCookies"`
|
|
}
|
|
|
|
// Obfuscation extracts the Obfuscation31 parameter set from a ServerSettings
|
|
// block, for callers (the Manager, ValidateObfuscation) that want the
|
|
// grouped type rather than the flat wire fields.
|
|
func (s ServerSettings) Obfuscation() Obfuscation31 {
|
|
return Obfuscation31{
|
|
Jc: s.Jc, Jmin: s.Jmin, Jmax: s.Jmax,
|
|
S1: s.S1, S2: s.S2, S3: s.S3, S4: s.S4,
|
|
H1: s.H1, H2: s.H2, H3: s.H3, H4: s.H4,
|
|
I1: s.I1, I2: s.I2, I3: s.I3, I4: s.I4, I5: s.I5,
|
|
HeaderProtectionKey: s.HeaderProtectionKey,
|
|
ContentPaddingAddition: s.ContentPaddingAddition,
|
|
RekeyAfterTime: s.RekeyAfterTime,
|
|
RekeyTimeout: s.RekeyTimeout,
|
|
RejectAfterTime: s.RejectAfterTime,
|
|
KeepaliveTimeout: s.KeepaliveTimeout,
|
|
MaxHandshakeAttempts: s.MaxHandshakeAttempts,
|
|
RandomTrailers: s.RandomTrailers,
|
|
DisableCookies: s.DisableCookies,
|
|
}
|
|
}
|
|
|
|
// InboundSettings is the full Settings JSON shape stored on an AmneziaWG
|
|
// inbound row: one server block plus the usual generic client list, so bulk
|
|
// operations, the QR modal and subscriptions all come from the same shared
|
|
// infrastructure every other protocol uses.
|
|
type InboundSettings struct {
|
|
Server *ServerSettings `json:"server"`
|
|
Clients []model.Client `json:"clients"`
|
|
}
|