mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-23 02:00:20 +07:00
847bb6923b
* refactor: move business logic from servers model * refactor: move containersModel initialization * refactor: added protocol ui controller and removed settings class from protocols model * refactor: moved cli management to separate controller * refactor: moved app split to separate controller * refactor: moved site split to separate controller * refactor: moved allowed dns to separate controller * refactor: moved language logic to separate ui controller * refactor: removed Settings from devices model * refactor: moved configs and services api logit to separate core controller * refactor: added a layer with a repository between the storage and controllers * refactor: use child parent system instead of smart pointers for controllers and models initialization * refactor: moved install functions from server controller to install controller * refactor: install controller refactoring * chore: renamed exportController to exportUiController * refactor: separate export controller * refactor: removed VpnConfigurationsController * chore: renamed ServerController to SshSession * refactor: replaced ServerController to SshSession * chore: moved qml controllers to separate folder * chore: include fixes * chore: moved utils from core root to core/utils * chore: include fixes * chore: rename core/utils files to camelCase foramt * chore: include fixes * chore: moved some utils to api and selfhosted folders * chore: include fixes * chore: remove unused file * chore: moved serialization folder to core/utils * chore: include fixes * chore: moved some files from client root to core/utils * chore: include fixes * chore: moved ui utils to ui/utils folder * chore: include fixes * chore: move utils from root to ui/utils * chore: include fixes * chore: moved configurators to core/configurators * chore: include fixes * refactor: moved iap logic from ui controller to core * refactor: moved remaining core logic from ApiConfigsController to SubscriptionController * chore: rename apiNewsController to apiNewsUiController * refactor: moved core logic from news ui controller to core * chore: renamed apiConfigsController to subscriptionUiController * chore: include fixes * refactor: merge ApiSettingsController with SubscriptionUiController * chore: moved ui selfhosted controllers to separate folder * chore: include fixes * chore: rename connectionController to connectiomUiController * refactor: moved core logic from connectionUiController * chore: rename settingsController to settingsUiController * refactor: move core logic from settingsUiController * refactor: moved core controller signal/slot connections to separate class * fix: newsController fixes after refactoring * chore: rename model to camelCase * chore: include fixes * chore: remove unused code * chore: move selfhosted core to separate folder * chore: include fixes * chore: rename importController to importUiController * refactor: move core logic from importUiController * chore: minor fixes * chore: remove prem v1 migration * refactor: remove openvpn over cloak and openvpn over shadowsocks * refactor: removed protocolsForContainer function * refactor: add core models * refactor: replace json with c++ structs for server config * refactor: move getDnsPair to ServerConfigUtils * feat: add admin selfhosted config export test * feat: add multi import test * refactor: use coreController for tests * feat: add few simple tests * chore: qrepos in all core controllers * feat: add test for settings * refactor: remove repo dependency from configurators * chore: moved protocols to core folder * chore: include fixes * refactor: moved containersDefs, defs, apiDefs, protocolsDefs to different places * chore: include fixes * chore: build fixes * chore: build fixes * refactor: remove q repo and interface repo * feat: add test for ui servers model and controller * chore: renamed to camelCase * chore: include fixes * refactor: moved core logic from sites ui controller * fix: fixed api config processing * fix: fixed processed server index processing * refactor: protocol models now use c++ structs instead of json configs * refactor: servers model now use c++ struct instead of json config * fix: fixed default server index processing * fix: fix logs init * fix: fix secure settings load keys * chore: build fixes * fix: fixed clear settings * fix: fixed restore backup * fix: sshSession usage * fix: fixed export functions signatures * fix: return missing part from buildContainerWorker * fix: fixed server description on page home * refactor: add container config helpers functions * refactor: c++ structs instead of json * chore: add dns protocol config struct * refactor: move config utils functions to config structs * feat: add test for selfhosted server setup * refactor: separate resources.qrc * fix: fixed server rename * chore: return nameOverriddenByUser * fix: build fixes * fix: fixed models init * refactor: cleanup models usage * fix: fixed models init * chore: cleanup connections and functions signatures * chore: cleanup updateModel calls * feat: added cache to servers repo * chore: cleanup unused functions * chore: ssxray processing * chore: remove transportProtoWithDefault and portWithDefault functions * chore: removed proto types any and l2tp * refactor: moved some constants * fix: fixed native configs export * refactor: remove json from processConfigWith functions * fix: fixed processed server index usage * fix: qml warning fixes * chore: merge fixes * chore: update tests * fix: fixed xray config processing * fix: fixed split tunneling processing * chore: rename sites controllers and model * chore: rename fixes * chore: minor fixes * chore: remove ability to load backup from "file with connection settings" button * fix: fixed api device revoke * fix: remove full model update when renaming a user * fix: fixed premium/free server rename * fix: fixed selfhosted new server install * fix: fixed updateContainer function * fix: fixed revoke for external premium configs * feat: add native configs qr processing * chore: codestyle fixes * fix: fixed admin config create * chore: again remove ability to load backup from "file with connection settings" button * chore: minor fixes * fix: fixed variables initialization * fix: fixed qml imports * fix: minor fixes * fix: fix vpnConnection function calls * feat: add buckup error handling * fix: fixed admin config revok * fix: fixed selfhosted awg installation * fix: ad visability * feat: add empty check for primary dns * chore: minor fixes
259 lines
9.7 KiB
Kotlin
259 lines
9.7 KiB
Kotlin
package org.amnezia.vpn.protocol.xray
|
|
|
|
import android.content.Context
|
|
import android.net.VpnService.Builder
|
|
import java.io.File
|
|
import java.io.IOException
|
|
import java.net.InetAddress
|
|
import java.net.ServerSocket
|
|
import java.util.UUID
|
|
import go.Seq
|
|
import org.amnezia.vpn.protocol.BadConfigException
|
|
import org.amnezia.vpn.protocol.Protocol
|
|
import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
|
|
import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
|
|
import org.amnezia.vpn.protocol.Statistics
|
|
import org.amnezia.vpn.protocol.VpnStartException
|
|
import org.amnezia.vpn.protocol.xray.libXray.DialerController
|
|
import org.amnezia.vpn.protocol.xray.libXray.LibXray
|
|
import org.amnezia.vpn.protocol.xray.libXray.Logger
|
|
import org.amnezia.vpn.protocol.xray.libXray.Tun2SocksConfig
|
|
import org.amnezia.vpn.util.Log
|
|
import org.amnezia.vpn.util.net.InetNetwork
|
|
import org.amnezia.vpn.util.net.ip
|
|
import org.amnezia.vpn.util.net.parseInetAddress
|
|
import org.json.JSONArray
|
|
import org.json.JSONObject
|
|
|
|
private const val TAG = "Xray"
|
|
private const val LIBXRAY_TAG = "libXray"
|
|
|
|
private fun findSocksInboundIndex(inbounds: JSONArray): Int {
|
|
for (i in 0 until inbounds.length()) {
|
|
val o = inbounds.optJSONObject(i) ?: continue
|
|
if (o.optString("protocol").equals("socks", ignoreCase = true)) {
|
|
return i
|
|
}
|
|
}
|
|
return -1
|
|
}
|
|
|
|
private fun acquireFreeLocalPort(): Int {
|
|
try {
|
|
ServerSocket(0, 1, InetAddress.getByName("127.0.0.1")).use { return it.localPort }
|
|
} catch (e: Exception) {
|
|
throw VpnStartException(
|
|
"Failed to acquire free TCP port on 127.0.0.1 for SOCKS inbound: ${e.message}"
|
|
)
|
|
}
|
|
}
|
|
|
|
class Xray : Protocol() {
|
|
|
|
private var isRunning: Boolean = false
|
|
override val statistics: Statistics = Statistics.EMPTY_STATISTICS
|
|
|
|
override fun internalInit() {
|
|
Seq.setContext(context)
|
|
if (!isInitialized) {
|
|
LibXray.initLogger(object : Logger {
|
|
override fun warning(s: String) = Log.w(LIBXRAY_TAG, s)
|
|
|
|
override fun error(s: String) = Log.e(LIBXRAY_TAG, s)
|
|
|
|
override fun write(msg: ByteArray): Long {
|
|
Log.w(LIBXRAY_TAG, String(msg))
|
|
return msg.size.toLong()
|
|
}
|
|
}).isNotNullOrBlank { err ->
|
|
Log.w(TAG, "Failed to initialize logger: $err")
|
|
}
|
|
}
|
|
}
|
|
|
|
override suspend fun startVpn(config: JSONObject, vpnBuilder: Builder, protect: (Int) -> Boolean) {
|
|
if (isRunning) {
|
|
Log.w(TAG, "XRay already running")
|
|
return
|
|
}
|
|
|
|
val xrayConfigData = config.optJSONObject("xray_config_data")
|
|
?: config.optJSONObject("ssxray_config_data")
|
|
?: throw BadConfigException("config_data not found")
|
|
val xrayJsonConfig = JSONObject(xrayConfigData.optString("config"))
|
|
|
|
// Inject SOCKS5 auth before starting xray. Re-uses existing credentials if present.
|
|
ensureInboundAuth(xrayJsonConfig)
|
|
val xrayConfig = parseConfig(config, xrayJsonConfig)
|
|
|
|
(xrayJsonConfig.optJSONObject("log") ?: JSONObject().also { xrayJsonConfig.put("log", it) })
|
|
.put("loglevel", "warning")
|
|
.put("access", "none") // disable access log
|
|
|
|
var xrayJsonConfigString = xrayJsonConfig.toString()
|
|
config.getString("hostName").let { hostName ->
|
|
val ipAddress = parseInetAddress(hostName).ip
|
|
if (hostName != ipAddress) {
|
|
xrayJsonConfigString = xrayJsonConfigString.replace(hostName, ipAddress)
|
|
}
|
|
}
|
|
|
|
start(xrayConfig, xrayJsonConfigString, vpnBuilder, protect)
|
|
state.value = CONNECTED
|
|
isRunning = true
|
|
}
|
|
|
|
private fun parseConfig(config: JSONObject, xrayJsonConfig: JSONObject): XrayConfig {
|
|
return XrayConfig.build {
|
|
addAddress(XrayConfig.DEFAULT_IPV4_ADDRESS)
|
|
|
|
config.optString("dns1").let {
|
|
if (it.isNotBlank()) addDnsServer(parseInetAddress(it))
|
|
}
|
|
|
|
config.optString("dns2").let {
|
|
if (it.isNotBlank()) addDnsServer(parseInetAddress(it))
|
|
}
|
|
|
|
addRoute(InetNetwork("0.0.0.0", 0))
|
|
addRoute(InetNetwork("2000::0", 3))
|
|
config.getString("hostName").let {
|
|
excludeRoute(InetNetwork(it, 32))
|
|
}
|
|
|
|
config.optString("mtu").let {
|
|
if (it.isNotBlank()) setMtu(it.toInt())
|
|
}
|
|
|
|
val inbounds = xrayJsonConfig.getJSONArray("inbounds")
|
|
val socksIdx = findSocksInboundIndex(inbounds)
|
|
if (socksIdx < 0) {
|
|
throw BadConfigException("socks inbound not found")
|
|
}
|
|
val socksConfig = inbounds.getJSONObject(socksIdx)
|
|
socksConfig.getInt("port").let { setSocksPort(it) }
|
|
|
|
val socksSettings = socksConfig.optJSONObject("settings")
|
|
val accounts = socksSettings?.optJSONArray("accounts")
|
|
if (accounts != null && accounts.length() > 0) {
|
|
val account = accounts.getJSONObject(0)
|
|
setSocksUser(account.optString("user"))
|
|
setSocksPass(account.optString("pass"))
|
|
}
|
|
|
|
configSplitTunneling(config)
|
|
configAppSplitTunneling(config)
|
|
}
|
|
}
|
|
|
|
private fun start(config: XrayConfig, configJson: String, vpnBuilder: Builder, protect: (Int) -> Boolean) {
|
|
buildVpnInterface(config, vpnBuilder)
|
|
|
|
DialerController { protect(it.toInt()) }.also {
|
|
LibXray.registerDialerController(it).isNotNullOrBlank { err ->
|
|
throw VpnStartException("Failed to register dialer controller: $err")
|
|
}
|
|
LibXray.registerListenerController(it).isNotNullOrBlank { err ->
|
|
throw VpnStartException("Failed to register listener controller: $err")
|
|
}
|
|
}
|
|
|
|
vpnBuilder.establish().use { tunFd ->
|
|
if (tunFd == null) {
|
|
throw VpnStartException("Create VPN interface: permission not granted or revoked")
|
|
}
|
|
Log.d(TAG, "Run tun2Socks")
|
|
runTun2Socks(config, tunFd.detachFd())
|
|
|
|
Log.d(TAG, "Run XRay")
|
|
Log.i(TAG, "xray ${LibXray.xrayVersion()}")
|
|
val assetsPath = context.getDir("assets", Context.MODE_PRIVATE).absolutePath
|
|
LibXray.initXray(assetsPath)
|
|
val geoDir = File(assetsPath, "geo").absolutePath
|
|
val configPath = File(context.cacheDir, "config.json")
|
|
Log.v(TAG, "xray.location.asset: $geoDir")
|
|
Log.v(TAG, "config: $configPath")
|
|
try {
|
|
configPath.writeText(configJson)
|
|
} catch (e: IOException) {
|
|
LibXray.stopTun2Socks()
|
|
throw VpnStartException("Failed to write xray config: ${e.message}")
|
|
}
|
|
LibXray.runXray(geoDir, configPath.absolutePath, config.maxMemory).isNotNullOrBlank { err ->
|
|
LibXray.stopTun2Socks()
|
|
throw VpnStartException("Failed to start xray: $err")
|
|
}
|
|
}
|
|
}
|
|
|
|
override fun stopVpn() {
|
|
LibXray.stopXray().isNotNullOrBlank { err ->
|
|
Log.e(TAG, "Failed to stop XRay: $err")
|
|
}
|
|
LibXray.stopTun2Socks().isNotNullOrBlank { err ->
|
|
Log.e(TAG, "Failed to stop tun2Socks: $err")
|
|
}
|
|
|
|
isRunning = false
|
|
state.value = DISCONNECTED
|
|
}
|
|
|
|
override fun reconnectVpn(vpnBuilder: Builder, protect: (Int) -> Boolean) {
|
|
state.value = CONNECTED
|
|
}
|
|
|
|
private fun runTun2Socks(config: XrayConfig, fd: Int) {
|
|
val proxyUrl = "socks5://${config.socksUser}:${config.socksPass}@127.0.0.1:${config.socksPort}"
|
|
val tun2SocksConfig = Tun2SocksConfig().apply {
|
|
mtu = config.mtu.toLong()
|
|
proxy = proxyUrl
|
|
device = "fd://$fd"
|
|
logLevel = "warn"
|
|
}
|
|
LibXray.startTun2Socks(tun2SocksConfig, fd.toLong()).isNotNullOrBlank { err ->
|
|
throw VpnStartException("Failed to start tun2socks: $err")
|
|
}
|
|
}
|
|
|
|
// Ensures SOCKS5 auth is present on the socks inbound settings.
|
|
// Re-uses existing credentials if already configured; otherwise generates random ones.
|
|
private fun ensureInboundAuth(xrayConfig: JSONObject) {
|
|
val inbounds = xrayConfig.optJSONArray("inbounds") ?: return
|
|
val socksIdx = findSocksInboundIndex(inbounds)
|
|
if (socksIdx < 0) return
|
|
|
|
val inbound = inbounds.getJSONObject(socksIdx)
|
|
inbound.put("port", acquireFreeLocalPort())
|
|
val settings = inbound.optJSONObject("settings") ?: JSONObject().also { inbound.put("settings", it) }
|
|
val accounts = settings.optJSONArray("accounts")
|
|
if (accounts != null && accounts.length() > 0) {
|
|
val account = accounts.getJSONObject(0)
|
|
if (account.optString("user").isNotEmpty() && account.optString("pass").isNotEmpty()) {
|
|
// Ensure auth mode is enforced even for imported configs that had accounts
|
|
// but auth: "noauth" (or no auth field).
|
|
settings.put("auth", "password")
|
|
inbound.put("settings", settings)
|
|
inbounds.put(socksIdx, inbound)
|
|
return
|
|
}
|
|
}
|
|
|
|
val user = UUID.randomUUID().toString().replace("-", "").substring(0, 16)
|
|
val pass = UUID.randomUUID().toString().replace("-", "")
|
|
settings.put("auth", "password")
|
|
settings.put("accounts", JSONArray().put(JSONObject().put("user", user).put("pass", pass)))
|
|
inbound.put("settings", settings)
|
|
inbounds.put(socksIdx, inbound)
|
|
}
|
|
|
|
companion object {
|
|
val instance: Xray by lazy { Xray() }
|
|
}
|
|
}
|
|
|
|
private fun String?.isNotNullOrBlank(block: (String) -> Unit) {
|
|
if (!this.isNullOrBlank()) {
|
|
block(this)
|
|
}
|
|
}
|