update 2026-10-08 02:18:41

luci-app-passwall/root/usr/share/passwall/test.sh

@@ -9,16 +9,19 @@ test_url() {
 	local timeout=2
 	[ -n "$3" ] && timeout=$3
 	local extra_params=$4
+	local status
+	local max_time=$((timeout + 3))
+	local retry_max_time=$((max_time * (try + 1) + try))
 	curl --help all | grep "\-\-retry-all-errors" > /dev/null
 	[ $? == 0 ] && extra_params="--retry-all-errors ${extra_params}"
-	status=$(/usr/bin/curl -I -o /dev/null -skL $extra_params --connect-timeout ${timeout} --retry ${try} -w %{http_code} "$url")
+	status=$(/usr/bin/curl -I -o /dev/null -skL $extra_params --connect-timeout ${timeout} --max-time ${max_time} --retry ${try} --retry-delay 1 --retry-max-time ${retry_max_time} -w %{http_code} "$url") || status=000
 	case "$status" in
 		204|\
 		200)
 			status=200
 		;;
 	esac
-	echo $status
+	printf '%s' "$status"
 }
 
 test_proxy() {
@@ -42,43 +45,53 @@ test_proxy() {
 }
 
 url_test_node() {
-	result=0
+	local result=0
 	local node_id=$1
-	local _type=$(echo $(config_n_get ${node_id} type) | tr 'A-Z' 'a-z')
+	local test_flag="url_test_${node_id}_$$"
+	local _address _port curlx _username _password _tmp_port probeUrl pid_file
+	local _type=$(config_n_get "$node_id" type | tr 'A-Z' 'a-z')
+
+	set --
 	[ -n "${_type}" ] && {
 		if [ "${_type}" == "socks" ]; then
-			local _address=$(config_n_get ${node_id} address)
-			local _port=$(config_n_get ${node_id} port)
-			[ -n "${_address}" ] && [ -n "${_port}" ] && {
-				local curlx="socks5h://${_address}:${_port}"
-				local _username=$(config_n_get ${node_id} username)
-				local _password=$(config_n_get ${node_id} password)
-				[ -n "${_username}" ] && [ -n "${_password}" ] && curlx="socks5h://${_username}:${_password}@${_address}:${_port}"
-			}
+			# 防止socks节点密码包含 #、% 等字符，将地址和认证信息分开传递
+			_address=$(config_n_get "$node_id" address)
+			_port=$(config_n_get "$node_id" port)
+			[ -n "$_address" ] && [ -n "$_port" ] || { echo 0; return 1; }
+			case "$_address" in
+				\[*\]) ;;
+				*:*) _address="[$_address]" ;;
+			esac
+			curlx="socks5h://${_address}:${_port}"
+			_username=$(config_n_get "$node_id" username)
+			_password=$(config_n_get "$node_id" password)
+			[ -n "${_username}" ] && [ -n "${_password}" ] && set -- --proxy-user "${_username}:${_password}"
 		else
-			local _tmp_port=$(get_new_port 48900 tcp,udp)
-			NO_REC_PROCESS=1 /usr/share/${CONFIG}/app.sh run_socks flag="url_test_${node_id}" node=${node_id} bind=127.0.0.1 socks_port=${_tmp_port} config_file=url_test_${node_id}.json
-			local curlx="socks5h://127.0.0.1:${_tmp_port}"
+			_tmp_port=$(get_new_port $((48900 + $$ % 201)) tcp,udp) || { echo 0; return 1; }
+			NO_REC_PROCESS=1 /usr/share/${CONFIG}/app.sh run_socks flag="$test_flag" node="$node_id" bind=127.0.0.1 socks_port="$_tmp_port" config_file="${test_flag}.json"
+			curlx="socks5h://127.0.0.1:${_tmp_port}"
 		fi
 		sleep 2s
-		local probeUrl=$(config_n_get @global_other[0] url_test_url https://www.google.com/generate_204)
-		result=$(curl --connect-timeout 3 --max-time 5 -o /dev/null -I -skL -w "%{http_code}:%{time_pretransfer}" -x ${curlx} "${probeUrl}")
+		probeUrl=$(config_n_get @global_other[0] url_test_url https://www.google.com/generate_204)
+		result=$(curl --connect-timeout 3 --max-time 5 -o /dev/null -I -skL -w "%{http_code}:%{time_pretransfer}" "$@" -x "$curlx" "${probeUrl}")
 		# 结束 SS 插件进程
-		local pid_file="${TMP_PATH}/url_test_${node_id}_plugin.pid"
-		[ -s "$pid_file" ] && kill -9 "$(head -n 1 "$pid_file")" >/dev/null 2>&1
-		busybox pgrep -af "url_test_${node_id}" | awk '! /test\.sh/{print $1}' | xargs kill -9 >/dev/null 2>&1
-		rm -rf ${TMP_PATH}/*url_test_${node_id}*.*
+		if [ "$_type" != "socks" ]; then
+			pid_file="${TMP_PATH}/${test_flag}_plugin.pid"
+			[ -s "$pid_file" ] && kill -9 "$(head -n 1 "$pid_file")" >/dev/null 2>&1
+			busybox pgrep -af "${TMP_PATH}/${test_flag}[._]" | awk '! /test\.sh/{print $1}' | xargs -r kill -9 >/dev/null 2>&1
+			rm -f "$TMP_PATH/${test_flag}".* "$TMP_PATH/${test_flag}"_*.*
+		fi
 	}
-	echo $result
+	printf '%s' "$result"
 }
 
 arg1=$1
 shift
 case $arg1 in
 test_url)
-	test_url $@
+	test_url "$@"
 	;;
 url_test_node)
-	url_test_node $@
+	url_test_node "$@"
 	;;
 esac