Merge pull request #776 from messense/redirect

Add `--redirect` option
messense · Mar 17, 2023 · fa4a5f3 · fa4a5f3
2 parents 12ef8ab + d05a2f4
commit fa4a5f3
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/openwrt/aliyundrive-webdav/files/aliyundrive-webdav.config b/openwrt/aliyundrive-webdav/files/aliyundrive-webdav.config
@@ -17,3 +17,4 @@ config server
     option tls_key ''
     option skip_upload_same_size '0'
     option prefer_http_download '0'
+    option redirect '0'
diff --git a/openwrt/aliyundrive-webdav/files/aliyundrive-webdav.init b/openwrt/aliyundrive-webdav/files/aliyundrive-webdav.init
@@ -59,6 +59,13 @@ start_service() {
         *) ;;
       esac
 
+      case "$(uci_get_by_type server redirect 0)" in
+        1|on|true|yes|enabled)
+          extra_options="$extra_options --redirect"
+          ;;
+        *) ;;
+      esac
+
       if [[ ! -z "$tls_cert" && ! -z "$tls_key" ]]; then
         extra_options="$extra_options --tls-cert $tls_cert --tls-key $tls_key"
       fi

diff --git a/openwrt/luci-app-aliyundrive-webdav/luasrc/model/cbi/aliyundrive-webdav/client.lua b/openwrt/luci-app-aliyundrive-webdav/luasrc/model/cbi/aliyundrive-webdav/client.lua
@@ -44,6 +44,10 @@ prefer_http_download = e:option(Flag, "prefer_http_download", translate("Prefer
 prefer_http_download.description = translate("Prefer downloading files using HTTP instead of HTTPS protocol")
 prefer_http_download.rmempty = false
 
+redirect = e:option(Flag, "redirect", translate("Enable 302 Redirect"))
+redirect.description = translate("Enable 302 redirect when possible")
+redirect.rmempty = false
+
 upload_buffer_size = e:option(Value, "upload_buffer_size", translate("Upload Buffer Size"))
 upload_buffer_size.default = "16777216"
 upload_buffer_size.datatype = "uinteger"

diff --git a/openwrt/luci-app-aliyundrive-webdav/po/zh-cn/aliyundrive-webdav.po b/openwrt/luci-app-aliyundrive-webdav/po/zh-cn/aliyundrive-webdav.po
@@ -96,3 +96,9 @@ msgstr "使用 HTTP 下载"
 
 msgid "Prefer downloading files using HTTP instead of HTTPS protocol"
 msgstr "优先使用 HTTP 而不是 HTTPS 协议下载，低端设备上降低 CPU 占用"
+
+msgid "Enable 302 Redirect"
+msgstr "启用 302 重定向"
+
+msgid "Enable 302 redirect when possible"
+msgstr "在可能的情况下启用 302 重定向"
diff --git a/src/main.rs b/src/main.rs
@@ -114,6 +114,9 @@ struct Opt {
     /// Prefer downloading using HTTP protocol
     #[arg(long)]
     prefer_http_download: bool,
+    /// Enable 302 redirect when possible
+    #[arg(long, hide = true)]
+    redirect: bool,
 
     #[command(subcommand)]
     subcommands: Option<Commands>,
@@ -257,7 +260,7 @@ async fn main() -> anyhow::Result<()> {
         .locksystem(MemLs::new())
         .read_buf_size(opt.read_buffer_size)
         .autoindex(opt.auto_index)
-        .redirect(false);
+        .redirect(opt.redirect);
     if let Some(prefix) = opt.strip_prefix {
         dav_server_builder = dav_server_builder.strip_prefix(prefix);
     }