Skip to content

Support plain userinfo in ss URLs #3251

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.

Sign up for GitHub

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

Open
TurboTheTurtle wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −2
Open

Support plain userinfo in ss URLs #3251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions core/src/androidTest/java/com/github/shadowsocks/database/ProfileTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,18 @@ class ProfileTest {
Assert.assertEquals("ss://YmYtY2ZiOnRlc3Q@192.168.100.1:8888#example-server".toUri(),
results.single().toUri())
}

@Test
fun parsingPlainUserInfo() {
val results = Profile.findAllUrls(
"ss://2022-blake3-chacha20-poly1305:F6BY4IwbXB5Juobo2aofoJ6P86G%2FyBYJO3pJzcMIUOU%3D@1.2.3.4:8400")
.toList()
Assert.assertEquals(1, results.size)
results.single().also {
Assert.assertEquals("2022-blake3-chacha20-poly1305", it.method)
Assert.assertEquals("F6BY4IwbXB5Juobo2aofoJ6P86G/yBYJO3pJzcMIUOU=", it.password)
Assert.assertEquals("1.2.3.4", it.host)
Assert.assertEquals(8400, it.remotePort)
}
}
}
12 changes: 10 additions & 2 deletions core/src/main/java/com/github/shadowsocks/database/Profile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,15 @@ data class Profile(
private val userInfoPattern = "^(.+?):(.*)$".toRegex()
private val legacyPattern = "^(.+?):(.*)@(.+?):(\\d+?)$".toRegex()

private fun userInfoCandidates(uri: Uri) = sequence {
uri.userInfo?.also { userInfo ->
try {
yield(String(Base64.decode(userInfo, Base64.NO_PADDING or Base64.NO_WRAP or Base64.URL_SAFE)))
} catch (_: IllegalArgumentException) { }
yield(userInfo)
}
}

fun findAllUrls(data: CharSequence?, feature: Profile? = null) = pattern.findAll(data ?: "").map {
val uri = it.value.toUri()
try {
Expand All @@ -129,8 +138,7 @@ data class Profile(
null
}
} else {
val match = userInfoPattern.matchEntire(String(Base64.decode(uri.userInfo,
Base64.NO_PADDING or Base64.NO_WRAP or Base64.URL_SAFE)))
val match = userInfoCandidates(uri).mapNotNull(userInfoPattern::matchEntire).firstOrNull()
if (match != null) {
val profile = Profile()
feature?.copyFeatureSettingsTo(profile)
Expand Down