mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-18 19:15:03 +03:00
fix(amneziawg): resolve 4 Low findings from the automated PR review
- manager.go: serverAddress assumed subnetIp always ends in ".0"; a base like "10.8.1.5" was used verbatim as the server's own address, eventually colliding with peer allocation (which starts at .2 upward). Now derives the first host of the actual subnetIp/subnetCidr network via netip, matching serverAddressV6's own approach. A /32 base (no host bits at all) is still used as-is. (Finding 12, partial -- the /16 pool-widening half of this finding only exists on the upstream-pr/amneziawg branch's merged client_wireguard.go, not here; handled separately on that branch.) - manager.go: ensureLocked carried the previous per-peer traffic counters (`last`) forward even through a full restart, but awg-quick down+up resets the kernel's own counters to zero -- the next CollectTraffic computed a large negative delta (clamped to 0), silently discarding real traffic. Extracted the decision into nextTrafficBaseline: only a reload (syncconf) preserves the baseline. (Finding 13) - portfwd.go: exported ForwardedPortsInclude; inbound_amneziawg.go's new checkForwardedPortsConflict uses it to reject, at save time, a client's forwardedPorts that would DNAT the panel's own port or another enabled inbound's port to the tunnel client -- portForwardLines has no destination restriction, so this collision was previously silent. Wired into both the single-client update path and the add-client path (client_inbound_apply.go), plus normalizeAmneziaWGSettings for the whole-inbound save path. (Finding 14) - inbound.go: InboundOption.AwgServer sent the whole ServerSettings struct including PrivateKey to GetInboundOptions callers -- a shared, admin-wide dropdown-filling endpoint the frontend's own AwgServerOptionSchema never reads that field from. Redacted it before assigning. (Finding 11) Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -96,16 +96,28 @@ func interfaceNameForID(id int) string {
|
||||
}
|
||||
|
||||
// serverAddress returns the server's own tunnel address for a subnet base,
|
||||
// e.g. "10.8.1.1/24" for base "10.8.1.0". The server holds the first usable
|
||||
// host; a base that isn't a bare network address is used as-is.
|
||||
// e.g. "10.8.1.1/24" for base "10.8.1.0" or "10.8.1.5". The server always
|
||||
// holds the first usable host of the network subnetIP/cidr actually
|
||||
// describes -- derived via netip rather than assuming subnetIP already ends
|
||||
// in ".0", so a subnetIP that isn't a bare network address (a typo, or a
|
||||
// manually edited value) can never collide with peer addresses, which are
|
||||
// allocated starting from the network's second host upward (see
|
||||
// allocateWireguardAddress). Falls back to the previous literal behavior
|
||||
// only if subnetIP/cidr doesn't parse as an IPv4 network at all -- normal
|
||||
// saves never reach that path since ValidateSubnetIPv4 already rejects it.
|
||||
func serverAddress(subnetIP string, cidr int) string {
|
||||
if cidr <= 0 {
|
||||
cidr = 24
|
||||
}
|
||||
if strings.HasSuffix(subnetIP, ".0") {
|
||||
return strings.TrimSuffix(subnetIP, "0") + "1/" + strconv.Itoa(cidr)
|
||||
// A /32 has no host bits at all -- "first usable host" is meaningless,
|
||||
// and Next() would step outside the block entirely -- so a single-host
|
||||
// base is used exactly as given, same as before this fix.
|
||||
prefix, err := netip.ParsePrefix(fmt.Sprintf("%s/%d", subnetIP, cidr))
|
||||
if err != nil || !prefix.Addr().Is4() || cidr >= 32 {
|
||||
return fmt.Sprintf("%s/%d", subnetIP, cidr)
|
||||
}
|
||||
return fmt.Sprintf("%s/%d", subnetIP, cidr)
|
||||
host := prefix.Masked().Addr().Next()
|
||||
return fmt.Sprintf("%s/%d", host, cidr)
|
||||
}
|
||||
|
||||
// serverAddressV6 returns the server's own IPv6 tunnel address for a subnet
|
||||
@@ -307,12 +319,26 @@ func (m *Manager) ensureLocked(inst Instance) error {
|
||||
|
||||
last := map[string]peerCounters{}
|
||||
if exists {
|
||||
last = cur.last
|
||||
last = nextTrafficBaseline(action, cur.last)
|
||||
}
|
||||
m.ifaces[inst.Id] = &managed{inst: inst, structuralFP: structFP, hostRulesFP: hostRulesFP, peersFP: peersFP, last: last}
|
||||
return nil
|
||||
}
|
||||
|
||||
// nextTrafficBaseline decides what per-peer traffic counters ensureLocked
|
||||
// should carry into the next managed entry. Only a reload (awg syncconf)
|
||||
// preserves the kernel's own per-peer transfer counters; a full down+up
|
||||
// zeroes them. Carrying the old baseline forward after a restart would make
|
||||
// the next CollectTraffic compute a large negative delta (clamped to 0 by
|
||||
// the caller), silently discarding whatever the peers transferred since the
|
||||
// previous poll instead of just resuming the count from zero.
|
||||
func nextTrafficBaseline(action ensureAction, prev map[string]peerCounters) map[string]peerCounters {
|
||||
if action == ensureReload {
|
||||
return prev
|
||||
}
|
||||
return map[string]peerCounters{}
|
||||
}
|
||||
|
||||
// Remove tears down and forgets the interface for an inbound id.
|
||||
func (m *Manager) Remove(id int) {
|
||||
m.mu.Lock()
|
||||
|
||||
@@ -106,8 +106,10 @@ func TestServerAddress(t *testing.T) {
|
||||
want string
|
||||
}{
|
||||
{"10.8.1.0", 24, "10.8.1.1/24"},
|
||||
{"10.8.1.0", 0, "10.8.1.1/24"}, // cidr <= 0 defaults to /24
|
||||
{"192.168.5.10", 32, "192.168.5.10/32"},
|
||||
{"10.8.1.0", 0, "10.8.1.1/24"}, // cidr <= 0 defaults to /24
|
||||
{"10.8.1.5", 24, "10.8.1.1/24"}, // non-network base: must not collide with peer allocation starting at .2
|
||||
{"10.8.1.254", 24, "10.8.1.1/24"},
|
||||
{"192.168.5.10", 32, "192.168.5.10/32"}, // /32 has no host bits: used as-is
|
||||
}
|
||||
for _, c := range cases {
|
||||
if got := serverAddress(c.subnet, c.cidr); got != c.want {
|
||||
@@ -225,6 +227,17 @@ func TestEnsureActionFor(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestNextTrafficBaseline(t *testing.T) {
|
||||
prev := map[string]peerCounters{"pubA": {rx: 100, tx: 200}}
|
||||
|
||||
if got := nextTrafficBaseline(ensureReload, prev); len(got) != 1 || got["pubA"] != prev["pubA"] {
|
||||
t.Errorf("a reload must preserve the previous baseline (syncconf never resets kernel counters), got %v", got)
|
||||
}
|
||||
if got := nextTrafficBaseline(ensureRestart, prev); len(got) != 0 {
|
||||
t.Errorf("a restart must reset the baseline to empty (awg-quick down+up zeroes kernel counters), got %v", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestHostRulesFingerprintCoversForwardedPortsAndPeerIP(t *testing.T) {
|
||||
a := baseInstance()
|
||||
b := baseInstance()
|
||||
|
||||
@@ -90,6 +90,23 @@ func parsePortNumber(s string) (int, bool) {
|
||||
return n, true
|
||||
}
|
||||
|
||||
// ForwardedPortsInclude reports whether port is covered by any spec in a raw
|
||||
// ForwardedPorts string (a single port or an inclusive range). For callers
|
||||
// outside this package that need to check a spec against something other
|
||||
// than rendering it into iptables rules -- e.g. save-time validation that a
|
||||
// client isn't about to hijack the panel's own port or another inbound's
|
||||
// port (portForwardLines has no -d restriction, so a forwarded port that
|
||||
// collides with one already in use on the host silently redirects it to the
|
||||
// tunnel client instead).
|
||||
func ForwardedPortsInclude(forwardedPorts string, port int) bool {
|
||||
for _, spec := range parseForwardedPorts(forwardedPorts) {
|
||||
if port >= spec.start && port <= spec.end {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// portForwardComment returns a short, shell-safe iptables comment tag for one
|
||||
// peer's forwarded-port rules, so PostDown removes exactly what PostUp added
|
||||
// regardless of ordering. Derived from a hash of the peer's email rather than
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
package amneziawg
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestForwardedPortsInclude(t *testing.T) {
|
||||
cases := []struct {
|
||||
spec string
|
||||
port int
|
||||
want bool
|
||||
}{
|
||||
{"80,443", 80, true},
|
||||
{"80,443", 443, true},
|
||||
{"80,443", 8080, false},
|
||||
{"8000-8100", 8050, true},
|
||||
{"8000-8100", 7999, false},
|
||||
{"8000-8100", 8101, false},
|
||||
{"", 80, false},
|
||||
{"not-a-port", 80, false},
|
||||
}
|
||||
for _, c := range cases {
|
||||
if got := ForwardedPortsInclude(c.spec, c.port); got != c.want {
|
||||
t.Errorf("ForwardedPortsInclude(%q, %d) = %v, want %v", c.spec, c.port, got, c.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user