Release 2.7.3.3: dark theme and Amnezia vpn:// import fixes.

internal/linknorm/normalize.go

@@ -2,7 +2,6 @@ package linknorm
 
 import (
 	"fmt"
-	"strings"
 
 	"vpnclient/internal/config"
 	"vpnclient/internal/protocols/awg"
@@ -13,7 +12,7 @@ import (
 
 // Normalize normalizes a share/proxy URI for the given protocol (or auto-detect).
 func Normalize(proto config.Protocol, raw string) (normalized string, detected config.Protocol, remark string, err error) {
-	raw = strings.TrimSpace(raw)
+	raw = SanitizeShareText(raw)
 	if raw == "" {
 		return "", proto, "", fmt.Errorf("пустая ссылка")
 	}

internal/linknorm/sanitize.go

@@ -0,0 +1,35 @@
+package linknorm
+
+import (
+	"strings"
+	"unicode"
+)
+
+// SanitizeShareText strips BOM, bidi isolates and zero-width chars that break
+// scheme detection (common when pasting from messengers / Amnezia share).
+func SanitizeShareText(raw string) string {
+	raw = strings.TrimPrefix(raw, "\ufeff")
+	raw = strings.TrimSpace(raw)
+	if raw == "" {
+		return ""
+	}
+	var b strings.Builder
+	b.Grow(len(raw))
+	for _, r := range raw {
+		switch r {
+		case '\u200b', '\u200c', '\u200d', '\u2060', '\ufeff', // zero-width / BOM
+			'\u2066', '\u2067', '\u2068', '\u2069', // LRI/RLI/FSI/PDI
+			'\u200e', '\u200f', // LRM/RLM
+			'\u202a', '\u202b', '\u202c', '\u202d', '\u202e': // embedding overrides
+			continue
+		}
+		if r < 0x20 && r != '\n' && r != '\r' && r != '\t' {
+			continue
+		}
+		if unicode.Is(unicode.Cf, r) { // other format controls
+			continue
+		}
+		b.WriteRune(r)
+	}
+	return strings.TrimSpace(b.String())
+}

internal/linknorm/sanitize_test.go

@@ -0,0 +1,42 @@
+package linknorm
+
+import "testing"
+
+func TestSanitizeShareText_BidiWrappers(t *testing.T) {
+	raw := "\u2068vpn://abc\u2069"
+	got := SanitizeShareText(raw)
+	if got != "vpn://abc" {
+		t.Fatalf("got %q", got)
+	}
+}
+
+func TestNormalize_DirtyVPN(t *testing.T) {
+	raw := "\u2068vpn://W0ludGVyZmFjZV0KQWRkcmVzcyA9IDEwLjguMS4xMy8zMgpETlMgPSAxLjEuMS4xClByaXZhdGVLZXkgPSBhSkpSYUFFY1RidWdJYjB2emFJcW5MQkZJQ0dqNlRkcXo1RC84OU13T0hZPQpKYyA9IDYKCltQZWVyXQpQdWJsaWNLZXkgPSBOUThJMVpPcUtxWmhGUXlxcXBuakRWc1poWXpkUk11Qm9tVXBzNWZPTTNzPQpFbmRwb2ludCA9IHJ1LmRlNGltYS51azo0MTQyMQpBbGxvd2VkSVBzID0gMC4wLjAuMC8w\u2069"
+	// Use full user link instead for reliable parse
+	raw = "\u2068vpn://W0ludGVyZmFjZV0KQWRkcmVzcyA9IDEwLjguMS4xMy8zMgpETlMgPSAxNzIuMjkuMTcyLjI1NCwgMS4wLjAuMQpQcml2YXRlS2V5ID0gYUpKUmFBRWNUYnVnSWIwdnphSXFuTEJGSUNHajZUZHF6NUQvODlNd09IWT0KTVRVID0gMTI4MApKYyA9IDYKSm1pbiA9IDEwCkptYXggPSA1MApTMSA9IDc0ClMyID0gNDcKUzMgPSA1NgpTNCA9IDMKSDEgPSA1OTA2OTcyNzktMTg4ODc3NDc4NApIMiA9IDIxMDk1MTkwNDctMjEyNDM5NTA2OQpIMyA9IDIxMzY3MjM2NDAtMjE0MTI1MTI4MwpINCA9IDIxNDcyNDg5MzYtMjE0NzM5ODY2MQoKW1BlZXJdClB1YmxpY0tleSA9IE5ROEkxWk9xS3FaaEZReXFxcG5qRFZzWmhZemRSTXVCb21VcHM1Zk9NM3M9ClByZXNoYXJlZEtleSA9IGxTVS9vd1hoNHIvU09UVndTaU5FM1BCZGVPbDdBUUpreUZlTGdMc1Q4ekk9CkFsbG93ZWRJUHMgPSAwLjAuMC4wLzAsIDo6LzAKRW5kcG9pbnQgPSBydS5kZTRpbWEudWs6NDE0MjEKUGVyc2lzdGVudEtlZXBhbGl2ZSA9IDI1\u2069"
+	u, proto, _, err := Normalize("", raw)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if proto != "awg" {
+		t.Fatalf("proto %q", proto)
+	}
+	if u == "" || !containsFold(u, "[Interface]") {
+		t.Fatalf("normalized %q", u)
+	}
+}
+
+func containsFold(s, sub string) bool {
+	return len(s) >= len(sub) && (s == sub || len(sub) == 0 ||
+		(len(s) > 0 && (stringIndexFold(s, sub) >= 0)))
+}
+
+func stringIndexFold(s, sub string) int {
+	// simple contains for test
+	for i := 0; i+len(sub) <= len(s); i++ {
+		if s[i:i+len(sub)] == sub {
+			return i
+		}
+	}
+	return -1
+}