Skip to content

update SFTP Driver from old jcraft JSch driver to new non-jcraft JSch Driver #836

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.

Sign up for GitHub

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

Open
davidhay wants to merge 1 commit into
base: dv5-demo
Choose a base branch
from
Open

update SFTP Driver from old jcraft JSch driver to new non-jcraft JSch Driver #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .../src/test/java/org/datavaultplatform/broker/services/UserKeyPairServiceOpenSSH8pt8IT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import org.testcontainers.utility.DockerImageName;

/**
* This test that we CANNOT use an 'ssh-rsa' KeyPair get make an SSH/SFTP connection
* to a server running OpenSSH 8.8
* This test that we CAN use an 'ssh-rsa' KeyPair get make an SSH/SFTP connection
* to a server running OpenSSH 8.8 when we use NEW (non-jcraft) JSCH !!!
*/
@Slf4j
public class UserKeyPairServiceOpenSSH8pt8IT extends BaseUserKeyPairServiceOpenSSHTest {
Expand All @@ -19,7 +19,7 @@ public DockerImageName getDockerImageForOpenSSH() {

@Override
public boolean isSuccessExpected() {
return false;
return true;
}

}
2 changes: 1 addition & 1 deletion .../test/java/org/datavaultplatform/common/storage/BaseSFTPFileSystemUsernamePasswordIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public abstract class BaseSFTPFileSystemUsernamePasswordIT extends BaseSFTPFileS

static GenericContainer<?> initialiseContainer(String tcName) {

return new GenericContainer<>(DockerImage.OPEN_SSH_9pt0_IMAGE_NAME)
return new GenericContainer<>(DockerImage.OPEN_SSH_9pt7_IMAGE_NAME)
.withEnv("TC_NAME", tcName)
.withEnv(ENV_USER_NAME, TEST_USER)
.withEnv(ENV_PASSWORD, TEST_PASSWORD)
Expand Down
2 changes: 1 addition & 1 deletion datavault-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
</dependency>

<dependency>
<groupId>com.jcraft</groupId>
<groupId>com.github.mwiede</groupId>
<artifactId>jsch</artifactId>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions datavault-common/src/test/java/org/datavaultplatform/common/docker/DockerImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ public abstract class DockerImage {
// https://hub.docker.com/r/linuxserver/openssh-server/tags
public static final String OPEN_SSH_8pt6_IMAGE_NAME = "linuxserver/openssh-server:version-8.6_p1-r3";

//8.8 is when they removed sha-1 signature of ssh-rsa keys - causing problems with JSch
//8.8 is when they removed sha-1 signature of ssh-rsa keys - causing problems with 'OLD' (jcraft) JSch 0.1.55 Sftp Driver
public static final String OPEN_SSH_8pt8_IMAGE_NAME = "linuxserver/openssh-server:version-8.8_p1-r1";

public static final String OPEN_SSH_9pt0_IMAGE_NAME = "linuxserver/openssh-server:version-9.0_p1-r2";
public static final String OPEN_SSH_9pt7_IMAGE_NAME = "linuxserver/openssh-server:version-9.7_p1-r4";

public static final String OPEN_SSH_IMAGE_NAME = OPEN_SSH_8pt8_IMAGE_NAME;
public static final DockerImageName OPEN_SSH_IMAGE = parse(OPEN_SSH_IMAGE_NAME);
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@
<!-- https://mvnrepository.com/artifact/net.sf.supercsv/super-csv -->
<super.csv.version>2.4.0</super.csv.version>

<!-- https://mvnrepository.com/artifact/com.jcraft/jsch -->
<jcraft.jsch.version>0.1.55</jcraft.jsch.version>
<!-- https://mvnrepository.com/artifact/com.github.mwiede/jsch -->
<jsch.version>0.2.18</jsch.version>

<!-- https://mvnrepository.com/artifact/gov.loc/bagit -->
<bagit.version>5.2.0</bagit.version>
Expand Down Expand Up @@ -284,9 +284,9 @@
<version>${apache.directory.api.version}</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<groupId>com.github.mwiede</groupId>
<artifactId>jsch</artifactId>
<version>${jcraft.jsch.version}</version>
<version>${jsch.version}</version>
</dependency>
<dependency>
<groupId>net.sf.supercsv</groupId>
Expand Down