-
Notifications
You must be signed in to change notification settings - Fork 707
[JENKINS-76058] Fix OpenSSH Certificate Hostkey handling + Improve verifier #1141
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
Changes from 2 commits
7c9cc4e
f486f9e
d3dfff0
1ae9cf0
b903597
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,8 @@ | |
| import java.security.spec.RSAPublicKeySpec; | ||
| import java.security.spec.X509EncodedKeySpec; | ||
| import org.apache.sshd.common.config.keys.KeyUtils; | ||
| import org.apache.sshd.common.digest.BuiltinDigests; | ||
| import org.apache.sshd.common.util.buffer.BufferUtils; | ||
| import org.bouncycastle.asn1.ASN1BitString; | ||
| import org.bouncycastle.asn1.pkcs.PrivateKeyInfo; | ||
| import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; | ||
|
|
@@ -152,4 +154,28 @@ | |
| Properties.removeThreadOverride(Properties.EMULATE_ORACLE); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Computes the MD5 fingerprint of the given server public key. | ||
| * The fingerprint is formatted as a colon-separated hexadecimal string. | ||
| * | ||
| * @param serverKey The server's {@link PublicKey} object for which the fingerprint needs to be computed. | ||
| * @return A {@code String} representing the MD5 fingerprint of the given server key in | ||
| * colon-separated hexadecimal format, or an empty string if an error occurs during computation. | ||
| */ | ||
| public static String getFingerprint(@NonNull PublicKey serverKey) { | ||
| // Emulate Oracle so that the algorithm returned by | ||
| // org.bouncycastle.jcajce.provider.asymmetric.edec.BCEdDSAPublicKey.getAlgorithm | ||
| // is the one expected by org.apache.sshd.common.config.keys.KeyUtils | ||
| try { | ||
| 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(); | ||
|
||
| } catch (Exception e) { | ||
| return ""; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is some exception expected here? Seems like it should at least log a warning.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not expected. It all goes does to implementation of Digest / decoder I guess. |
||
| } finally { | ||
| Properties.removeThreadOverride(Properties.EMULATE_ORACLE); | ||
| } | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package hudson.plugins.ec2.ssh; | ||
|
|
||
| import hudson.model.TaskListener; | ||
| import hudson.plugins.ec2.HostKeyVerificationStrategyEnum; | ||
| import hudson.plugins.ec2.MockEC2Computer; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.List; | ||
| import org.apache.sshd.common.config.keys.PublicKeyEntry; | ||
| import org.junit.Assert; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.jvnet.hudson.test.JenkinsRule; | ||
|
|
||
| public class EC2SSHLauncherTest { | ||
|
|
||
| @Rule | ||
| public JenkinsRule r = new JenkinsRule(); | ||
|
|
||
| @Test | ||
| public void testServerKeyVerifier() throws Exception { | ||
| for (String publicKeyFile : List.of( | ||
| "ssh_host_dss_1024.pub", | ||
| "ssh_host_rsa_1024.pub", | ||
| "ssh_host_rsa_2048.pub", | ||
| "ssh_host_rsa_3072.pub", | ||
| "ssh_host_rsa_4096.pub", | ||
| // Special case of Open SSH Certificate | ||
| // ssh-keygen -t rsa -b 2048 -f ./ssh_host_rsa -N "" | ||
| // ssh-keygen -s ./ssh_host_rsa -I ec2SshLauncherTest -h -n localhost -V +0s:+999999999s | ||
| // ./ssh_host_rsa.pub | ||
| "ssh_host_rsa-cert.pub")) { | ||
|
|
||
| String sshHostKeyPath = Files.readString(Path.of(getClass() | ||
| .getClassLoader() | ||
| .getResource("hudson/plugins/ec2/ssh/" + publicKeyFile) | ||
| .getPath())) | ||
| .trim(); | ||
|
|
||
| MockEC2Computer computer = MockEC2Computer.createComputer(publicKeyFile); | ||
| r.jenkins.addNode(computer.getNode()); | ||
|
|
||
| computer.getSlaveTemplate().setHostKeyVerificationStrategy(HostKeyVerificationStrategyEnum.OFF); | ||
| Assert.assertTrue(new EC2SSHLauncher.ServerKeyVerifierImpl(computer, TaskListener.NULL) | ||
| .verifyServerKey( | ||
| null, | ||
| null, | ||
| PublicKeyEntry.parsePublicKeyEntry(sshHostKeyPath).resolvePublicKey(null, null, null))); | ||
| computer.getSlaveTemplate().setHostKeyVerificationStrategy(HostKeyVerificationStrategyEnum.ACCEPT_NEW); | ||
| Assert.assertTrue(new EC2SSHLauncher.ServerKeyVerifierImpl(computer, TaskListener.NULL) | ||
| .verifyServerKey( | ||
| null, | ||
| null, | ||
| PublicKeyEntry.parsePublicKeyEntry(sshHostKeyPath).resolvePublicKey(null, null, null))); | ||
|
|
||
| r.jenkins.removeNode(computer.getNode()); | ||
| } | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ssh-dss AAAAB3NzaC1kc3MAAACBAMsQrriFgun2KVgmsGd8drsplZLXyU8uU6r90aIZ+evRpxvoLCJf317Wnu5qVBCzGgEZ8iygYB0bDB/JFch+UVgtyXGH358ClJCDDgNWdOSogTl2gCF+W+8KoRSF+i3ObnEPOTa2akByP5FDzOO+mruVPl8kg8NHYcadCtJizRjhAAAAFQCV9uGT1Mchfbm6uFxEmZf09DwjSQAAAIAyyLw64QIHel17rzdyMyvepkvW4q64WYb7xCVLffaYJA8x1pxHtH4Mmmm0fGG7GFgdnCeD95524CYZR7TDhzKFGcEX607qKg0v5sXs6z8U8lGOeARq/IXQphb7YPZ9PdKUIuJImQEXriI0p5G7aGMmSYjnyEpKhUsM12xpDb2qBAAAAIBbIZPuZzBbbeesmzmGoG63w0tFc+tpPV3lNkAeYYcWpVhpSdHGFatr1lU+8LNT6OXekV2CFyF5kuuYw/B3OFkmHasURnT1+yC49OEpSzA3KOtQzqO2BZqIxDG/IEajKtSPGOWWPaVrHdgDXo3EZ6yCJtCiOMxW5Xz3fiUufp1sdQ== |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| -----BEGIN OPENSSH PRIVATE KEY----- | ||
| b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn | ||
| NhAAAAAwEAAQAAAQEA1qUcUNNcGnZTvneThb9U4nqQdQ0EGc9cJv+W9lUhF7ph2jy2DeYs | ||
| HakQHX/nH5CgBFyvUlD7QGAqPC3/65X3h4QWSGH1kEWMq93F9cm33v0b31YPc/qbnw2Ns9 | ||
| M5yxIz7kd0a5Li0OkUi7ENhgm+jpmYwGw1VE+lMDxUqtpgAYMEcrESzfORR80W/9+iS8PU | ||
| peqdbVSWltD+Ze0TeY8UYWtiCqBUnkQ6nqp02Zrfzw4jcQCYRUvWT09b9AfU7nxzUAGGdS | ||
| fzdoNicus5QuLO3HIeLfvXM1Ln2KVGuylys1TVcLboc9srL6VNm/Vrc/wYGnQEkKz6G/NR | ||
| 2NbjZNz79wAAA9i8l634vJet+AAAAAdzc2gtcnNhAAABAQDWpRxQ01wadlO+d5OFv1Tiep | ||
| B1DQQZz1wm/5b2VSEXumHaPLYN5iwdqRAdf+cfkKAEXK9SUPtAYCo8Lf/rlfeHhBZIYfWQ | ||
| RYyr3cX1ybfe/RvfVg9z+pufDY2z0znLEjPuR3RrkuLQ6RSLsQ2GCb6OmZjAbDVUT6UwPF | ||
| Sq2mABgwRysRLN85FHzRb/36JLw9Sl6p1tVJaW0P5l7RN5jxRha2IKoFSeRDqeqnTZmt/P | ||
| DiNxAJhFS9ZPT1v0B9TufHNQAYZ1J/N2g2Jy6zlC4s7cch4t+9czUufYpUa7KXKzVNVwtu | ||
| hz2ysvpU2b9Wtz/BgadASQrPob81HY1uNk3Pv3AAAAAwEAAQAAAQBcwLybsLn8NWW6yLFW | ||
| +ncT5yLFcfpzrMeFkq0JhX/nYQMn61RAbVZi+sub88lMOpLrT6HzUEtCZkvZ9YbBpuxwAw | ||
| QeAza6QVOocQ06SRDLq1SADhBfbcwRzymMq5otxo/qR7ZnRfH9lLrsInZVlaBivrzjad8h | ||
| r8kSLv/nVLZn8Arsc7c0s9vPH4EXLJKYMT2Y9DMGTJzIRHxTgPG09DZkxpSNTzlLY8VZ/t | ||
| FdMGNG9IHRhMiDw1QNlSZ0VAouwb0zZAPuPNBHG4zqmCUV1Da+jG82vEwgmoQ5KTJQmq56 | ||
| Ao774XgksdCIPb4nM6MhvbU1mAhA97eQOUvsn8haMUYBAAAAgBqfqx+cKzAVHJsOk9ZMHh | ||
| YuJjxHbw8fbGTXzIvxTHfVWsQpBf+oziVgT9sBSDaX0Nis0AVNQWyMWxg9OHqJigkRKfJV | ||
| 8/mqbtnBdjvKdUvDxQ6Pl2MZU6mD9OG9SglWs4LboAksQQUfK9+k5BiAPAuhycpBQQsmzV | ||
| m/13NC14P5AAAAgQD4dYj0++uyRaZt4JJALnyMPYwAVgNDTB5TBK58aF/9PKzQ++fIypF1 | ||
| Wq8NQnzkshq3TFIyTuo8rrdtj2xGJ6TLg5AeXk11aKDkW0asqTL8FxrHIG9eYAoDHFjD8u | ||
| wQlqdGNR29FlozpEFiehI56+4qdNqrhJRToSlK6hS1Ho5lPwAAAIEA3SjZHSpyK+0Ttjk2 | ||
| cWcBqYI+G4zDRKPHvos2cY3Ny2taQHY+apwvlPp4jc84ArZV+5CEgjuyqx6hS712QYR+Kh | ||
| D86TnZDzrnOqNP8SNwEj1bjfwWtwuhp4XLrxiJwfYNOZ/TIXl49wUKxFN69ugVPeNh1Axi | ||
| xRHsMfrNRcJ1o0kAAAAjYWJ1cmRhamV3aWN6QE1hYy1hYnVyZGFqZXdpY3oubG9jYWw= | ||
| -----END OPENSSH PRIVATE KEY----- |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| [email protected] AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgdf6SSoXZeQwvZdumu/h7cd5umrlltC4dhhIWCLMGfy0AAAADAQABAAABAQDWpRxQ01wadlO+d5OFv1TiepB1DQQZz1wm/5b2VSEXumHaPLYN5iwdqRAdf+cfkKAEXK9SUPtAYCo8Lf/rlfeHhBZIYfWQRYyr3cX1ybfe/RvfVg9z+pufDY2z0znLEjPuR3RrkuLQ6RSLsQ2GCb6OmZjAbDVUT6UwPFSq2mABgwRysRLN85FHzRb/36JLw9Sl6p1tVJaW0P5l7RN5jxRha2IKoFSeRDqeqnTZmt/PDiNxAJhFS9ZPT1v0B9TufHNQAYZ1J/N2g2Jy6zlC4s7cch4t+9czUufYpUa7KXKzVNVwtuhz2ysvpU2b9Wtz/BgadASQrPob81HY1uNk3Pv3AAAAAAAAAAAAAAACAAAAEmVjMlNzaExhdW5jaGVyVGVzdAAAAA0AAAAJbG9jYWxob3N0AAAAAGi4HYoAAAAApFLniQAAAAAAAAAAAAAAAAAAARcAAAAHc3NoLXJzYQAAAAMBAAEAAAEBANalHFDTXBp2U753k4W/VOJ6kHUNBBnPXCb/lvZVIRe6Ydo8tg3mLB2pEB1/5x+QoARcr1JQ+0BgKjwt/+uV94eEFkhh9ZBFjKvdxfXJt979G99WD3P6m58NjbPTOcsSM+5HdGuS4tDpFIuxDYYJvo6ZmMBsNVRPpTA8VKraYAGDBHKxEs3zkUfNFv/fokvD1KXqnW1UlpbQ/mXtE3mPFGFrYgqgVJ5EOp6qdNma388OI3EAmEVL1k9PW/QH1O58c1ABhnUn83aDYnLrOULiztxyHi371zNS59ilRrspcrNU1XC26HPbKy+lTZv1a3P8GBp0BJCs+hvzUdjW42Tc+/cAAAEUAAAADHJzYS1zaGEyLTUxMgAAAQBDgCn5bPxMkYlpNK4EML4kxP2BxiHeMYze3RwpMpIzlbd3nLY8FP5kbdVa/OjQmyxonkus3eyOVePaOZE2Vir4wAxxF9EvTQshaPJ/MXkUPhIFfA1wocgxwNldrS/phrvGMqB18Y6dnw6hxMwsSl5hBEPFiDw3FY6X5o1LnUSrfHy4Ax5HBYouDKCgd6EQ8DYakPzvjunMSoD6rAFPYHpOCFkbXJjcLlnB5/ec38g8mJp43w4hdyf2Vg8Lh594tfD9fLvUxuCgZ6lqDGouetVHGNAKHTpEdbb6DZLk9gmyx8PbrX2uSY+Hm+vDhk6c05KPtsI5bc1o1wNax8Wh/6ru publickeycert |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWpRxQ01wadlO+d5OFv1TiepB1DQQZz1wm/5b2VSEXumHaPLYN5iwdqRAdf+cfkKAEXK9SUPtAYCo8Lf/rlfeHhBZIYfWQRYyr3cX1ybfe/RvfVg9z+pufDY2z0znLEjPuR3RrkuLQ6RSLsQ2GCb6OmZjAbDVUT6UwPFSq2mABgwRysRLN85FHzRb/36JLw9Sl6p1tVJaW0P5l7RN5jxRha2IKoFSeRDqeqnTZmt/PDiNxAJhFS9ZPT1v0B9TufHNQAYZ1J/N2g2Jy6zlC4s7cch4t+9czUufYpUa7KXKzVNVwtuhz2ysvpU2b9Wtz/BgadASQrPob81HY1uNk3Pv3 publickey |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQC8nIRjuQr9gGfGTdq7BL4l3s4n4qEe3w7imhv1cT5cy2HT7DXvnA2gGVmFn4izbWlFlQG1lrtMgIiiwXH/shRx+2FnqayNsOmRJ37TiA0ICjkOrdR4JaYWRafQ0TEC0+EdHl+3iJYOhw9scFpJ2M9kB6W5HJsf4gmXoGGz8SsfsQ== |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCjw8Wgl1usvj9LCzF1c8PufEIG11V2PHCDNlYc66ccIiojQX79st1Lbp0BJXsa2bvZLYjfqyYP5gqkX7jLslmXPN+Vew91sRTmXJTlANlm/fChHg+Fq+lQK0IKGBIn9RlPDFH+NNoUIw4LbZ4etRJuOfMwiVKsOVOYuuLjiIJTkda9eS9zrhTRUXhUuMIxBLdeJEAYve6oBpcnTKpUbTV+DYlru3Yh6lSIevhA361s65oJauNHFQLQ7Ysi9apiF5hmqt1sThv/NPM/xLwlPrSGqKZWnclJbBKaWFlCijuM7W3Q5zbcdmtvKhxEJMobu+KMbt/LVhV7kD3BBLhADKnZ |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDzvqmjwxE3UgKOVZDoji9npAu7Uee47sdS60cTN0yx3Aj+c5IznoBLDYt7HwUcjKoj6soRJALFMGvrKe6n4H1+9jF5vrstMB40Ga8858wweehIAEzw/ONAORZdHA2y0WG8K3+bNOVSeXZwASsjbKrYcdotsZarhQtGVks6xQwd7qXUD44DDdFuWsuj5//hSSYSIgjJE3gAfeI2qVoe6Cl6gTGoK9zd+hNrYDehpN7bDgX45ulcaMw7N2kLf+Sg5QqOYL3Xdav/SeNEefNUyE058uRK8Br3WhZh5BJ2qFjzUYe20cFKHJ3gqKiY+8aor6YrDAS5AOEAEdCw1GWHJutGeApouTSqpNZf1uHspKEgLCUu6gb+i14k3YGSqUW/3fRdqmtN5qBYGvOoqgUEG1wlsxjf6lvJxSh6551MEiM3dpXBq3wniFjK56pj9nVjW0erJsOXPIqh9KeQL1dB+fzNX0r3oAog3EEl+x+V/YLE12b8MR9qnaZwyxWPGKoRE70= |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCvoE/zGFhSYP/aXLGYl27P+Bq5KJ0E53Er163GJRZ119kgPTB17JOKEG1k25tmspoNYVVaSIM81zBi4RUIrP7ft+1wj2FlsMchrEHlrqR31HCCsPmf/YGgzaBBgL2KDNHEsnxIzyZTsY4ZGPS4LZMP8McUXfwvOFkVs12AUNH5hrB0SgMv6sor1VyW43p6u1o1w9MX5omANopOv+Rqm7In0UXNmOocOhOFYqDJVKt05+fI+fduHIwO4Wi3e0K1jK1EmC9YlIJJIz0Ce1+CyGK0Cm7lHj+W2Ea5tERO0DsK/etGbn1w8NcW9XmPVzO4vSvsMm7XrL0hIdNQZKSxas4NNwxr0TZN70T+H3WKRK9VAxCEp5IdahsSevKyrcsRnKX3mcemqJZZ+ODAarPdHemNacywzoaEt2AOSOl1PcW/sA49R4yMYHj8RS6xDv9jeA4Vogj58ynqzaB2F4fCkaV4bmgb2vL0Fkw96Tvq0+Gs902zvtDmnneicCWhNnj+3jRKZjqiQRvA3/BgYrokFGcDra4j9C1vrDVajMitcY+dr0XeA+n9ot29GSx36Fwg3j3QUhamS6/nsKTeIdmEHeym7FT6LKweKL/XcUCs+tkaJFxsJ+S1E+vF2M7SmqkNuB0S17EijZtw01v1zbzocscnfpLXo3UEfBdIe7pjT/IGtw== |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should not be
serverKey.getAlgorithm()butsshAlgorithm. This is causing an issue https://issues.jenkins.io/browse/JENKINS-76077