[JENKINS-76058] Fix OpenSSH Certificate Hostkey handling + Improve verifier #1141
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Dohbedoh
changed the title
Member
|
Required by jenkinsci/mina-sshd-api-plugin#177 IIUC. |
jglick
reviewed
Sep 4, 2025
| Properties.setThreadOverride(Properties.EMULATE_ORACLE, true); | ||
| // Generate MD5 fingerprint just like ssh-keygen | ||
| byte[] rawFingerprint = KeyUtils.getRawFingerprint(BuiltinDigests.md5.get(), serverKey); | ||
| return BufferUtils.toHex(':', rawFingerprint).toLowerCase(); |
Member
There was a problem hiding this comment.
Recommend Locale.ROOT as a general practice, though in this case I guess a hex string could not contain I.
jglick
reviewed
Sep 4, 2025
Comment on lines
175
to
176
| } catch (Exception e) { | ||
| return ""; |
Member
There was a problem hiding this comment.
Is some exception expected here? Seems like it should at least log a warning.
Contributor
Author
There was a problem hiding this comment.
Not expected. It all goes does to implementation of Digest / decoder I guess.
We can add a warning.
Contributor
Author
|
Thanks @jglick |
Dohbedoh
commented
Sep 10, 2025
| return null; | ||
| } | ||
| AsymmetricKeyParameter parameters = PublicKeyFactory.createKey(serverKey.getEncoded()); | ||
| return new HostKey(serverKey.getAlgorithm(), OpenSSHPublicKeyUtil.encodePublicKey(parameters)); |
Contributor
Author
There was a problem hiding this comment.
This should not be serverKey.getAlgorithm() but sshAlgorithm. This is causing an issue https://issues.jenkins.io/browse/JENKINS-76077
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
OpenSshCertificatepublic key handling. If the aPublicKeyof typeOpenSsfCertificateis passed by SSHD verifier, then we must unwrap thegetCertPubKeyfor host key verification. (see bugfix: fix cert auth failed bug apache/mina-sshd#660)PublicKeyto aHostKeyif necessary (that would prevent future problem related to Algorithm type handling when No Verification is selected).Testing done
Submitter checklist