From 8d726fa82906d3cc2b1a39beff59bf34421ed344 Mon Sep 17 00:00:00 2001
From: Alexey <141106254+akellavk@users.noreply.github.com>
Date: Wed, 15 Jul 2026 07:05:07 +0600
Subject: [PATCH] fix root authentication (#5910)

---
 .../main/java/com/v2ray/ang/root/RootProxyManager.kt   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/root/RootProxyManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/root/RootProxyManager.kt
index 74eecf7d..e18f19af 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/root/RootProxyManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/root/RootProxyManager.kt
@@ -109,6 +109,8 @@ object RootProxyManager {
             return null
         }
         val appUid = context.applicationInfo.uid
+        val socksUsername = SettingsManager.getSocksUsername()
+        val socksPassword = SettingsManager.getSocksPassword()
         val port = SettingsManager.getSocksPort()
         val runDir = File(context.filesDir, AppConfig.ROOT_RUNTIME_DIR).apply { mkdirs() }
         val pidFile = File(runDir, "tun2socks.pid").absolutePath
@@ -145,7 +147,7 @@ object RootProxyManager {
             // (loopback, already RETURNed by the 127.0.0.0/8 bypass) and the core's real outbound
             // runs as the app uid (RETURNed by the uid-owner rule), so traffic can't loop.
             appendLine("cat > '$cfgFile' <<'HEVCFG'")
-            append(buildHevConfig(port, ipv6))
+            append(buildHevConfig(socksUsername = socksUsername, socksPassword = socksPassword, socksPort = port, ipv6 = ipv6))
             appendLine("HEVCFG")
             appendLine("nohup \"\$BIN\" '$cfgFile' >'$logFile' 2>&1 &")
             appendLine("T2S_PID=\$!")
@@ -195,7 +197,7 @@ object RootProxyManager {
      * tun address when IPv6 is enabled; whether v6 actually flows in is decided separately by
      * the v6 route into [TABLE].
      */
-    private fun buildHevConfig(socksPort: Int, ipv6: Boolean): String {
+    private fun buildHevConfig(socksUsername: String?, socksPassword: String?, socksPort: Int, ipv6: Boolean): String {
         val v4 = AppConfig.ROOT_TUN_ADDR_V4.substringBefore("/")
         val v6 = AppConfig.ROOT_TUN_ADDR_V6.substringBefore("/")
         return buildString {
@@ -209,6 +211,10 @@ object RootProxyManager {
             appendLine("  port: $socksPort")
             appendLine("  address: '${AppConfig.LOOPBACK}'")
             appendLine("  udp: 'udp'")
+            if (socksUsername != null && socksPassword != null) {
+                appendLine("  username: '$socksUsername'")
+                appendLine("  password: '$socksPassword'")
+            }
             appendLine("  tcp-fastopen: true")
         }
     }