Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2021-11-05 04:29:33 +01:00
parent fecb0dc6d8
commit e9bf65e854
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/kotlin/app/credentials/GRemoteSession.kt
View File

@ -1,24 +1,11 @@
package app.credentials package app.credentials
import org.apache.sshd.agent.SshAgent
import org.apache.sshd.agent.local.AgentImpl
import org.apache.sshd.agent.local.LocalAgentFactory
import org.apache.sshd.client.SshClient import org.apache.sshd.client.SshClient
import org.apache.sshd.client.auth.keyboard.UserAuthKeyboardInteractive
import org.apache.sshd.client.auth.keyboard.UserAuthKeyboardInteractiveFactory
import org.apache.sshd.client.auth.keyboard.UserInteraction
import org.apache.sshd.client.auth.password.PasswordAuthenticationReporter
import org.apache.sshd.client.auth.password.UserAuthPassword
import org.apache.sshd.client.future.ConnectFuture import org.apache.sshd.client.future.ConnectFuture
import org.apache.sshd.client.session.ClientSession import org.apache.sshd.client.session.ClientSession
import org.apache.sshd.common.NamedResource
import org.apache.sshd.common.config.keys.FilePasswordProvider import org.apache.sshd.common.config.keys.FilePasswordProvider
import org.apache.sshd.common.keyprovider.FileKeyPairProvider
import org.apache.sshd.common.session.SessionContext
import org.eclipse.jgit.transport.RemoteSession import org.eclipse.jgit.transport.RemoteSession
import org.eclipse.jgit.transport.URIish import org.eclipse.jgit.transport.URIish
import java.lang.Exception
import java.security.KeyPair
import java.time.Duration import java.time.Duration
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Provider import javax.inject.Provider
@ -74,8 +61,8 @@ class GRemoteSession @Inject constructor(
} else } else
uri.port uri.port
val filePasswordProvider = object : FilePasswordProvider { val filePasswordProvider =
override fun getPassword(session: SessionContext?, resourceKey: NamedResource?, retryIndex: Int): String? { FilePasswordProvider { session, resourceKey, retryIndex ->
credentialsStateManager.updateState(CredentialsState.SshCredentialsRequested) credentialsStateManager.updateState(CredentialsState.SshCredentialsRequested)
var credentials = credentialsStateManager.currentCredentialsState var credentials = credentialsStateManager.currentCredentialsState
@ -84,12 +71,11 @@ class GRemoteSession @Inject constructor(
credentials = credentialsStateManager.currentCredentialsState credentials = credentialsStateManager.currentCredentialsState
} }
return if(credentials !is CredentialsState.SshCredentialsAccepted) if(credentials !is CredentialsState.SshCredentialsAccepted)
null null
else else
credentials.password credentials.password
} }
}
client.filePasswordProvider = filePasswordProvider client.filePasswordProvider = filePasswordProvider