Skip to content

add support for external ssh signing #2198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seanaye wants to merge 5 commits into
base: master
Choose a base branch
from
Open

add support for external ssh signing #2198

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
99f5dfd
add support for external ssh signing
seanaye Apr 19, 2024
d069623
add test
seanaye Aug 31, 2024
40ae04b
update test
seanaye Aug 31, 2024
58c9ad3
update changelog
seanaye Aug 31, 2024
5d93628
remove dbg
seanaye Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update test
  • Loading branch information
@seanaye
seanaye committed Mar 6, 2025
commit 40ae04b346f745a2bd8cb31438901ceede12e7b8
24 changes: 12 additions & 12 deletions asyncgit/src/sync/sign.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ enum SSHProgram {

impl SSHProgram {
pub fn new(config: &git2::Config) -> Self {
match config.get_string("gpg.ssh.program") {
match dbg!(config.get_string("gpg.ssh.program")) {
Copy link
Contributor

@yanganto yanganto Sep 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need the debug code dbg! here?

Err(_) => Self::Default,
Ok(ssh_program) => {
if ssh_program.is_empty() {
Expand All @@ -189,13 +189,13 @@ impl SSHProgram {
config: &git2::Config,
) -> Result<Box<dyn Sign>, SignBuilderError> {
match self {
SSHProgram::Default => {
Self::Default => {
let ssh_signer = ConfigAccess(config)
.signing_key()
.and_then(SSHSign::new)?;
Ok(Box::new(ssh_signer))
}
SSHProgram::SystemBin(exec_path) => {
Self::SystemBin(exec_path) => {
let key = ConfigAccess(config).signing_key()?;
Ok(Box::new(ExternalBinSSHSign::new(exec_path, key)))
}
Expand Down Expand Up @@ -333,9 +333,10 @@ enum KeyPathOrLiteral {

impl KeyPathOrLiteral {
fn new(buf: PathBuf) -> Self {
match buf.is_file() {
true => KeyPathOrLiteral::KeyPath(buf),
false => KeyPathOrLiteral::Literal(buf),
if buf.is_file() {
Self::KeyPath(buf)
} else {
Self::Literal(buf)
}
}
}
Expand All @@ -346,8 +347,7 @@ impl Display for KeyPathOrLiteral {
f: &mut std::fmt::Formatter<'_>,
) -> std::fmt::Result {
let buf = match self {
Self::Literal(x) => x,
Self::KeyPath(x) => x,
Self::KeyPath(x) | Self::Literal(x) => x,
};
f.write_fmt(format_args!("{}", buf.display()))
}
Expand Down Expand Up @@ -378,7 +378,7 @@ impl ExternalBinSSHSign {
#[cfg(test)]
let signing_key = key_path.to_string();

ExternalBinSSHSign {
Self {
program_path,
key_path,
#[cfg(test)]
Expand Down Expand Up @@ -490,7 +490,7 @@ impl SSHSign {
})
} else {
Err(SignBuilderError::SSHSigningKey(
format!("Currently, we only support a pair of ssh key in disk. Found {:?}", key),
format!("Currently, we only support a pair of ssh key in disk. Found {key:?}"),
))
}
}
Expand Down Expand Up @@ -630,15 +630,15 @@ mod tests {

{
let mut config = repo.config()?;
config.set_str("gpg.program", "ssh")?;
config.set_str("gpg.format", "ssh")?;
config.set_str("user.signingKey", "/tmp/key.pub")?;
config.set_str("gpg.ssh.program", "/bin/cat")?;
}

let sign =
SignBuilder::from_gitconfig(&repo, &repo.config()?)?;

assert_eq!("/bin/cat", sign.program());
assert_eq!("cat", sign.program());
assert_eq!("/tmp/key.pub", sign.signing_key());

Ok(())
Expand Down