Skip to content

fix: ssh username resolution#298

Merged
ellie merged 1 commit intomainfrom
ellie/fix-ssh-username-resolution
Dec 10, 2025
Merged

fix: ssh username resolution#298
ellie merged 1 commit intomainfrom
ellie/fix-ssh-username-resolution

Conversation

@ellie
Copy link
Copy Markdown
Member

@ellie ellie commented Dec 10, 2025

When the SSH config file specified a username, but the SSH block did not, we incorrectly prioritised the system username over the config file

@greptile-apps
Copy link
Copy Markdown
Contributor

greptile-apps bot commented Dec 10, 2025

Greptile Overview

Greptile Summary

Correctly prioritizes SSH config username over system username when SSH block doesn't specify a username.

  • Changed username resolution order from block username -> system username to block username -> SSH config username -> system username
  • Made resolve_ssh_config public in session.rs to enable early resolution in pool.rs
  • Updated references to pass &username instead of username after converting to owned String

Important Files Changed

File Analysis

Filename Score Overview
crates/atuin-desktop-runtime/src/ssh/pool.rs 5/5 Fixed username resolution priority: SSH config now correctly takes precedence over system username
crates/atuin-desktop-runtime/src/ssh/session.rs 5/5 Made resolve_ssh_config public to enable config resolution in pool

Copy link
Copy Markdown
Contributor

@greptile-apps greptile-apps bot left a comment

Choose a reason for hiding this comment

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

2 files reviewed, no comments

Edit Code Review Agent Settings | Greptile

@ellie ellie merged commit 6ab6bb0 into main Dec 10, 2025
8 checks passed
@ellie ellie deleted the ellie/fix-ssh-username-resolution branch December 10, 2025 19:35
@github-actions github-actions bot locked and limited conversation to collaborators Dec 10, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant