kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Use absolute paths for custom ports, relative for default port

Browse source
This commit is contained in:
Fabian Henneke 2020-05-14 10:06:36 +02:00 committed by Fabian Henneke
parent 42981cd52b
commit f806438f2c
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt
View file

@ -95,24 +95,29 @@ abstract class BaseGitActivity : AppCompatActivity() {
val previousUrl = url ?: "" val previousUrl = url ?: ""
// Whether we need the leading ssh:// depends on the use of a custom port. // Whether we need the leading ssh:// depends on the use of a custom port.
val hostnamePart = serverHostname.removePrefix("ssh://") val hostnamePart = serverHostname.removePrefix("ssh://")
// We only support relative paths and trim everything scheme-specific.
val pathPart = serverPath.trimStart('/', ':')
val newUrl = when (protocol) { val newUrl = when (protocol) {
Protocol.Ssh -> { Protocol.Ssh -> {
val userPart = if (serverUser.isEmpty()) "" else "${serverUser.trimEnd('@')}@" val userPart = if (serverUser.isEmpty()) "" else "${serverUser.trimEnd('@')}@"
val portPart = val portPart =
if (serverPort == "22" || serverPort.isEmpty()) "" else ":$serverPort" if (serverPort == "22" || serverPort.isEmpty()) "" else ":$serverPort"
if (portPart.isEmpty()) { if (portPart.isEmpty()) {
// We only support relative paths with the standard port.
val pathPart = serverPath.trimStart('/', ':')
"$userPart$hostnamePart:$pathPart" "$userPart$hostnamePart:$pathPart"
} else { } else {
// We only support absolute paths with custom ports.
if (!serverPath.startsWith('/'))
return false
val pathPart = serverPath
// We have to specify the ssh scheme as this is the only way to pass a custom // We have to specify the ssh scheme as this is the only way to pass a custom
// port. // port.
"ssh://$userPart$hostnamePart$portPart/$pathPart" "ssh://$userPart$hostnamePart$portPart$pathPart"
} }
} }
Protocol.Https -> { Protocol.Https -> {
val portPart = val portPart =
if (serverPort == "443" || serverPort.isEmpty()) "" else ":$serverPort" if (serverPort == "443" || serverPort.isEmpty()) "" else ":$serverPort"
val pathPart = serverPath.trimStart('/', ':')
val urlWithFreeEntryScheme = "$hostnamePart$portPart/$pathPart" val urlWithFreeEntryScheme = "$hostnamePart$portPart/$pathPart"
val url = when { val url = when {
urlWithFreeEntryScheme.startsWith("https://") -> urlWithFreeEntryScheme urlWithFreeEntryScheme.startsWith("https://") -> urlWithFreeEntryScheme