Northern_Lights/NekoBoxForAndroid
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/NekoBoxForAndroid.git synced 2025-12-19 22:50:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix socksfmt

Browse Source
This commit is contained in:
arm64v8a 2023-06-29 21:39:54 +09:00
parent 3aa428b06f
commit d52ec71bb9
2 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/src/main/java/io/nekohasekai/sagernet/fmt/socks/SOCKSFmt.kt
View File

@ -6,42 +6,32 @@ import io.nekohasekai.sagernet.ktx.unUrlSafe
import io.nekohasekai.sagernet.ktx.urlSafe import io.nekohasekai.sagernet.ktx.urlSafe
import moe.matsuri.nb4a.SingBoxOptions import moe.matsuri.nb4a.SingBoxOptions
import moe.matsuri.nb4a.utils.NGUtil import moe.matsuri.nb4a.utils.NGUtil
import moe.matsuri.nb4a.utils.Util
import okhttp3.HttpUrl import okhttp3.HttpUrl
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
fun parseSOCKS(link: String): SOCKSBean { fun parseSOCKS(link: String): SOCKSBean {
if (!link.substringAfter("://").contains(":")) { val url = ("http://" + link.substringAfter("://")).toHttpUrlOrNull()
// v2rayN shit format ?: error("Not supported: $link")
var url = link.substringAfter("://")
if (url.contains("#")) {
url = url.substringBeforeLast("#")
}
url = url.decodeBase64UrlSafe()
val httpUrl = "http://$url".toHttpUrlOrNull() ?: error("Invalid v2rayN link content: $url")
return SOCKSBean().apply {
serverAddress = httpUrl.host
serverPort = httpUrl.port
username = httpUrl.username.takeIf { it != "null" } ?: ""
password = httpUrl.password.takeIf { it != "null" } ?: ""
if (link.contains("#")) {
name = link.substringAfter("#").unUrlSafe()
}
}
} else {
val url = ("http://" + link.substringAfter("://")).toHttpUrlOrNull()
?: error("Not supported: $link")
return SOCKSBean().apply { return SOCKSBean().apply {
protocol = when { protocol = when {
link.startsWith("socks4://") -> SOCKSBean.PROTOCOL_SOCKS4 link.startsWith("socks4://") -> SOCKSBean.PROTOCOL_SOCKS4
link.startsWith("socks4a://") -> SOCKSBean.PROTOCOL_SOCKS4A link.startsWith("socks4a://") -> SOCKSBean.PROTOCOL_SOCKS4A
else -> SOCKSBean.PROTOCOL_SOCKS5 else -> SOCKSBean.PROTOCOL_SOCKS5
}
serverAddress = url.host
serverPort = url.port
username = url.username
password = url.password
// v2rayN fmt
if (password.isNullOrBlank() && !username.isNullOrBlank()) {
try {
val n = username.decodeBase64UrlSafe()
username = n.substringBefore(":")
password = n.substringAfter(":")
} catch (_: Exception) {
} }
serverAddress = url.host
serverPort = url.port
username = url.username
password = url.password
name = url.fragment
} }
} }
} }

2
app/src/main/java/moe/matsuri/nb4a/utils/Util.kt
View File

@ -72,7 +72,7 @@ object Util {
for (flag in flags) { for (flag in flags) {
try { try {
ret = Base64.decode(str, flag) ret = Base64.decode(str, flag)
} catch (e: Exception) { } catch (_: Exception) {
} }
if (ret != null) return ret if (ret != null) return ret
} }