Skip to content
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.

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

GUACAMOLE-1290: Add SFTP support for public keys and correct SSH protocol issue. #538

Merged
merged 2 commits into from
Aug 27, 2024

Conversation

necouchman
Copy link
Contributor

This pull request fixes up a couple of issues with public key imports for SSH/SFTP connections:

  • Adds the required parameters so that public keys can be used for SFTP connections in addition to SSH connections.
  • Moves the code that checks for the presence of the public key inside the block that checks for private key authentication. I'm still a little fuzzy on the purpose of importing a public key, but, if I understand the libssh2 functions correctly, there's no time that you'd want to try to import or use a public key if you weren't also authenticating with a private key. The code, as merged before, imported the public key regardless of whether a private key was present, and the if/else logic use also messed up the detection between public key and password-based authentication.

Copy link
Contributor

@mike-jumper mike-jumper left a comment

Choose a reason for hiding this comment

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

LGTM - just some borked indentation.

src/protocols/rdp/rdp.c Outdated Show resolved Hide resolved
src/protocols/ssh/ssh.c Outdated Show resolved Hide resolved
src/protocols/vnc/vnc.c Outdated Show resolved Hide resolved
@mike-jumper mike-jumper merged commit 68f1181 into apache:staging/1.6.0 Aug 27, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants