Upgrade to MINA SSHD 2.10.0

* Fix test environment for SFTP server with custom `VirtualFileSystemFactory`
 and `RootedFileSystemProvider` to solve the problem with non-normalized returned path

Author: artembilan

build.gradle

@@ -47,7 +47,7 @@ ext {
     modifiedFiles =
             files(grgit.status().unstaged.modified).filter { f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
 
-    apacheSshdVersion = '2.9.2'
+    apacheSshdVersion = '2.10.0'
     artemisVersion = '2.29.0'
     aspectjVersion = '1.9.19'
     assertjVersion = '3.24.2'

spring-integration-sftp/src/test/java/org/springframework/integration/sftp/SftpTestSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 the original author or authors.
+ * Copyright 2016-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,19 @@
 package org.springframework.integration.sftp;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.FileSystem;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
 import java.util.Collections;
+import java.util.Objects;
 
+import org.apache.sshd.common.file.root.RootedFileSystem;
+import org.apache.sshd.common.file.root.RootedFileSystemProvider;
+import org.apache.sshd.common.file.root.RootedPath;
 import org.apache.sshd.common.file.virtualfs.VirtualFileSystemFactory;
+import org.apache.sshd.common.session.SessionContext;
+import org.apache.sshd.common.util.io.IoUtils;
 import org.apache.sshd.server.SshServer;
 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
 import org.apache.sshd.sftp.client.SftpClient;
@@ -71,7 +81,7 @@ public static void createServer() throws Exception {
 		});
 		sftpFactory.addSftpEventListener(EVENT_LISTENER);
 		server.setSubsystemFactories(Collections.singletonList(sftpFactory));
-		server.setFileSystemFactory(new VirtualFileSystemFactory(getRemoteTempFolder().toPath()));
+		server.setFileSystemFactory(new FixedVirtualFileSystemFactory(getRemoteTempFolder()));
 		server.start();
 		port = server.getPort();
 	}
@@ -101,4 +111,37 @@ public static void stopServer() throws Exception {
 		}
 	}
 
+	private static class FixedVirtualFileSystemFactory extends VirtualFileSystemFactory {
+
+		FixedVirtualFileSystemFactory(File defaultHomeDir) {
+			super(defaultHomeDir.toPath());
+		}
+
+		@Override
+		public FileSystem createFileSystem(SessionContext session) throws IOException {
+			Path dir = getUserHomeDir(session);
+			if (dir == null) {
+				throw new InvalidPathException(session.getUsername(), "Cannot resolve home directory");
+			}
+
+			return new FixedRootedFileSystemProvider().newFileSystem(dir, Collections.emptyMap());
+		}
+
+		private static class FixedRootedFileSystemProvider extends RootedFileSystemProvider {
+
+			protected Path resolveLocalPath(RootedPath path) {
+				Objects.requireNonNull(path, "No rooted path to resolve");
+				RootedFileSystem rfs = path.getFileSystem();
+				Path root = rfs.getRoot();
+				Path resolved = IoUtils.chroot(root, path).normalize();
+				if (!resolved.startsWith(root)) {
+					throw new InvalidPathException(root.toString(), "Not under root");
+				}
+				return resolved;
+			}
+
+		}
+
+	}
+
 }