Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] dev from dyhkwong:dev #22

Merged
merged 1 commit into from
Feb 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
<data android:scheme="wireguard" />
<data android:scheme="mierus" />
<data android:scheme="quic" />
<data android:scheme="anytls" />

</intent-filter>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ data class ProxyEntity(

fun hasShareLink(): Boolean {
return when (type) {
TYPE_SSH, TYPE_WG, TYPE_SHADOWTLS, TYPE_ANYTLS -> false
TYPE_SSH, TYPE_WG, TYPE_SHADOWTLS -> false
TYPE_CONFIG, TYPE_CHAIN, TYPE_BALANCER -> false
else -> true
}
Expand Down
42 changes: 42 additions & 0 deletions app/src/main/java/io/nekohasekai/sagernet/fmt/anytls/AnyTLSFmt.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package io.nekohasekai.sagernet.fmt.anytls

import io.nekohasekai.sagernet.ktx.*
import libcore.Libcore

fun parseAnyTLS(url: String): AnyTLSBean {
val link = Libcore.parseURL(url)
return AnyTLSBean().apply {
name = link.fragment
serverAddress = link.host
serverPort = link.port.takeIf { it > 0 } ?: 443
password = link.username
security = "tls"
link.queryParameter("sni")?.also {
sni = it
}
link.queryParameter("insecure")?.takeIf { it == "1" }?.also {
allowInsecure = true
}
}
}

fun AnyTLSBean.toUri(): String? {
if (security != "tls") {
return null
}
val builder = Libcore.newURL("anytls")
builder.host = serverAddress
builder.port = serverPort
builder.username = password
builder.rawPath = "/"
if (sni.isNotEmpty()) {
builder.addQueryParameter("sni", sni)
}
if (allowInsecure) {
builder.addQueryParameter("insecure", "1")
}
if (name.isNotEmpty()) {
builder.setRawFragment(name.urlSafe())
}
return builder.string
}
8 changes: 8 additions & 0 deletions app/src/main/java/io/nekohasekai/sagernet/ktx/Formats.kt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import cn.hutool.core.codec.Base64
import cn.hutool.json.JSONObject
import io.nekohasekai.sagernet.fmt.AbstractBean
import io.nekohasekai.sagernet.fmt.Serializable
import io.nekohasekai.sagernet.fmt.anytls.parseAnyTLS
import io.nekohasekai.sagernet.fmt.brook.parseBrook
import io.nekohasekai.sagernet.fmt.gson.gson
import io.nekohasekai.sagernet.fmt.http.parseHttp
Expand Down Expand Up @@ -178,6 +179,13 @@ fun parseProxies(text: String): List<AbstractBean> {
}.onFailure {
Logs.w(it)
}
} else if (startsWith("anytls://")) {
Logs.d("Try parse anytls link: $this")
runCatching {
entities.add(parseAnyTLS(this))
}.onFailure {
Logs.w(it)
}
}
}

Expand Down