-
Notifications
You must be signed in to change notification settings - Fork 124
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#457 address CVE-2023-48795 by adding support for new strict key exch…
…ange extension.
- Loading branch information
1 parent
533c437
commit 6214da9
Showing
5 changed files
with
219 additions
and
4 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * Copyright (c) 2002-2018 ymnk, JCraft,Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without modification, are permitted | ||
| * provided that the following conditions are met: | ||
| * | ||
| * 1. Redistributions of source code must retain the above copyright notice, this list of conditions | ||
| * and the following disclaimer. | ||
| * | ||
| * 2. Redistributions in binary form must reproduce the above copyright notice, this list of | ||
| * conditions and the following disclaimer in the documentation and/or other materials provided with | ||
| * the distribution. | ||
| * | ||
| * 3. The names of the authors may not be used to endorse or promote products derived from this | ||
| * software without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| * DISCLAIMED. IN NO EVENT SHALL JCRAFT, INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY | ||
| * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR | ||
| * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| package com.jcraft.jsch; | ||
|
|
||
| public class JSchStrictKexException extends JSchException { | ||
| private static final long serialVersionUID = -1L; | ||
|
|
||
| JSchStrictKexException() { | ||
| super(); | ||
| } | ||
|
|
||
| JSchStrictKexException(String s) { | ||
| super(s); | ||
| } | ||
| } |
This file contains 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
This file contains 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
91 changes: 91 additions & 0 deletions
91
src/test/java/com/jcraft/jsch/JSchStrictKexExceptionIT.java
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| package com.jcraft.jsch; | ||
|
|
||
| import static java.nio.charset.StandardCharsets.UTF_8; | ||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
|
|
||
| import java.nio.file.Files; | ||
| import java.nio.file.Paths; | ||
| import java.util.Base64; | ||
| import java.util.List; | ||
| import java.util.Locale; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.testcontainers.containers.GenericContainer; | ||
| import org.testcontainers.images.builder.ImageFromDockerfile; | ||
| import org.testcontainers.junit.jupiter.Container; | ||
| import org.testcontainers.junit.jupiter.Testcontainers; | ||
|
|
||
| @Testcontainers | ||
| public class JSchStrictKexExceptionIT { | ||
|
|
||
| private static final int timeout = 2000; | ||
|
|
||
| @Container | ||
| public GenericContainer<?> sshd = new GenericContainer<>( | ||
| new ImageFromDockerfile().withFileFromClasspath("ssh_host_rsa_key", "docker/ssh_host_rsa_key") | ||
| .withFileFromClasspath("ssh_host_rsa_key.pub", "docker/ssh_host_rsa_key.pub") | ||
| .withFileFromClasspath("ssh_host_ecdsa256_key", "docker/ssh_host_ecdsa256_key") | ||
| .withFileFromClasspath("ssh_host_ecdsa256_key.pub", "docker/ssh_host_ecdsa256_key.pub") | ||
| .withFileFromClasspath("ssh_host_ecdsa384_key", "docker/ssh_host_ecdsa384_key") | ||
| .withFileFromClasspath("ssh_host_ecdsa384_key.pub", "docker/ssh_host_ecdsa384_key.pub") | ||
| .withFileFromClasspath("ssh_host_ecdsa521_key", "docker/ssh_host_ecdsa521_key") | ||
| .withFileFromClasspath("ssh_host_ecdsa521_key.pub", "docker/ssh_host_ecdsa521_key.pub") | ||
| .withFileFromClasspath("ssh_host_ed25519_key", "docker/ssh_host_ed25519_key") | ||
| .withFileFromClasspath("ssh_host_ed25519_key.pub", "docker/ssh_host_ed25519_key.pub") | ||
| .withFileFromClasspath("ssh_host_dsa_key", "docker/ssh_host_dsa_key") | ||
| .withFileFromClasspath("ssh_host_dsa_key.pub", "docker/ssh_host_dsa_key.pub") | ||
| .withFileFromClasspath("sshd_config", "docker/sshd_config") | ||
| .withFileFromClasspath("authorized_keys", "docker/authorized_keys") | ||
| .withFileFromClasspath("Dockerfile", "docker/Dockerfile")) | ||
| .withExposedPorts(22); | ||
|
|
||
| @Test | ||
| public void testEnableStrictKexRequireStrictKex() throws Exception { | ||
| JSch ssh = createRSAIdentity(); | ||
| Session session = createSession(ssh); | ||
| session.setConfig("enable_strict_kex", "yes"); | ||
| session.setConfig("require_strict_kex", "yes"); | ||
| session.setTimeout(timeout); | ||
|
|
||
| assertThrows(JSchStrictKexException.class, session::connect, | ||
| "Strict KEX not supported by server"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testNoEnableStrictKexRequireStrictKex() throws Exception { | ||
| JSch ssh = createRSAIdentity(); | ||
| Session session = createSession(ssh); | ||
| session.setConfig("enable_strict_kex", "no"); | ||
| session.setConfig("require_strict_kex", "yes"); | ||
| session.setTimeout(timeout); | ||
|
|
||
| assertThrows(JSchStrictKexException.class, session::connect, | ||
| "Strict KEX not supported by server"); | ||
| } | ||
|
|
||
| private JSch createRSAIdentity() throws Exception { | ||
| HostKey hostKey = readHostKey(getResourceFile("docker/ssh_host_rsa_key.pub")); | ||
| JSch ssh = new JSch(); | ||
| ssh.addIdentity(getResourceFile("docker/id_rsa"), getResourceFile("docker/id_rsa.pub"), null); | ||
| ssh.getHostKeyRepository().add(hostKey, null); | ||
| return ssh; | ||
| } | ||
|
|
||
| private HostKey readHostKey(String fileName) throws Exception { | ||
| List<String> lines = Files.readAllLines(Paths.get(fileName), UTF_8); | ||
| String[] split = lines.get(0).split("\\s+"); | ||
| String hostname = | ||
| String.format(Locale.ROOT, "[%s]:%d", sshd.getHost(), sshd.getFirstMappedPort()); | ||
| return new HostKey(hostname, Base64.getDecoder().decode(split[1])); | ||
| } | ||
|
|
||
| private Session createSession(JSch ssh) throws Exception { | ||
| Session session = ssh.getSession("root", sshd.getHost(), sshd.getFirstMappedPort()); | ||
| session.setConfig("StrictHostKeyChecking", "yes"); | ||
| session.setConfig("PreferredAuthentications", "publickey"); | ||
| return session; | ||
| } | ||
|
|
||
| private String getResourceFile(String fileName) { | ||
| return ResourceUtil.getResourceFile(getClass(), fileName); | ||
| } | ||
| } |