feat: ftp服务器支持自定义被动模式下的数据端口范围

Cufoon · Cufoon · commit f52c21c35f77 · 2024-02-25T20:59:06.000+08:00
diff --git a/app/src/main/java/me/zhanghai/android/files/ftpserver/FtpServer.kt b/app/src/main/java/me/zhanghai/android/files/ftpserver/FtpServer.kt
@@ -7,6 +7,7 @@ package me.zhanghai.android.files.ftpserver
 
 import java8.nio.file.Path
 import org.apache.ftpserver.ConnectionConfigFactory
+import org.apache.ftpserver.DataConnectionConfigurationFactory
 import org.apache.ftpserver.FtpServer
 import org.apache.ftpserver.FtpServerFactory
 import org.apache.ftpserver.ftplet.FtpException
@@ -18,6 +19,7 @@ class FtpServer(
     private val username: String,
     private val password: String?,
     private val port: Int,
+    private val passiveDataPorts: String?,
     private val homeDirectory: Path,
     private val writable: Boolean
 ) {
@@ -28,8 +30,15 @@ class FtpServer(
         server = FtpServerFactory()
             .apply {
                 val listener = ListenerFactory()
-                    .apply { port = this@FtpServer.port }
-                    .createListener()
+                    .apply {
+                        port = this@FtpServer.port
+                        passiveDataPorts?.let {
+                            dataConnectionConfiguration = DataConnectionConfigurationFactory()
+                                .apply {
+                                    passivePorts = it
+                                }.createDataConnectionConfiguration()
+                        }
+                    }.createListener()
                 addListener("default", listener)
                 val user = BaseUser().apply {
                     name = username
diff --git a/app/src/main/java/me/zhanghai/android/files/ftpserver/FtpServerService.kt b/app/src/main/java/me/zhanghai/android/files/ftpserver/FtpServerService.kt
@@ -102,9 +102,12 @@ class FtpServerService : Service() {
             password = Settings.FTP_SERVER_PASSWORD.valueCompat
         }
         val port = Settings.FTP_SERVER_PORT.valueCompat
+        val passiveDataPort: String? = if (Settings.FTP_SERVER_CUSTOM_DATA_PORT.valueCompat) {
+            Settings.FTP_SERVER_DATA_PORT.valueCompat
+        } else null
         val homeDirectory = Settings.FTP_SERVER_HOME_DIRECTORY.valueCompat
         val writable = Settings.FTP_SERVER_WRITABLE.valueCompat
-        val server = FtpServer(username, password, port, homeDirectory, writable)
+        val server = FtpServer(username, password, port, passiveDataPort, homeDirectory, writable)
         this.server = server
         try {
             server.start()
@@ -153,9 +156,6 @@ class FtpServerService : Service() {
     }
 
     enum class State {
-        STARTING,
-        RUNNING,
-        STOPPING,
-        STOPPED
+        STARTING, RUNNING, STOPPING, STOPPED
     }
 }
diff --git a/app/src/main/java/me/zhanghai/android/files/settings/Settings.kt b/app/src/main/java/me/zhanghai/android/files/settings/Settings.kt
@@ -87,6 +87,17 @@ object Settings {
             R.string.pref_key_ftp_server_port, R.integer.pref_default_value_ftp_server_port
         )
 
+    val FTP_SERVER_CUSTOM_DATA_PORT: SettingLiveData<Boolean> =
+        BooleanSettingLiveData(
+            R.string.pref_key_ftp_server_custom_data_port,
+            R.bool.pref_default_value_ftp_server_custom_data_port
+        )
+
+    val FTP_SERVER_DATA_PORT: SettingLiveData<String> =
+        StringSettingLiveData(
+            R.string.pref_key_ftp_server_data_port, R.string.pref_default_value_ftp_server_data_port
+        )
+
     val FTP_SERVER_HOME_DIRECTORY: SettingLiveData<Path> =
         ParcelValueSettingLiveData(
             R.string.pref_key_ftp_server_home_directory,
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -542,6 +542,8 @@
     <string name="ftp_server_username_title">用户名</string>
     <string name="ftp_server_password_title">密码</string>
     <string name="ftp_server_port_title">端口</string>
+    <string name="ftp_server_custom_data_port_title">自定义被动模式数据端口范围</string>
+    <string name="ftp_server_data_port_title">数据端口范围</string>
     <string name="ftp_server_home_directory_title">根文件夹</string>
     <string name="ftp_server_writable_title">允许写入</string>
 
diff --git a/app/src/main/res/values/donottranslate_prefs.xml b/app/src/main/res/values/donottranslate_prefs.xml
@@ -29,6 +29,10 @@
     <string name="pref_key_ftp_server_password">key_ftp_server_password</string>
     <string name="pref_key_ftp_server_port">key_ftp_server_port</string>
     <integer name="pref_default_value_ftp_server_port">2121</integer>
+    <string name="pref_key_ftp_server_custom_data_port">key_ftp_server_custom_data_port</string>
+    <bool name="pref_default_value_ftp_server_custom_data_port">false</bool>
+    <string name="pref_key_ftp_server_data_port">key_ftp_server_data_port</string>
+    <string name="pref_default_value_ftp_server_data_port">1024-65535</string>
     <string name="pref_key_ftp_server_home_directory">key_ftp_server_home_directory</string>
     <string name="pref_key_ftp_server_writable">key_ftp_server_writable</string>
     <bool name="pref_default_value_ftp_server_writable">true</bool>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -677,6 +677,8 @@
     <string name="ftp_server_username_title">Username</string>
     <string name="ftp_server_password_title">Password</string>
     <string name="ftp_server_port_title">Port</string>
+    <string name="ftp_server_custom_data_port_title">Using custom passive data ports</string>
+    <string name="ftp_server_data_port_title">Data Port Range</string>
     <string name="ftp_server_home_directory_title">Root folder</string>
     <string name="ftp_server_writable_title">Allow writing</string>
     <string name="ftp_server_notification_title" translatable="false">@string/ftp_server_title</string>
diff --git a/app/src/main/res/xml/ftp_server.xml b/app/src/main/res/xml/ftp_server.xml
@@ -5,7 +5,7 @@
   ~ All Rights Reserved.
   -->
 
-<PreferenceScreen
+<androidx.preference.PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
@@ -51,6 +51,18 @@
             android:defaultValue="@integer/pref_default_value_ftp_server_port"
             app:useSimpleSummaryProvider="true" />
 
+        <SwitchPreferenceCompat
+            android:key="@string/pref_key_ftp_server_custom_data_port"
+            android:title="@string/ftp_server_custom_data_port_title"
+            android:defaultValue="@bool/pref_default_value_ftp_server_custom_data_port" />
+
+        <me.zhanghai.android.files.settings.DefaultIfEmptyEditTextPreference
+            android:key="@string/pref_key_ftp_server_data_port"
+            android:title="@string/ftp_server_data_port_title"
+            android:defaultValue="@string/pref_default_value_ftp_server_data_port"
+            android:dependency="@string/pref_key_ftp_server_custom_data_port"
+            app:useSimpleSummaryProvider="true" />
+
         <me.zhanghai.android.files.ftpserver.FtpServerHomeDirectoryPreference
             android:key="@string/pref_key_ftp_server_home_directory"
             android:title="@string/ftp_server_home_directory_title"
@@ -61,4 +73,4 @@
             android:title="@string/ftp_server_writable_title"
             android:defaultValue="@bool/pref_default_value_ftp_server_writable" />
     </PreferenceCategory>
-</PreferenceScreen>
+</androidx.preference.PreferenceScreen>

Original file line number	Diff line number	Diff line change
`@@ -102,9 +102,12 @@ class FtpServerService : Service() {`
`102`	`102`	`password = Settings.FTP_SERVER_PASSWORD.valueCompat`
`103`	`103`	`}`
`104`	`104`	`val port = Settings.FTP_SERVER_PORT.valueCompat`
	`105`	`+ val passiveDataPort: String? = if (Settings.FTP_SERVER_CUSTOM_DATA_PORT.valueCompat) {`
	`106`	`+ Settings.FTP_SERVER_DATA_PORT.valueCompat`
	`107`	`+ } else null`
`105`	`108`	`val homeDirectory = Settings.FTP_SERVER_HOME_DIRECTORY.valueCompat`
`106`	`109`	`val writable = Settings.FTP_SERVER_WRITABLE.valueCompat`
`107`		`- val server = FtpServer(username, password, port, homeDirectory, writable)`
	`110`	`+ val server = FtpServer(username, password, port, passiveDataPort, homeDirectory, writable)`
`108`	`111`	`this.server = server`
`109`	`112`	`try {`
`110`	`113`	`server.start()`
`@@ -153,9 +156,6 @@ class FtpServerService : Service() {`
`153`	`156`	`}`
`154`	`157`
`155`	`158`	`enum class State {`
`156`		`- STARTING,`
`157`		`- RUNNING,`
`158`		`- STOPPING,`
`159`		`- STOPPED`
	`159`	`+ STARTING, RUNNING, STOPPING, STOPPED`
`160`	`160`	`}`
`161`	`161`	`}`