gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-02 07:53:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2005 from gitbutlerapp/refactor-ssh-key-path

Browse Source 
Refactor ssh key path
This commit is contained in:
Nikita Galaiko 2023-12-12 14:27:30 +01:00 committed by GitHub
commit 1864105915
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/tauri/src/git/credentials.rs
View File

@ -37,6 +37,8 @@ impl From<Credential> for git2::RemoteCallbacks<'_> {
passphrase, passphrase,
}) => { }) => {
remote_callbacks.credentials(move |url, _username_from_url, _allowed_types| { remote_callbacks.credentials(move |url, _username_from_url, _allowed_types| {
use resolve_path::PathResolveExt;
let key_path = key_path.resolve();
tracing::info!( tracing::info!(
"authenticating with {} using key {}", "authenticating with {} using key {}",
url, url,
@ -172,9 +174,7 @@ impl Helper {
flow.push(( flow.push((
ssh_remote, ssh_remote,
vec![Credential::Ssh(SshCredential::Keyfile { vec![Credential::Ssh(SshCredential::Keyfile {
key_path: private_key_path key_path: private_key_path.clone(),
.canonicalize()
.unwrap_or(private_key_path.clone()),
passphrase: passphrase.clone(), passphrase: passphrase.clone(),
})], })],
)); ));
@ -257,9 +257,7 @@ impl Helper {
return Ok(vec![( return Ok(vec![(
ssh_remote, ssh_remote,
vec![Credential::Ssh(SshCredential::Keyfile { vec![Credential::Ssh(SshCredential::Keyfile {
key_path: private_key_path key_path: private_key_path.clone(),
.canonicalize()
.unwrap_or(private_key_path.clone()),
passphrase: passphrase.clone(), passphrase: passphrase.clone(),
})], })],
)]); )]);
@ -407,7 +405,6 @@ impl Helper {
let mut flow = vec![]; let mut flow = vec![];
if let Some(home_path) = self.home_dir.as_ref() { if let Some(home_path) = self.home_dir.as_ref() {
let id_rsa_path = home_path.join(".ssh").join("id_rsa"); let id_rsa_path = home_path.join(".ssh").join("id_rsa");
let id_rsa_path = id_rsa_path.canonicalize().unwrap_or(id_rsa_path);
if id_rsa_path.exists() { if id_rsa_path.exists() {
flow.push(SshCredential::Keyfile { flow.push(SshCredential::Keyfile {
key_path: id_rsa_path.clone(), key_path: id_rsa_path.clone(),
@ -416,7 +413,6 @@ impl Helper {
} }
let id_ed25519_path = home_path.join(".ssh").join("id_ed25519"); let id_ed25519_path = home_path.join(".ssh").join("id_ed25519");
let id_ed25519_path = id_ed25519_path.canonicalize().unwrap_or(id_ed25519_path);
if id_ed25519_path.exists() { if id_ed25519_path.exists() {
flow.push(SshCredential::Keyfile { flow.push(SshCredential::Keyfile {
key_path: id_ed25519_path.clone(), key_path: id_ed25519_path.clone(),
@ -425,7 +421,6 @@ impl Helper {
} }
let id_ecdsa_path = home_path.join(".ssh").join("id_ecdsa"); let id_ecdsa_path = home_path.join(".ssh").join("id_ecdsa");
let id_ecdsa_path = id_ecdsa_path.canonicalize().unwrap_or(id_ecdsa_path);
if id_ecdsa_path.exists() { if id_ecdsa_path.exists() {
flow.push(SshCredential::Keyfile { flow.push(SshCredential::Keyfile {
key_path: id_ecdsa_path.clone(), key_path: id_ecdsa_path.clone(),