change ftp password to string type

files-ftp-fs/src/main/java/org/xbib/io/ftp/fs/FTPEnvironment.java

@@ -734,8 +734,7 @@ public class FTPEnvironment implements Map<String, Object>, Cloneable {
         }
 
         String username = getUsername();
-        char[] passwordChars = FileSystemProviderSupport.getValue(this, PASSWORD, char[].class, null);
+        String password = FileSystemProviderSupport.getValue(this, PASSWORD, String.class, null);
-        String password = passwordChars != null ? new String(passwordChars) : null;
         String account = FileSystemProviderSupport.getValue(this, ACCOUNT, String.class, null);
         if (account != null) {
             if (!client.login(username, password, account)) {

files-sftp-fs/src/main/java/org/apache/sshd/fs/SftpFileSystem.java

@@ -76,8 +76,11 @@ public class SftpFileSystem
     private int writeBufferSize;
     private final List<FileStore> stores;
 
-    public SftpFileSystem(SftpFileSystemProvider provider, String id, ClientSession session,
+    public SftpFileSystem(SftpFileSystemProvider provider,
-                          SftpClientFactory factory, SftpVersionSelector selector) throws IOException {
+                          String id,
+                          ClientSession session,
+                          SftpClientFactory factory,
+                          SftpVersionSelector selector) throws IOException {
         super(provider);
         this.id = id;
         this.clientSession = Objects.requireNonNull(session, "No client session");

files-sftp-fs/src/main/java/org/apache/sshd/fs/SftpFileSystemClientSessionInitializer.java

@@ -22,6 +22,7 @@ package org.apache.sshd.fs;
 import java.io.IOException;
 import java.util.Map;
 
+import org.apache.sshd.client.config.hosts.HostConfigEntry;
 import org.apache.sshd.client.session.ClientSession;
 import org.apache.sshd.client.session.ClientSessionCreator;
 import org.apache.sshd.common.auth.PasswordHolder;
@@ -50,13 +51,28 @@ public interface SftpFileSystemClientSessionInitializer {
      * @return             The created {@link ClientSession}
      * @throws IOException If failed to connect
      */
-    default ClientSession createClientSession(
+    default ClientSession createClientSession(SftpFileSystemProvider provider,
-            SftpFileSystemProvider provider, SftpFileSystemInitializationContext context)
+                                              SftpFileSystemInitializationContext context)
             throws IOException {
         UsernameHolder user = context.getCredentials();
         ClientSessionCreator client = provider.getClientInstance();
-        return client.connect(user.getUsername(), context.getHost(), context.getPort())
+        // proxy?
-                .verifyDuration(context.getMaxConnectTime()).getSession();
+        String proxy = (String) context.getEnvironment().get("proxy");
+        if (proxy != null) {
+            HostConfigEntry entry = new HostConfigEntry();
+            entry.setProxyJump(proxy);
+            entry.setUsername(user.getUsername());
+            entry.setHostName(context.getHost());
+            entry.setHost(context.getHost());
+            entry.setPort(context.getPort());
+            return client.connect(entry)
+                    .verifyDuration(context.getMaxConnectTime())
+                    .getSession();
+        } else {
+            return client.connect(user.getUsername(), context.getHost(), context.getPort())
+                    .verifyDuration(context.getMaxConnectTime())
+                    .getSession();
+        }
     }
 
     /**
@@ -90,9 +106,10 @@ public interface SftpFileSystemClientSessionInitializer {
      * @return             The created {@link SftpFileSystem}
      * @throws IOException If failed to create the file-system
      */
-    default SftpFileSystem createSftpFileSystem(
+    default SftpFileSystem createSftpFileSystem(SftpFileSystemProvider provider,
-            SftpFileSystemProvider provider, SftpFileSystemInitializationContext context, ClientSession session,
+                                                SftpFileSystemInitializationContext context,
-            SftpVersionSelector selector)
+                                                ClientSession session,
+                                                SftpVersionSelector selector)
             throws IOException {
         return new SftpFileSystem(provider, context.getId(), session, provider.getSftpClientFactory(), selector);
     }

files-sftp-fs/src/main/java/org/apache/sshd/fs/SftpFileSystemProvider.java

@@ -155,7 +155,9 @@ public class SftpFileSystemProvider extends FileSystemProvider {
         this(client, null, selector);
     }
 
-    public SftpFileSystemProvider(SshClient client, SftpClientFactory factory, SftpVersionSelector selector) {
+    public SftpFileSystemProvider(SshClient client,
+                                  SftpClientFactory factory,
+                                  SftpVersionSelector selector) {
         this.factory = factory;
         this.versionSelector = selector;
         if (client == null) {

files-sftp-fs/src/test/java/org/apache/sshd/fs/test/SFTPFileSystemTest.java

@@ -3,6 +3,8 @@ package org.apache.sshd.fs.test;
 import java.nio.file.Files;
 import org.apache.sshd.client.ClientBuilder;
 import org.apache.sshd.client.SshClient;
+import org.apache.sshd.client.config.hosts.HostConfigEntry;
+import org.apache.sshd.client.session.ClientSession;
 import org.apache.sshd.fs.SftpFileSystem;
 import org.apache.sshd.fs.SftpFileSystemProvider;
 import org.junit.jupiter.api.Test;
@@ -20,7 +22,7 @@ public class SFTPFileSystemTest {
     private static final Logger logger = Logger.getLogger(SFTPFileSystemTest.class.getName());
 
     @Test
-    public void init() throws Exception {
+    public void testXbib() throws Exception {
         Map<String, String> env = new HashMap<>();
         env.put("username", "joerg");
         URI uri = URI.create("sftp://xbib.org");