Skip to content
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

Jump to bottom

FTP: Add for FTPS the ability to set KeyManager and TrustManager #205

Merged
merged 9 commits into from
Aug 25, 2023
Merged

FTP: Add for FTPS the ability to set KeyManager and TrustManager #205

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
113c804
FTP: Add for FTPS the ability to set KeyManager and TrustManager
TheDeadOne Jul 30, 2023
71e5402
FTP: Add KeyManager and TrustManager usage test
TheDeadOne Jul 31, 2023
6b7fd49
FTP: Add verification of interaction with TrustManager
TheDeadOne Jul 31, 2023
dbf97ae
FTP: Add newline to mockito extension configuration file
TheDeadOne Jul 31, 2023
4ddfa9f
FTP: Format build configuration
TheDeadOne Jul 31, 2023
c0a3a64
FTP: Change header
TheDeadOne Jul 31, 2023
f0ed32d
Merge branch 'main' into ftps-with-keymanager
mdedetrich Aug 1, 2023
380a236
Merge branch 'main' into ftps-with-keymanager
pjfanning Aug 20, 2023
495f37a
Migrate FtpsWithTrustAndKeyManagersStageTest to use ScalaTest
mdedetrich Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions ftp/src/main/scala/org/apache/pekko/stream/connectors/ftp/impl/FtpsOperations.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ private[ftp] trait FtpsOperations extends CommonFtpOperations {
Try {
connectionSettings.proxy.foreach(ftpClient.setProxy)

connectionSettings.keyManager.foreach(ftpClient.setKeyManager)
connectionSettings.trustManager.foreach(ftpClient.setTrustManager)

ftpClient.connect(connectionSettings.host, connectionSettings.port)

connectionSettings.configureConnection(ftpClient)
Expand Down
24 changes: 19 additions & 5 deletions ftp/src/main/scala/org/apache/pekko/stream/connectors/ftp/model.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ package org.apache.pekko.stream.connectors.ftp

import java.net.InetAddress
import java.net.Proxy
import javax.net.ssl.KeyManager
import javax.net.ssl.TrustManager
import java.nio.file.attribute.PosixFilePermission

import org.apache.pekko.annotation.{ DoNotInherit, InternalApi }
Expand Down Expand Up @@ -173,7 +175,9 @@ final class FtpsSettings private (
val binary: Boolean,
val passiveMode: Boolean,
val configureConnection: FTPSClient => Unit,
val proxy: Option[Proxy]) extends FtpFileSettings {
val proxy: Option[Proxy],
val keyManager: Option[KeyManager],
val trustManager: Option[TrustManager]) extends FtpFileSettings {

def withHost(value: java.net.InetAddress): FtpsSettings = copy(host = value)
def withPort(value: Int): FtpsSettings = copy(port = value)
Expand All @@ -182,6 +186,8 @@ final class FtpsSettings private (
def withPassiveMode(value: Boolean): FtpsSettings =
if (passiveMode == value) this else copy(passiveMode = value)
def withProxy(value: Proxy): FtpsSettings = copy(proxy = Some(value))
def withKeyManager(value: KeyManager): FtpsSettings = copy(keyManager = Some(value))
def withTrustManager(value: TrustManager): FtpsSettings = copy(trustManager = Some(value))

/**
* Scala API:
Expand All @@ -205,14 +211,18 @@ final class FtpsSettings private (
binary: Boolean = binary,
passiveMode: Boolean = passiveMode,
configureConnection: FTPSClient => Unit = configureConnection,
proxy: Option[Proxy] = proxy): FtpsSettings = new FtpsSettings(
proxy: Option[Proxy] = proxy,
keyManager: Option[KeyManager] = keyManager,
trustManager: Option[TrustManager] = trustManager): FtpsSettings = new FtpsSettings(
host = host,
port = port,
credentials = credentials,
binary = binary,
passiveMode = passiveMode,
configureConnection = configureConnection,
proxy = proxy)
proxy = proxy,
keyManager = keyManager,
trustManager = trustManager)

override def toString =
"FtpsSettings(" +
Expand All @@ -222,7 +232,9 @@ final class FtpsSettings private (
s"binary=$binary," +
s"passiveMode=$passiveMode," +
s"configureConnection=$configureConnection," +
s"proxy=$proxy)"
s"proxy=$proxy" +
s"keyManager=$keyManager" +
s"trustManager=$trustManager)"
}

/**
Expand All @@ -241,7 +253,9 @@ object FtpsSettings {
binary = false,
passiveMode = false,
configureConnection = _ => (),
proxy = None)
proxy = None,
keyManager = None,
trustManager = None)

/** Java API */
def create(host: java.net.InetAddress): FtpsSettings = apply(
Expand Down