Skip to content

Enable implicit SSL also at FTP server data connections #4430

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

Open
TranceLove wants to merge 1 commit into
base: release/4.0
Choose a base branch
from
+8 −1
Open

Enable implicit SSL also at FTP server data connections #4430

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion app/src/main/java/com/amaze/filemanager/asynchronous/services/ftp/FtpService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.launch
import org.apache.ftpserver.ConnectionConfigFactory
import org.apache.ftpserver.DataConnectionConfigurationFactory
import org.apache.ftpserver.FtpServer
import org.apache.ftpserver.FtpServerFactory
import org.apache.ftpserver.filesystem.nativefs.NativeFileSystemFactory
Expand Down Expand Up @@ -227,7 +228,7 @@ class FtpService : Service(), Runnable {
TrustManagerFactory
.getInstance(TrustManagerFactory.getDefaultAlgorithm())
trustManagerFactory.init(keyStore)
fac.sslConfiguration =
val sslConfiguration =
DefaultSslConfiguration(
keyManagerFactory,
trustManagerFactory,
Expand All @@ -236,7 +237,13 @@ class FtpService : Service(), Runnable {
enabledCipherSuites,
"ftpserver",
)
fac.sslConfiguration = sslConfiguration
fac.isImplicitSsl = true
fac.dataConnectionConfiguration =
DataConnectionConfigurationFactory().apply {
this.isImplicitSsl = true
this.sslConfiguration = sslConfiguration
}.createDataConnectionConfiguration()
Comment on lines +240 to +246
} catch (e: GeneralSecurityException) {
preferences.edit { putBoolean(KEY_PREFERENCE_SECURE, false) }
} catch (e: IOException) {
Expand Down
Loading