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

Validate hostname protocol before saving (#723)

Browse source 
* RFC: protocol validation

* Use java.net.URL for saner parsing

* Improve protocol correction; handle ssh://

Co-authored-by: Fabian Henneke <fabian@henneke.me>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2020-04-19 17:13:39 +05:30 • committed by GitHub
parent 7ce8831401
commit 99aa0d9bb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,8 @@ import com.zeapo.pwdstore.git.config.SshApiSessionFactory
import com.zeapo.pwdstore.utils.PasswordRepository import com.zeapo.pwdstore.utils.PasswordRepository
import com.zeapo.pwdstore.utils.getEncryptedPrefs import com.zeapo.pwdstore.utils.getEncryptedPrefs
import java.io.File import java.io.File
import java.net.MalformedURLException
import java.net.URL
import timber.log.Timber import timber.log.Timber
/** /**
@ -36,8 +38,8 @@ abstract class BaseGitActivity : AppCompatActivity() {
lateinit var serverPath: String lateinit var serverPath: String
lateinit var username: String lateinit var username: String
lateinit var email: String lateinit var email: String
var identityBuilder: SshApiSessionFactory.IdentityBuilder? = null private var identityBuilder: SshApiSessionFactory.IdentityBuilder? = null
var identity: SshApiSessionFactory.ApiIdentity? = null private var identity: SshApiSessionFactory.ApiIdentity? = null
lateinit var settings: SharedPreferences lateinit var settings: SharedPreferences
private set private set
private lateinit var encryptedSettings: SharedPreferences private lateinit var encryptedSettings: SharedPreferences
@ -97,12 +99,31 @@ abstract class BaseGitActivity : AppCompatActivity() {
val portPart = val portPart =
if (serverPort == "22" || serverPort.isEmpty()) "" else ":$serverPort" if (serverPort == "22" || serverPort.isEmpty()) "" else ":$serverPort"
// We have to specify the ssh scheme as this is the only way to pass a custom port. // We have to specify the ssh scheme as this is the only way to pass a custom port.
"ssh://$userPart$hostnamePart$portPart$pathPart" val urlWithFreeEntryScheme = "$userPart$hostnamePart$portPart$pathPart"
val parsedUrl = try {
URL(urlWithFreeEntryScheme)
} catch (_: MalformedURLException) {
return false
}
if (parsedUrl.protocol == null)
"ssh://$urlWithFreeEntryScheme"
else
urlWithFreeEntryScheme
} }
Protocol.Https -> { Protocol.Https -> {
val portPart = val portPart =
if (serverPort == "443" || serverPort.isEmpty()) "" else ":$serverPort" if (serverPort == "443" || serverPort.isEmpty()) "" else ":$serverPort"
"https://$hostnamePart$portPart$pathPart" val urlWithFreeEntryScheme = "$hostnamePart$portPart$pathPart"
val parsedUrl = try {
URL(urlWithFreeEntryScheme)
} catch (_: MalformedURLException) {
return false
}
when (parsedUrl.protocol) {
null -> "https://$urlWithFreeEntryScheme"
"http" -> urlWithFreeEntryScheme.replaceFirst("http:", "https:")
else -> urlWithFreeEntryScheme
}
} }
} }
if (PasswordRepository.isInitialized) if (PasswordRepository.isInitialized)