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

split user dns rule

Browse Source
This commit is contained in:
arm64v8a 2023-05-02 13:05:26 +09:00
parent eb39cfa651
commit f5385e1d09
1 changed files with 22 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
app/src/main/java/io/nekohasekai/sagernet/fmt/ConfigBuilder.kt
View File

@ -148,12 +148,8 @@ fun buildConfig(
rule.outbound.takeIf { it > 0 && it != proxy.id } rule.outbound.takeIf { it > 0 && it != proxy.id }
}.toHashSet().toList()).associateBy { it.id } }.toHashSet().toList()).associateBy { it.id }
val buildSelector = !forTest && group?.isSelector == true && !forExport val buildSelector = !forTest && group?.isSelector == true && !forExport
val uidListDNSRemote = mutableListOf<Int>() val userDNSRuleList = mutableListOf<DNSRule_DefaultOptions>()
val uidListDNSDirect = mutableListOf<Int>()
val domainListDNSRemote = mutableListOf<String>()
val domainListDNSDirect = mutableListOf<String>()
val domainListDNSDirectForce = mutableListOf<String>() val domainListDNSDirectForce = mutableListOf<String>()
val domainListDNSBlock = mutableListOf<String>()
val bypassDNSBeans = hashSetOf<AbstractBean>() val bypassDNSBeans = hashSetOf<AbstractBean>()
val isVPN = DataStore.serviceMode == Key.MODE_VPN val isVPN = DataStore.serviceMode == Key.MODE_VPN
val bind = if (!forTest && DataStore.allowAccess) "0.0.0.0" else LOCALHOST val bind = if (!forTest && DataStore.allowAccess) "0.0.0.0" else LOCALHOST
@ -529,7 +525,7 @@ fun buildConfig(
if (rule.packages.isNotEmpty()) { if (rule.packages.isNotEmpty()) {
PackageCache.awaitLoadSync() PackageCache.awaitLoadSync()
} }
val uidList2 = rule.packages.map { val uidList = rule.packages.map {
if (!isVPN) { if (!isVPN) {
alerts.add(0 to rule.displayName()) alerts.add(0 to rule.displayName())
} }
@ -537,14 +533,14 @@ fun buildConfig(
}.toHashSet().filterNotNull() }.toHashSet().filterNotNull()
val ruleObj = Rule_DefaultOptions().apply { val ruleObj = Rule_DefaultOptions().apply {
if (uidList2.isNotEmpty()) { if (uidList.isNotEmpty()) {
PackageCache.awaitLoadSync() PackageCache.awaitLoadSync()
user_id = uidList2 user_id = uidList
} }
var domainList2: List<String>? = null var domainList: List<String>? = null
if (rule.domains.isNotBlank()) { if (rule.domains.isNotBlank()) {
domainList2 = rule.domains.split("\n") domainList = rule.domains.split("\n")
makeSingBoxRule(domainList2, false) makeSingBoxRule(domainList, false)
} }
if (rule.ip.isNotBlank()) { if (rule.ip.isNotBlank()) {
makeSingBoxRule(rule.ip.split("\n"), true) makeSingBoxRule(rule.ip.split("\n"), true)
@ -583,14 +579,23 @@ fun buildConfig(
// also bypass lookup // also bypass lookup
// cannot use other outbound profile to lookup... // cannot use other outbound profile to lookup...
val dnsRuleObj = DNSRule_DefaultOptions().apply {
if (uidList.isNotEmpty()) user_id = uidList
domainList?.let { makeSingBoxRule(it) }
}
if (rule.outbound == -1L) { if (rule.outbound == -1L) {
uidListDNSDirect += uidList2 userDNSRuleList += dnsRuleObj.apply { server = "dns-direct" }
if (domainList2 != null) domainListDNSDirect += domainList2
} else if (rule.outbound == 0L) { } else if (rule.outbound == 0L) {
uidListDNSRemote += uidList2 if (useFakeDns) userDNSRuleList += dnsRuleObj.apply {
if (domainList2 != null) domainListDNSRemote += domainList2 server = "dns-fake"
inbound = listOf("tun-in")
}
userDNSRuleList += dnsRuleObj.apply {
server = "dns-remote"
inbound = null
}
} else if (rule.outbound == -2L) { } else if (rule.outbound == -2L) {
if (domainList2 != null) domainListDNSBlock += domainList2 userDNSRuleList += dnsRuleObj.apply { server = "dns-block" }
} }
outbound = when (val outId = rule.outbound) { outbound = when (val outId = rule.outbound) {
@ -701,63 +706,7 @@ fun buildConfig(
// dns object user rules // dns object user rules
if (enableDnsRouting) { if (enableDnsRouting) {
val dnsRuleObj = mutableListOf<DNSRule_DefaultOptions>() userDNSRuleList.forEach {
if (uidListDNSRemote.isNotEmpty()) {
if (useFakeDns) dnsRuleObj.add(
DNSRule_DefaultOptions().apply {
user_id = uidListDNSRemote.toHashSet().toList()
server = "dns-fake"
inbound = listOf("tun-in")
}
)
dnsRuleObj.add(
DNSRule_DefaultOptions().apply {
user_id = uidListDNSRemote.toHashSet().toList()
server = "dns-remote"
}
)
}
if (domainListDNSRemote.isNotEmpty()) {
if (useFakeDns) dnsRuleObj.add(
DNSRule_DefaultOptions().apply {
makeSingBoxRule(domainListDNSRemote.toHashSet().toList())
server = "dns-fake"
inbound = listOf("tun-in")
}
)
dnsRuleObj.add(
DNSRule_DefaultOptions().apply {
makeSingBoxRule(domainListDNSRemote.toHashSet().toList())
server = "dns-remote"
}
)
}
if (uidListDNSDirect.isNotEmpty()) {
dnsRuleObj.add(
DNSRule_DefaultOptions().apply {
user_id = uidListDNSDirect.toHashSet().toList()
server = "dns-direct"
}
)
}
if (domainListDNSDirect.isNotEmpty()) {
dnsRuleObj.add(
DNSRule_DefaultOptions().apply {
makeSingBoxRule(domainListDNSDirect.toHashSet().toList())
server = "dns-direct"
}
)
}
if (domainListDNSBlock.isNotEmpty()) {
dnsRuleObj.add(
DNSRule_DefaultOptions().apply {
makeSingBoxRule(domainListDNSBlock.toHashSet().toList())
server = "dns-block"
disable_cache = true
}
)
}
dnsRuleObj.forEach {
if (!it.checkEmpty()) dns.rules.add(it) if (!it.checkEmpty()) dns.rules.add(it)
} }
} }