Skip to content

fix: 修复流媒体地区提取、DNS解锁误判、ipapi报错及JSON归档等7处关键Bug #78

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

Open
Chen017 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: 修复流媒体地区提取、DNS解锁误判、ipapi报错及JSON归档等7处关键Bug #78

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f517132
fix: 修复流媒体地区提取、DNS解锁误判及JSON字段缺失等6处问题
Chen017 Sep 13, 2026
c3be633
fix: 修复 db_ipapi 缺失 JSON 校验导致触发 WAF 拦截时狂喷 jq 和 awk 报错
Chen017 Sep 14, 2026
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
16 changes: 9 additions & 7 deletions ip.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,8 @@ bar_pid="$!"&&disown "$bar_pid"
trap "kill_progress_bar" RETURN
ipapi=()
local RESPONSE=$(curl $CurlARG -sL -$1 -m 10 "https://ipinfo.check.place/$IP?db=ipapi")
echo "$RESPONSE"|jq . >/dev/null 2>&1||RESPONSE=""
[[ -z $RESPONSE ]]&&return 1
ipapi[usetype]=$(echo "$RESPONSE"|jq -r '.asn.type')
ipapi[comtype]=$(echo "$RESPONSE"|jq -r '.company.type')
shopt -s nocasematch
Expand Down Expand Up @@ -959,11 +961,10 @@ case ${ipapi[comtype]} in
;;
*)ipapi[scomtype]="${stype[other]}"
esac
[[ -z $RESPONSE ]]&&return 1
ipapi[scoretext]=$(echo "$RESPONSE"|jq -r '.company.abuser_score')
ipapi[scorenum]=$(echo "${ipapi[scoretext]}"|awk '{print $1}')
ipapi[risktext]=$(echo "${ipapi[scoretext]}"|awk -F'[()]' '{print $2}')
ipapi[score]=$(awk "BEGIN {printf \"%.2f%%\", ${ipapi[scorenum]} * 100}")
[[ -n ${ipapi[scorenum]} ]]&&ipapi[score]=$(awk "BEGIN {printf \"%.2f%%\", ${ipapi[scorenum]} * 100}")
case ${ipapi[risktext]} in
"Very Low")ipapi[risk]="${sscore[verylow]}"
;;
Expand Down Expand Up @@ -1134,7 +1135,7 @@ show_progress_bar "$temp_info" $((40-6-${sinfo[ldatabase]}))&
bar_pid="$!"&&disown "$bar_pid"
trap "kill_progress_bar" RETURN
dbip=()
local tmpcurlarg='$CurlARG'
local tmpcurlarg="$CurlARG"
if [[ $IP == *:* ]];then
tmpcurlarg=""
fi
Expand Down Expand Up @@ -1271,7 +1272,7 @@ else
echo 1
fi
else
echo 0
echo 1
fi
}
function Check_DNS_1(){
Expand Down Expand Up @@ -1300,7 +1301,7 @@ function Check_DNS_3(){
local resultdnstext=$(dig "test$RANDOM$RANDOM.$1"|grep "ANSWER:")
local resultdnstext=${resultdnstext#*"ANSWER: "}
local resultdnstext=${resultdnstext%", AUTHORITY:"*}
if [ "$resultdnstext" == "0" ];then
if [ "$resultdnstext" == "0" ]||[ -z "$resultdnstext" ];then
echo 1
else
echo 0
Expand Down Expand Up @@ -1512,7 +1513,7 @@ fi
local isCN=$(echo $tmpresult|grep 'www.google.cn')
if [ -n "$isCN" ];then
youtube[ustatus]="${smedia[cn]}"
youtube[uregion]=" $Font_Red[CN]$Font_Green "
youtube[uregion]=" [CN] "
youtube[utype]="${smedia[nodata]}"
return
fi
Expand Down Expand Up @@ -1558,7 +1559,7 @@ amazon[uregion]="${smedia[nodata]}"
amazon[utype]="${smedia[nodata]}"
return
fi
local result=$(echo $tmpresult|grep '"currentTerritory":'|sed 's/.*currentTerritory//'|cut -f3 -d'"'|head -n 1)
local result=$(echo $tmpresult|grep -o -E '"currentTerritory":\s*"[A-Z]{2}"'|head -n 1|cut -d'"' -f4)
if [ -n "$result" ];then
amazon[ustatus]="${smedia[yes]}"
amazon[uregion]=" [$result] "
Expand Down Expand Up @@ -2419,6 +2420,7 @@ type_updates+=".Type |= . * { Usage: { IP2LOCATION: \"$(clean_ansi "${ip2locatio
type_updates+=".Type |= . * { Company: { IPinfo: \"$(clean_ansi "${ipinfo[scomtype]:-null}")\" } } | "
type_updates+=".Type |= . * { Company: { ipregistry: \"$(clean_ansi "${ipregistry[scomtype]:-null}")\" } } | "
type_updates+=".Type |= . * { Company: { ipapi: \"$(clean_ansi "${ipapi[scomtype]:-null}")\" } } | "
type_updates+=".Type |= . * { Company: { IP2LOCATION: \"$(clean_ansi "${ip2location[scomtype]:-null}")\" } } | "
score_updates+=".Score |= . + { IP2LOCATION: \"${ip2location[score]:-null}\" } | "
score_updates+=".Score |= . + { SCAMALYTICS: \"${scamalytics[score]:-null}\" } | "
score_updates+=".Score |= . + { ipapi: \"${ipapi[score]:-null}\" } | "
Expand Down