try a different type of proxy for FTPS (plain HTTP seems strange)

apache · Jun 11, 2023 · 886393d · 886393d
1 parent 3ef3a18
commit 886393d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/ftp/src/main/scala/org/apache/pekko/stream/connectors/ftp/impl/FtpSourceFactory.scala b/ftp/src/main/scala/org/apache/pekko/stream/connectors/ftp/impl/FtpSourceFactory.scala
@@ -164,11 +164,7 @@ private[ftp] trait FtpsSource extends FtpSourceFactory[FTPSClient, FtpsSettings]
   protected final val FtpsDirectorySource = "FtpsDirectorySource"
   protected final val FtpsIOSinkName = "FtpsIOSink"
 
-  protected val ftpClient: () => FTPSClient = () => {
-    val client = new FTPSClient
-    client.setIpAddressFromPasvResponse(true)
-    client
-  }
+  protected val ftpClient: () => FTPSClient = () => new FTPSClient
   protected val ftpBrowserSourceName: String = FtpsBrowserSourceName
   protected val ftpIOSourceName: String = FtpsIOSourceName
   protected val ftpIOSinkName: String = FtpsIOSinkName

diff --git a/ftp/src/test/java/org/apache/pekko/stream/connectors/ftp/FtpsWithProxyStageTest.java b/ftp/src/test/java/org/apache/pekko/stream/connectors/ftp/FtpsWithProxyStageTest.java
@@ -36,7 +36,7 @@ public class FtpsWithProxyStageTest extends BaseFtpSupport implements CommonFtpS
 
   private final Integer PROXYPORT = 3128;
   private final Proxy PROXY =
-      new Proxy(Proxy.Type.HTTP, new InetSocketAddress(HOSTNAME, PROXYPORT));
+      new Proxy(Proxy.Type.DIRECT, new InetSocketAddress(HOSTNAME, PROXYPORT));
 
   @Test
   public void listFiles() throws Exception {