Merge pull request #106 from neicnordic/feature/update-sshd2.6.0

.github/workflows/test.yml

@@ -14,14 +14,14 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Set up JDK 13
         uses: actions/setup-java@v1
         with:
           java-version: 13
 
-      - uses: actions/cache@v1
+      - uses: actions/cache@v2
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

pom.xml

@@ -26,9 +26,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>net.i2p.crypto</groupId>
-            <artifactId>eddsa</artifactId>
-            <version>0.3.0</version>
+            <groupId>org.c02e.jpgpj</groupId>
+            <artifactId>jpgpj</artifactId>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-sftp</artifactId>
-            <version>2.5.1</version>
+            <version>2.6.0</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -131,7 +131,7 @@
         </dependency>
         <dependency>
             <groupId>io.findify</groupId>
-            <artifactId>s3mock_2.12</artifactId>
+            <artifactId>s3mock_2.13</artifactId>
             <version>0.2.6</version>
             <scope>test</scope>
         </dependency>

src/main/java/se/nbis/lega/inbox/configuration/SFTPConfiguration.java

@@ -9,8 +9,8 @@
 import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
 import org.apache.sshd.server.auth.pubkey.UserAuthPublicKeyFactory;
 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
-import org.apache.sshd.server.subsystem.sftp.SftpEventListener;
-import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory;
+import org.apache.sshd.sftp.server.SftpEventListener;
+import org.apache.sshd.sftp.server.SftpSubsystemFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;

src/main/java/se/nbis/lega/inbox/pojo/KeyAlgorithm.java

@@ -5,6 +5,6 @@
  */
 public enum KeyAlgorithm {
 
-    RSA, DSS, ED25519
+    RSA, ED25519
 
 }

src/main/java/se/nbis/lega/inbox/s3/S3SftpEventListener.java

@@ -2,7 +2,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.sshd.server.session.ServerSession;
-import org.apache.sshd.server.subsystem.sftp.Handle;
+import org.apache.sshd.sftp.server.Handle;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;

src/main/java/se/nbis/lega/inbox/sftp/InboxSftpEventListener.java

@@ -7,9 +7,9 @@
 import org.apache.commons.io.FilenameUtils;
 import org.apache.http.entity.ContentType;
 import org.apache.sshd.server.session.ServerSession;
-import org.apache.sshd.server.subsystem.sftp.FileHandle;
-import org.apache.sshd.server.subsystem.sftp.Handle;
-import org.apache.sshd.server.subsystem.sftp.SftpEventListener;
+import org.apache.sshd.sftp.server.FileHandle;
+import org.apache.sshd.sftp.server.Handle;
+import org.apache.sshd.sftp.server.SftpEventListener;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -124,7 +124,7 @@ public void linked(ServerSession session, Path source, Path target, boolean symL
      */
     @Override
     public void modifiedAttributes(ServerSession session, Path path, Map<String, ?> attrs, Throwable thrown) {
-        log.info("User {} modified attributes of {}: ", session.getUsername(), path, attrs);
+        log.info("User {} modified attributes of {} {}: ", session.getUsername(), path, attrs);
     }
 
     /**

src/test/java/se/nbis/lega/inbox/sftp/InboxAuthenticatorTest.java

@@ -81,15 +81,6 @@ public void authenticatePublicKeyRSA() throws IOException, URISyntaxException {
         assertNotNull(ssh.newSFTPClient());
     }
 
-    @Test
-    public void authenticatePublicKeyDSS() throws IOException, URISyntaxException {
-        mockCEGAEndpoint(username, password, PasswordHashingAlgorithm.BLOWFISH, KeyAlgorithm.DSS, HttpStatus.OK);
-        ClassLoader classloader = Thread.currentThread().getContextClassLoader();
-        File privateKey = new File(classloader.getResource(KeyAlgorithm.DSS.name().toLowerCase() + ".sec").toURI());
-        ssh.authPublickey(username, privateKey.getPath());
-        assertNotNull(ssh.newSFTPClient());
-    }
-
     @Test
     public void authenticatePublicKeyED25519() throws IOException, URISyntaxException {
         mockCEGAEndpoint(username, password, PasswordHashingAlgorithm.BLOWFISH, KeyAlgorithm.ED25519, HttpStatus.OK);
@@ -103,7 +94,7 @@ public void authenticatePublicKeyED25519() throws IOException, URISyntaxExceptio
     public void authenticatePublicKeyFail() throws IOException, URISyntaxException {
         mockCEGAEndpoint(username, password, PasswordHashingAlgorithm.BLOWFISH, KeyAlgorithm.RSA, HttpStatus.OK);
         ClassLoader classloader = Thread.currentThread().getContextClassLoader();
-        File privateKey = new File(classloader.getResource("dss.sec").toURI());
+        File privateKey = new File(classloader.getResource("rsa.sec").toURI());
         ssh.authPublickey(username, privateKey.getPath());
         assertNotNull(ssh.newSFTPClient());
     }