xm/ShellCrash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.9.1beta14

Browse Source 
~同步最新版本meta内核及singboxp内核
~延迟启动功能改回在afstart函数执行，以防止systemd启动超时
~透明代理规则增加过滤53端口机制，防止dns被tun或者tproxy劫持导致的一系列问题
~为singbox内核入站添加"domain_strategy":"prefer_ipv4"字段以适应geoip相关规则
~修复singbox内核fakeip列表中关于正则表达式匹配有误的bug
This commit is contained in:
juewuy
2024-08-17 19:08:41 +08:00
parent 7384f69856
commit b524c6e32a
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/menu.sh
View File

@@ -75,7 +75,7 @@ ckstatus(){
PID=$(pidof CrashCore | awk '{print $NF}')
if [ -n "$PID" ];then
run="\033[32m正在运行（$redir_mod）\033[0m"
VmRSS=`cat /proc/$PID/status|grep -w VmRSS|awk 'unit="MB"{print $2/1000, unit}'`
VmRSS=`cat /proc/$PID/status|grep -w VmRSS|awk 'unit="MB" {printf "%.2f %s\n", $2/1000, unit}'`
#获取运行时长
touch ${TMPDIR}/crash_start_time #用于延迟启动的校验
start_time=$(cat ${TMPDIR}/crash_start_time)

24
scripts/start.sh
View File

@@ -599,10 +599,10 @@ EOF
global_dns=dns_fakeip
fake_ip_filter_domain=$(cat ${CRASHDIR}/configs/fake_ip_filter ${CRASHDIR}/configs/fake_ip_filter.list 2>/dev/null | grep -Ev '#|\*|\+|Mijia' | sed '/^\s*$/d' | awk '{printf "\"%s\", ",$1}' | sed 's/, $//')
fake_ip_filter_suffix=$(cat ${CRASHDIR}/configs/fake_ip_filter ${CRASHDIR}/configs/fake_ip_filter.list 2>/dev/null | grep -v '.\*' | grep -E '\*|\+' | sed 's/^[*+]\.//' | awk '{printf "\"%s\", ",$1}' | sed 's/, $//')
fake_ip_filter_regex=$(cat ${CRASHDIR}/configs/fake_ip_filter ${CRASHDIR}/configs/fake_ip_filter.list 2>/dev/null | grep '.\*' | sed 's/^*/.\*/' | sed 's/^+/.\+/' | awk '{printf "\"%s\", ",$1}' | sed 's/, $//')
fake_ip_filter_regex=$(cat ${CRASHDIR}/configs/fake_ip_filter ${CRASHDIR}/configs/fake_ip_filter.list 2>/dev/null | grep '.\*' | sed 's/\./\\\\./g' | sed 's/\*/.\*/' | sed 's/^+/.\+/' | awk '{printf "\"%s\", ",$1}' | sed 's/, $//')
[ -n "$fake_ip_filter_domain" ] && fake_ip_filter_domain="{ \"domain\": [$fake_ip_filter_domain], \"server\": \"dns_direct\" },"
[ -n "$fake_ip_filter_suffix" ] && fake_ip_filter_suffix="{ \"domain_suffix\": [$fake_ip_filter_suffix], \"server\": \"dns_direct\" },"
[ -n "$fake_ip_filter_regex" ] && fake_ip_filter_regex="{ \"domain_regex\": [$fake_ip_filter_regex], \"server\": \"dns_direct\" },"
[ -n "$fake_ip_filter_regex" ] && fake_ip_filter_regex="{ \"domain_regex\": [$fake_ip_filter_regex], \"server\": \"dns_direct\" },"
}
[ "$dns_mod" = "mix" ] && {
global_dns=dns_fakeip
@@ -711,6 +711,7 @@ EOF
"listen": "::",
"listen_port": $mix_port,
$userpass
"domain_strategy":"prefer_ipv4",
"sniff": false
}, {
"type": "direct",
@@ -722,6 +723,7 @@ EOF
"tag": "redirect-in",
"listen": "::",
"listen_port": $redir_port,
"domain_strategy":"prefer_ipv4",
"sniff": true,
"sniff_override_destination": $sniffer
}, {
@@ -729,6 +731,7 @@ EOF
"tag": "tproxy-in",
"listen": "::",
"listen_port": $tproxy_port,
"domain_strategy":"prefer_ipv4",
"sniff": true,
"sniff_override_destination": $sniffer
}
@@ -746,6 +749,7 @@ EOF
"inet4_address": "172.19.0.1/30",
"auto_route": false,
"stack": "system",
"domain_strategy":"prefer_ipv4",
"sniff": true,
"sniff_override_destination": $sniffer
}
@@ -901,6 +905,9 @@ start_ipt_route() { #iptables-route通用工具
}
#创建新的shellcrash链表
$1 -t $2 -N $4
#过滤dns
$1 -t $2 -A $4 -p tcp --dport 53 -j RETURN
$1 -t $2 -A $4 -p udp --dport 53 -j RETURN
#防回环
$1 -t $2 -A $4 -m mark --mark $routing_mark -j RETURN
[ "$3" = 'OUTPUT' ] && for gid in 453 7890; do
@@ -1126,6 +1133,9 @@ start_nft_route() { #nftables-route通用工具
[ "$1" = 'output' ] && HOST_IP="127.0.0.0/8, $(echo $local_ipv4 | sed 's/ /, /g')"
#添加新链
nft add chain inet shellcrash $1 { type $3 hook $2 priority $4 \; }
#过滤dns
nft add rule inet shellcrash $1 tcp dport 53 return
nft add rule inet shellcrash $1 udp dport 53 return
#防回环
nft add rule inet shellcrash $1 meta mark $routing_mark return
nft add rule inet shellcrash $1 meta skgid 7890 return
@@ -1650,11 +1660,6 @@ bfstart() { #启动前
routing_mark=$((fwmark + 2))
#启动前等待
[ ! -f "$TMPDIR"/crash_start_time ] && {
#延迟启动
[ -n "$start_delay" ] && [ "$start_delay" -gt 0 ] && {
logger "ShellCrash将延迟$start_delay秒启动" 31 pushoff
sleep $start_delay
}
#检测网络连接
network_check
}
@@ -1712,6 +1717,11 @@ bfstart() { #启动前
}
afstart() { #启动后
[ -z "$firewall_area" ] && firewall_area=1
#延迟启动
[ -n "$start_delay" ] && [ "$start_delay" -gt 0 ] && {
logger "ShellCrash将延迟$start_delay秒启动" 31 pushoff
sleep $start_delay
}
#设置循环检测面板端口以判定服务启动是否成功
i=1
while [ -z "$test" -a "$i" -lt 10 ]; do