mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-11-05 01:44:16 +08:00
🤞 Sync 2026-08-10 09:21:08
This commit is contained in:
github-actions[bot] committed
1 parent
c463113ea9
commit
2f0ec626c4
17 files changed
+392
-118
No files matched your search
+1
-1
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=gecoosac
|
||||
PKG_VERSION:=2.2.20251015
|
||||
PKG_RELEASE:=19
|
||||
PKG_RELEASE:=20
|
||||
|
||||
PKG_MAINTAINER:=Roc Lai <laipeng668@qq.com>
|
||||
PKG_LICENSE:=AGPL-3.0-only
|
||||
|
||||
@@ -86,50 +86,62 @@ normalize_path() {
|
||||
printf '%s\n' "$normalized"
|
||||
}
|
||||
|
||||
path_has_clear_stage_component() {
|
||||
local path="$1" part rest
|
||||
|
||||
path="$(normalize_path "$path")" || return 1
|
||||
rest="${path#/}"
|
||||
while [ -n "$rest" ]; do
|
||||
part="${rest%%/*}"
|
||||
if [ "$part" = "$rest" ]; then
|
||||
rest=""
|
||||
else
|
||||
rest="${rest#*/}"
|
||||
fi
|
||||
case "$part" in
|
||||
.gecoosac-clear.*) return 0 ;;
|
||||
esac
|
||||
done
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
path_uses_clear_stage() {
|
||||
local path="$1" resolved
|
||||
|
||||
path="$(normalize_path "$path")" || return 1
|
||||
case "$path" in
|
||||
/.gecoosac-clear.*|/.gecoosac-clear.*/*|*/.gecoosac-clear.*|*/.gecoosac-clear.*/*)
|
||||
return 0
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ -e "$1" ] || [ -L "$1" ]; then
|
||||
resolved="$(readlink -f "$1" 2>/dev/null)" || return 1
|
||||
resolved="$(normalize_path "$resolved")" || return 1
|
||||
case "$resolved" in
|
||||
/.gecoosac-clear.*|/.gecoosac-clear.*/*|*/.gecoosac-clear.*|*/.gecoosac-clear.*/*)
|
||||
return 0
|
||||
;;
|
||||
esac
|
||||
path_has_clear_stage_component "$path" && return 0
|
||||
if [ -e "$path" ] || [ -L "$path" ]; then
|
||||
resolved="$(readlink -f "$path" 2>/dev/null)" || return 1
|
||||
path_has_clear_stage_component "$resolved" && return 0
|
||||
fi
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
is_supported_upload_path() {
|
||||
local path="$1" storage
|
||||
|
||||
path="$(normalize_path "$path")" || return 1
|
||||
path_uses_clear_stage "$path" && return 1
|
||||
[ "$path" = "$DEFAULT_UPLOAD_DIR" ] && return 0
|
||||
|
||||
case "$path" in
|
||||
/mnt/*/gecoosac/upload)
|
||||
storage="${path#/mnt/}"
|
||||
storage="${storage%/gecoosac/upload}"
|
||||
[ -n "$storage" ] && [ "${storage#*/}" = "$storage" ]
|
||||
;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
is_safe_upload_dir() {
|
||||
local path physical
|
||||
|
||||
path="$(normalize_path "$1")" || return 1
|
||||
physical="$(managed_dir_path upload "$path")" || return 1
|
||||
case "$path" in
|
||||
/etc/gecoosac|/etc/gecoosac/*) return 1 ;;
|
||||
esac
|
||||
case "$physical" in
|
||||
/etc/gecoosac|/etc/gecoosac/*) return 1 ;;
|
||||
esac
|
||||
|
||||
case "$path" in
|
||||
*/gecoosac/upload) ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
case "$physical" in
|
||||
*/gecoosac/upload) return 0 ;;
|
||||
esac
|
||||
|
||||
return 1
|
||||
is_supported_upload_path "$path" || return 1
|
||||
is_supported_upload_path "$physical"
|
||||
}
|
||||
|
||||
is_path_in_dir() {
|
||||
@@ -614,18 +626,35 @@ managed_dir_path() {
|
||||
esac
|
||||
}
|
||||
|
||||
ensure_upload_storage_root() {
|
||||
local path="$1" root
|
||||
|
||||
is_supported_upload_path "$path" || return 1
|
||||
case "$path" in
|
||||
"$DEFAULT_UPLOAD_DIR") root=/tmp ;;
|
||||
/mnt/*/gecoosac/upload) root="${path%/gecoosac/upload}" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
|
||||
[ -d "$root" ] && [ ! -L "$root" ] || return 1
|
||||
is_secure_upload_dir "$root"
|
||||
}
|
||||
|
||||
ensure_managed_dir() {
|
||||
local role="$1" path physical
|
||||
|
||||
path="$(normalize_path "$2")" || return 1
|
||||
physical="$(managed_dir_path "$role" "$path")" || return 1
|
||||
case "$role" in
|
||||
upload) is_safe_upload_dir "$path" || return 1 ;;
|
||||
upload)
|
||||
is_safe_upload_dir "$path" || return 1
|
||||
ensure_upload_storage_root "$physical" || return 1
|
||||
;;
|
||||
db) is_safe_db_dir "$path" "$upload_dir" || return 1 ;;
|
||||
pid) is_safe_pid_dir "$path" "$upload_dir" || return 1 ;;
|
||||
tls) [ "$path" = "/etc/gecoosac/tls" ] || return 1 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
physical="$(managed_dir_path "$role" "$path")" || return 1
|
||||
ensure_secure_dir_tree "$physical" || return 1
|
||||
[ -d "$path" ]
|
||||
}
|
||||
|
||||
@@ -90,27 +90,62 @@ managed_dir_path() {
|
||||
esac
|
||||
}
|
||||
|
||||
path_has_clear_stage_component() {
|
||||
local path="$1" part rest
|
||||
|
||||
path="$(normalize_path "$path")" || return 1
|
||||
rest="${path#/}"
|
||||
while [ -n "$rest" ]; do
|
||||
part="${rest%%/*}"
|
||||
if [ "$part" = "$rest" ]; then
|
||||
rest=""
|
||||
else
|
||||
rest="${rest#*/}"
|
||||
fi
|
||||
case "$part" in
|
||||
.gecoosac-clear.*) return 0 ;;
|
||||
esac
|
||||
done
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
path_uses_clear_stage() {
|
||||
local path="$1" resolved
|
||||
|
||||
path_has_clear_stage_component "$path" && return 0
|
||||
if [ -e "$path" ] || [ -L "$path" ]; then
|
||||
resolved="$(readlink -f "$path" 2>/dev/null)" || return 1
|
||||
path_has_clear_stage_component "$resolved" && return 0
|
||||
fi
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
is_supported_upload_path() {
|
||||
local path="$1" storage
|
||||
|
||||
path="$(normalize_path "$path")" || return 1
|
||||
path_uses_clear_stage "$path" && return 1
|
||||
[ "$path" = "$DEFAULT_UPLOAD_DIR" ] && return 0
|
||||
|
||||
case "$path" in
|
||||
/mnt/*/gecoosac/upload)
|
||||
storage="${path#/mnt/}"
|
||||
storage="${storage%/gecoosac/upload}"
|
||||
[ -n "$storage" ] && [ "${storage#*/}" = "$storage" ]
|
||||
;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
is_safe_upload_dir() {
|
||||
local path physical
|
||||
|
||||
path="$(normalize_path "$1")" || return 1
|
||||
physical="$(managed_dir_path upload "$path")" || return 1
|
||||
case "$path" in
|
||||
/etc/gecoosac|/etc/gecoosac/*) return 1 ;;
|
||||
esac
|
||||
case "$physical" in
|
||||
/etc/gecoosac|/etc/gecoosac/*) return 1 ;;
|
||||
esac
|
||||
|
||||
case "$path" in
|
||||
*/gecoosac/upload) ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
case "$physical" in
|
||||
*/gecoosac/upload) return 0 ;;
|
||||
esac
|
||||
|
||||
return 1
|
||||
is_supported_upload_path "$path" || return 1
|
||||
is_supported_upload_path "$physical"
|
||||
}
|
||||
|
||||
is_path_in_dir() {
|
||||
@@ -247,7 +282,7 @@ cleanup_legacy_upload_dir() {
|
||||
|
||||
normalize_dir_option() {
|
||||
local option="$1"
|
||||
local validator="$3"
|
||||
local validator="$2"
|
||||
local value normalized upload_dir
|
||||
|
||||
value="$(uci -q get "gecoosac.config.${option}")"
|
||||
@@ -320,8 +355,8 @@ migrate_config() {
|
||||
ensure_section || exit 1
|
||||
migrate_config || exit 1
|
||||
normalize_upload_dir || exit 1
|
||||
normalize_dir_option db_dir "$DEFAULT_DB_DIR" is_safe_db_dir || exit 1
|
||||
normalize_dir_option piddir "$DEFAULT_PID_DIR" is_safe_pid_dir || exit 1
|
||||
normalize_dir_option db_dir is_safe_db_dir || exit 1
|
||||
normalize_dir_option piddir is_safe_pid_dir || exit 1
|
||||
set_default enabled 0 || exit 1
|
||||
set_default port 60650 || exit 1
|
||||
set_default isonlyoneprot 1 || exit 1
|
||||
|
||||
Reference in new issue
Block a user