Skip to content

fix(v1): validate command args before the root check (green ShellCheck CI) #2

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

Merged
xxvcc merged 1 commit into from
Jul 8, 2026
Merged

fix(v1): validate command args before the root check (green ShellCheck CI) #2

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
15 changes: 12 additions & 3 deletions temp-admin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2475,14 +2475,16 @@ doctor_command() {
}

install_command() {
need_root
local force="false" src="${BASH_SOURCE[0]}"
# Validate arguments before the privilege check, so an unsupported argument is
# reported even when run as non-root (matches doctor).
while [[ $# -gt 0 ]]; do
case "$1" in
--force) force="true"; shift ;;
*) err "$(m "install 不支持的参数：$1" "install: unsupported argument: $1")"; usage; exit 1 ;;
esac
done
need_root
if [[ ! -f "$src" || -L "$src" ]]; then
err "$(m "无法安全定位当前脚本文件，不能安装。请先下载为本地文件后运行。" "Cannot safely locate the current script file; cannot install. Download it as a local file first.")"
exit 1
Expand All @@ -2492,15 +2494,16 @@ install_command() {
}

uninstall_command() {
need_root
local force="false" assume_yes="false" installed_ver="unknown"
# Validate arguments before the privilege check (matches doctor/install).
while [[ $# -gt 0 ]]; do
case "$1" in
--force) force="true"; shift ;;
--yes|-y) assume_yes="true"; shift ;;
*) err "$(m "uninstall 不支持的参数：$1" "uninstall: unsupported argument: $1")"; usage; exit 1 ;;
esac
done
need_root
if registry_has_users && [[ "$force" != "true" ]]; then
err "$(m "检测到仍有登记用户，拒绝卸载稳定命令；请先 revoke/cleanup，或确认风险后使用 --force。" "Registered users still exist; refusing to uninstall the stable command. Revoke/cleanup first, or use --force after accepting the risk.")"
exit 1
Expand Down Expand Up @@ -2533,9 +2536,10 @@ uninstall_command() {
}

upgrade_command() {
need_root
local url="$DEFAULT_UPGRADE_URL" force="false" assume_yes="false"
local tmpdir tmpfile remote_ver installed_ver="none"
# Validate arguments before the privilege check (matches doctor/install), so a
# bad argument or an unsafe URL is reported regardless of who runs it.
while [[ $# -gt 0 ]]; do
case "$1" in
--url) require_value "$1" "${2-}"; url="$2"; shift 2 ;;
Expand All @@ -2544,6 +2548,11 @@ upgrade_command() {
*) err "$(m "upgrade 不支持的参数：$1" "upgrade: unsupported argument: $1")"; usage; exit 1 ;;
esac
done
if ! valid_upgrade_url "$url"; then
err "$(m "升级地址不安全或不合法：$url" "Upgrade URL is unsafe or invalid: $url")"
exit 1
fi
need_root

if ! tmpdir=$(mktemp -d -p /dev/shm 2>/dev/null || mktemp -d -p /tmp); then
err "$(m "创建升级临时目录失败。" "Failed to create upgrade temporary directory.")"
Expand Down
Loading