diff options
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt | 17 |
2 files changed, 18 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a8ad43b..461f7fb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Fixed + +- Delete stored HTTPS password on connection errors (such as failed authentication) + ## [1.11.2] - 2020-08-24 ### Fixed diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt index 62d6879c..dc768a6e 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt +++ b/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt @@ -51,7 +51,9 @@ abstract class GitOperation(gitDir: File, internal val callingActivity: Fragment protected val git = Git(repository) protected val remoteBranch = GitSettings.branch - private class PasswordFinderCredentialsProvider(private val passwordFinder: PasswordFinder) : CredentialsProvider() { + private class HttpsCredentialsProvider(private val passwordFinder: PasswordFinder) : CredentialsProvider() { + + private var cachedPassword: CharArray? = null override fun isInteractive() = true @@ -59,7 +61,11 @@ abstract class GitOperation(gitDir: File, internal val callingActivity: Fragment for (item in items) { when (item) { is CredentialItem.Username -> item.value = uri?.user - is CredentialItem.Password -> item.value = passwordFinder.reqPassword(null) + is CredentialItem.Password -> { + item.value = cachedPassword?.clone() ?: passwordFinder.reqPassword(null).also { + cachedPassword = it.clone() + } + } else -> UnsupportedCredentialItem(uri, item.javaClass.name) } } @@ -69,12 +75,17 @@ abstract class GitOperation(gitDir: File, internal val callingActivity: Fragment override fun supports(vararg items: CredentialItem) = items.all { it is CredentialItem.Username || it is CredentialItem.Password } + + override fun reset(uri: URIish?) { + cachedPassword?.fill(0.toChar()) + cachedPassword = null + } } private fun withPasswordAuthentication(passwordFinder: InteractivePasswordFinder): GitOperation { val sessionFactory = SshjSessionFactory(SshAuthData.Password(passwordFinder), hostKeyFile) SshSessionFactory.setInstance(sessionFactory) - this.provider = PasswordFinderCredentialsProvider(passwordFinder) + this.provider = HttpsCredentialsProvider(passwordFinder) return this } |