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

Draft
TranceLove wants to merge 1 commit into
base: release/4.0
Choose a base branch
from
Draft

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
14 changes: 10 additions & 4 deletions 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 @@ -40,6 +40,7 @@ import android.os.PowerManager
import android.os.SystemClock
import android.provider.DocumentsContract
import androidx.core.app.ServiceCompat
import androidx.core.content.edit
import androidx.preference.PreferenceManager
import com.amaze.filemanager.BuildConfig
import com.amaze.filemanager.R
Expand All @@ -53,6 +54,7 @@ import com.amaze.filemanager.ui.notifications.NotificationConstants
import com.amaze.filemanager.utils.ObtainableServiceBinder
import com.amaze.filemanager.utils.PasswordUtil
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 @@ -175,7 +177,7 @@ class FtpService : Service(), Runnable {
}.onFailure {
log.warn("failed to decrypt password in ftp service", it)
AppConfig.toast(applicationContext, R.string.error)
preferences.edit().putString(KEY_PREFERENCE_PASSWORD, "").apply()
preferences.edit { putString(KEY_PREFERENCE_PASSWORD, "") }
isPasswordProtected = false
}
}
Expand Down Expand Up @@ -223,10 +225,14 @@ class FtpService : Service(), Runnable {
"ftpserver",
)
fac.isImplicitSsl = true
fac.dataConnectionConfiguration =
DataConnectionConfigurationFactory().apply {
isImplicitSsl = true
}.createDataConnectionConfiguration()
} catch (e: GeneralSecurityException) {
preferences.edit().putBoolean(KEY_PREFERENCE_SECURE, false).apply()
preferences.edit { putBoolean(KEY_PREFERENCE_SECURE, false) }
} catch (e: IOException) {
preferences.edit().putBoolean(KEY_PREFERENCE_SECURE, false).apply()
preferences.edit { putBoolean(KEY_PREFERENCE_SECURE, false) }
}
}
fac.port = getPort(preferences)
Expand Down Expand Up @@ -312,7 +318,7 @@ class FtpService : Service(), Runnable {
const val TAG_STARTED_BY_TILE = "started_by_tile"
// attribute of action_started, used by notification

private lateinit var _enabledCipherSuites: Array<String>
private var _enabledCipherSuites: Array<String>

init {
_enabledCipherSuites =
Expand Down
Loading