fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-rclone: sync with upstream source

Browse Source
This commit is contained in:
ElonH 2020-05-03 16:57:31 +08:00 committed by CN_SZTL
parent c5c9118ebe
commit 21b94eee9f
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
4 changed files with 57 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/ctcgfw/luci-app-rclone/Makefile
View File

@ -13,7 +13,7 @@ LUCI_TITLE:=LuCI support for Rclone
LUCI_DEPENDS:=+rclone +rclone-webui-react
LUCI_PKGARCH:=all
PKG_NAME:=luci-app-rclone
PKG_VERSION:=1.3.21
PKG_VERSION:=1.3.22
PKG_RELEASE:=1
PKG_LICENSE:=GPLv3.0+
PKG_MAINTAINER:=ElonH <elonhhuang@gmail.com>

6
package/ctcgfw/luci-app-rclone/root/etc/init.d/rclone
View File

@ -1,4 +1,4 @@
#!/bin/bash /etc/rc.common
#!/bin/sh /etc/rc.common
# Copyright (C) 2019 ElonH <elonhhuang@gmail.com>
USE_PROCD=1
@ -81,8 +81,8 @@ start_service() {
procd_append_param command "--rc-allow-origin=*"
procd_append_param command "--log-file=${log_path}"
if [[ "${proxy_enable}" == "1" ]]; then
procd_set_param env all_proxy="$proxy_addr" https_proxy="$proxy_addr" http_proxy="$proxy_addr"
procd_set_param env ALL_PROXY="$proxy_addr" HTTPS_PROXY="$proxy_addr" HTTP_PROXY="$proxy_addr"
procd_set_param env all_proxy="$proxy_addr" https_proxy="$proxy_addr" http_proxy="$proxy_addr"
procd_append_param env ALL_PROXY="$proxy_addr" HTTPS_PROXY="$proxy_addr" HTTP_PROXY="$proxy_addr"
fi
procd_set_param stdout 1
procd_set_param stderr 1

9
package/ctcgfw/rclone/patches/010-change-default-config-path.patch
View File

@ -1,3 +1,12 @@
##
# File: /patches/010-change-default-config-path.patch
# Project: rclone
# File Created: Friday, 1st May 2020 10:54:31 pm
# Author: ElonH[EH](elonhhuang@gmail.com)
# License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html)
# Copyright (C) 2020 [ElonH]
##
# set /etc/rclone/rclone.conf as default configuration path
diff --git a/fs/config/config.go b/fs/config/config.go
index 53d67ef03..cc5d6436b 100644
--- a/fs/config/config.go

44
package/ctcgfw/rclone/patches/020-Notice-Access-Control-Allow-Origin-only-once.patch Normal file
View File

@ -0,0 +1,44 @@
##
# File: /patches/020-Notice-Access-Control-Allow-Origin-only-once.patch
# Project: rclone
# File Created: Sunday, 3rd May 2020 1:44:22 pm
# Author: ElonH[EH](elonhhuang@gmail.com)
# License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html)
# Copyright (C) 2020 [ElonH]
##
diff --git a/fs/rc/rcserver/rcserver.go b/fs/rc/rcserver/rcserver.go
index 4a2b5c71e..f00994e93 100644
--- a/fs/rc/rcserver/rcserver.go
+++ b/fs/rc/rcserver/rcserver.go
@@ -14,6 +14,7 @@ import (
"regexp"
"sort"
"strings"
+ "sync"
"github.com/pkg/errors"
"github.com/rclone/rclone/cmd/serve/httplib"
@@ -29,6 +30,8 @@ import (
"github.com/skratchdot/open-golang/open"
)
+var onlyOnce sync.Once
+
// Start the remote control server if configured
//
// If the server wasn't configured the *Server returned may be nil
@@ -172,9 +175,11 @@ func (s *Server) handler(w http.ResponseWriter, r *http.Request) {
allowOrigin := rcflags.Opt.AccessControlAllowOrigin
if allowOrigin != "" {
- if allowOrigin == "*" {
- fs.Logf(nil, "Warning: Allow origin set to *. This can cause serious security problems.")
- }
+ onlyOnce.Do(func() {
+ if allowOrigin == "*" {
+ fs.Logf(nil, "Warning: Allow origin set to *. This can cause serious security problems.")
+ }
+ })
w.Header().Add("Access-Control-Allow-Origin", allowOrigin)
} else {
w.Header().Add("Access-Control-Allow-Origin", s.URL())