diff --git a/install.sh b/install.sh index 712a1e40..e8da7a3c 100755 --- a/install.sh +++ b/install.sh @@ -1,40 +1,32 @@ #!/bin/bash - # ========================================================== # 脚本名称: install.sh (v4.3.0 模块化终极引导入口) # 核心功能: 权限鉴定、沙盒创建、Ctrl+C 熔断保护、业务流引导 # ========================================================== -# 1. 严格权限鉴权 if [ "$EUID" -ne 0 ]; then echo -e "\033[31m❌ 权限被拒绝: 部署 IP-Sentinel 需要最高系统权限。\033[0m" echo -e "💡 请切换到 root 用户 (执行 su root 或 sudo -i) 后重新运行指令。" exit 1 fi -# 2. [沙盒机制] 创建安全挂载点 SECURE_TMP=$(mktemp -d /tmp/ips_install.XXXXXX) -# ---------------------------------------------------------- -# [中断防护] 严格捕获 Ctrl+C 人为中断,执行优雅的战场清理 -# ---------------------------------------------------------- cleanup_and_exit() { echo -e "\n\n\033[33m⚠️ 检测到中断信号 (Ctrl+C),安装操作已被手动中止。\033[0m" echo -e "🧹 正在清理临时沙盒文件..." rm -rf "$SECURE_TMP" 2>/dev/null exit 1 } -# 绑定系统级中断引信 trap cleanup_and_exit INT QUIT TERM trap 'rm -rf "$SECURE_TMP" 2>/dev/null' EXIT HUP -# 测试期指向当前重构开发分支 REPO_RAW_URL="https://raw.githubusercontent.com/hotyue/IP-Sentinel/main" echo -e "\n⏳ 正在拉取 IP-Sentinel v4.3.0 安装模块引擎..." -# 3. 仅拉取总指挥大管家 -curl -fsSL --connect-timeout 10 --retry 3 "${REPO_RAW_URL}/install/build_agent.sh" -o "${SECURE_TMP}/build_agent.sh" +# 【核心防线】追加 ?t=$(date +%s) 强行击穿 GitHub CDN 缓存 +curl -fsSL --connect-timeout 10 --retry 3 "${REPO_RAW_URL}/install/build_agent.sh?t=$(date +%s)" -o "${SECURE_TMP}/build_agent.sh" if [ ! -s "${SECURE_TMP}/build_agent.sh" ]; then echo -e "\033[31m❌ 致命错误:核心安装引擎拉取失败!网络阻断或 GitHub Raw 异常。\033[0m" @@ -44,12 +36,7 @@ fi export SECURE_TMP export REPO_RAW_URL -# ========================================================== -# 【业务交接】转移控制权至大管家 -# 由于已废弃管道流安装法,终端输入天然纯净,无需再重定向 /dev/tty -# ========================================================== chmod +x "${SECURE_TMP}/build_agent.sh" bash "${SECURE_TMP}/build_agent.sh" -# 透传子进程的退出状态码 exit $? diff --git a/install/build_agent.sh b/install/build_agent.sh index e9428caa..8bd789f1 100755 --- a/install/build_agent.sh +++ b/install/build_agent.sh @@ -17,7 +17,7 @@ MODULES=( # 1. 串行拉取子模块资产 for mod in "${MODULES[@]}"; do - curl -fsSL --connect-timeout 10 --retry 3 "${REPO_RAW_URL}/install/${mod}" -o "${SECURE_TMP}/${mod}" + curl -fsSL --connect-timeout 10 --retry 3 "${REPO_RAW_URL}/install/${mod}?t=$(date +%s)" -o "${SECURE_TMP}/${mod}" if [ ! -s "${SECURE_TMP}/${mod}" ]; then echo -e "\033[31m❌ 致命错误:依赖模块 [${mod}] 装载失败!\033[0m" exit 1 diff --git a/install/build_master.sh b/install/build_master.sh index 3028a6e6..524e119e 100755 --- a/install/build_master.sh +++ b/install/build_master.sh @@ -14,7 +14,7 @@ MODULES=( ) for mod in "${MODULES[@]}"; do - curl -fsSL --connect-timeout 10 --retry 3 "${REPO_RAW_URL}/install/${mod}" -o "${SECURE_TMP}/${mod}" + curl -fsSL --connect-timeout 10 --retry 3 "${REPO_RAW_URL}/install/${mod}?t=$(date +%s)" -o "${SECURE_TMP}/${mod}" if [ ! -s "${SECURE_TMP}/${mod}" ]; then echo -e "\033[31m❌ 致命错误:中枢依赖模块 [${mod}] 装载失败!\033[0m" exit 1 diff --git a/master/install_master.sh b/master/install_master.sh index 87b4b3d7..db21cc2f 100755 --- a/master/install_master.sh +++ b/master/install_master.sh @@ -4,7 +4,6 @@ # 核心功能: 极简引导入口。包含 Ctrl+C 优雅中断,采用物理文件执行规避管道污染 # ========================================================== -# [中断防护] 捕获 Ctrl+C 并执行优雅清理 cleanup_and_exit() { echo -e "\n\n\033[33m⚠️ 检测到中断信号 (Ctrl+C),安装操作已被手动中止。\033[0m" echo -e "🧹 正在清理临时沙盒文件..." @@ -25,8 +24,8 @@ REPO_RAW_URL="https://raw.githubusercontent.com/hotyue/IP-Sentinel/main" echo -e "\n⏳ 正在拉取 IP-Sentinel Master v4.3.0 安装引擎..." -# 仅拉取编排大管家 -curl -fsSL --connect-timeout 10 --retry 3 "${REPO_RAW_URL}/install/build_master.sh" -o "${SECURE_TMP}/build_master.sh" +# 【核心防线】追加 ?t=$(date +%s) 强行击穿 GitHub CDN 缓存 +curl -fsSL --connect-timeout 10 --retry 3 "${REPO_RAW_URL}/install/build_master.sh?t=$(date +%s)" -o "${SECURE_TMP}/build_master.sh" if [ ! -s "${SECURE_TMP}/build_master.sh" ]; then echo -e "\033[31m❌ 致命错误:中枢安装引擎拉取失败!\033[0m" @@ -36,10 +35,7 @@ fi export SECURE_TMP export REPO_RAW_URL -# 【核心解法】不再使用 exec 劫持或 source 嵌套 -# 直接以子进程物理文件方式运行,这样终端交互 (TTY) 将自然纯净,毫无污染 chmod +x "${SECURE_TMP}/build_master.sh" bash "${SECURE_TMP}/build_master.sh" -# 透传子进程的退出状态码 exit $?