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

Merge pull request #861 from DustinWin/dev

Browse Source 
修改 sing-box 内核版本判断；格式化内核配置文件；meta 内核域名嗅探优化
This commit is contained in:
juewuy
2025-01-09 15:27:26 +08:00
committed by GitHub
parent 47ec0ec1d9 16db336c06
commit 2dc8e6c2df
1 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
scripts/start.sh
View File

@@ -398,7 +398,7 @@ dns:
fake-ip-filter: fake-ip-filter:
EOF EOF
if [ "$dns_mod" != "redir_host" ]; then if [ "$dns_mod" != "redir_host" ]; then
cat "$CRASHDIR"/configs/fake_ip_filter "$CRASHDIR"/configs/fake_ip_filter.list 2>/dev/null | grep '\.' | sed "s/^/ - '/" | sed "s/$/'/" >>"$TMPDIR"/dns.yaml cat "$CRASHDIR"/configs/fake_ip_filter "$CRASHDIR"/configs/fake_ip_filter.list 2>/dev/null | grep -v '#' | sed "s/^/ - '/" | sed "s/$/'/" >>"$TMPDIR"/dns.yaml
[ "$dns_mod" = "mix" ] && echo ' - "rule-set:geosite-cn"' >>"$TMPDIR"/dns.yaml #插入cn过滤规则 [ "$dns_mod" = "mix" ] && echo ' - "rule-set:geosite-cn"' >>"$TMPDIR"/dns.yaml #插入cn过滤规则
else else
echo " - '+.*'" >>"$TMPDIR"/dns.yaml #使用fake-ip模拟redir_host echo " - '+.*'" >>"$TMPDIR"/dns.yaml #使用fake-ip模拟redir_host
@@ -411,11 +411,11 @@ EOF
EOF EOF
[ -s "$CRASHDIR"/configs/fallback_filter.list ] && { [ -s "$CRASHDIR"/configs/fallback_filter.list ] && {
echo " domain:" >>"$TMPDIR"/dns.yaml echo " domain:" >>"$TMPDIR"/dns.yaml
cat "$CRASHDIR"/configs/fallback_filter.list | grep '\.' | sed "s/^/ - '/" | sed "s/$/'/" >>"$TMPDIR"/dns.yaml cat "$CRASHDIR"/configs/fallback_filter.list | grep -v '#' | sed "s/^/ - '/" | sed "s/$/'/" >>"$TMPDIR"/dns.yaml
} }
} }
#域名嗅探配置 #域名嗅探配置
[ "$sniffer" = "已启用" ] && [ "$crashcore" = "meta" ] && sniffer_set="sniffer: {enable: true, parse-pure-ip: true, skip-domain: [Mijia Cloud], sniff: {tls: {ports: [443, 8443]}, http: {ports: [80, 8080-8880]}, quic: {ports: [443, 8443]}}}" [ "$sniffer" = "已启用" ] && [ "$crashcore" = "meta" ] && sniffer_set="sniffer: {enable: true, parse-pure-ip: true, skip-domain: [Mijia Cloud], sniff: {http: {ports: [80, 8080-8880], override-destination: true}, tls: {ports: [443, 8443]}, quic: {ports: [443, 8443]}}}"
[ "$crashcore" = "clashpre" ] && [ "$dns_mod" = "redir_host" -o "$sniffer" = "已启用" ] && exper="experimental: {ignore-resolve-fail: true, interface-name: en0,sniff-tls-sni: true}" [ "$crashcore" = "clashpre" ] && [ "$dns_mod" = "redir_host" -o "$sniffer" = "已启用" ] && exper="experimental: {ignore-resolve-fail: true, interface-name: en0,sniff-tls-sni: true}"
#生成set.yaml #生成set.yaml
cat >"$TMPDIR"/set.yaml <<EOF cat >"$TMPDIR"/set.yaml <<EOF
@@ -441,8 +441,8 @@ EOF
#NTP劫持 #NTP劫持
cat >>"$TMPDIR"/hosts.yaml <<EOF cat >>"$TMPDIR"/hosts.yaml <<EOF
hosts: hosts:
'time.android.com': 203.107.6.88 'time.android.com': 203.107.6.88
'time.facebook.com': 203.107.6.88 'time.facebook.com': 203.107.6.88
EOF EOF
#加载本机hosts #加载本机hosts
sys_hosts=/etc/hosts sys_hosts=/etc/hosts
@@ -533,11 +533,11 @@ EOF
#mix模式生成rule-providers #mix模式生成rule-providers
[ "$dns_mod" = "mix" ] && ! grep -q 'geosite-cn:' "$TMPDIR"/rule-providers.yaml && ! grep -q 'rule-providers' "$CRASHDIR"/yamls/others.yaml 2>/dev/null && \ [ "$dns_mod" = "mix" ] && ! grep -q 'geosite-cn:' "$TMPDIR"/rule-providers.yaml && ! grep -q 'rule-providers' "$CRASHDIR"/yamls/others.yaml 2>/dev/null && \
cat >>"$TMPDIR"/rule-providers.yaml <<EOF cat >>"$TMPDIR"/rule-providers.yaml <<EOF
geosite-cn: geosite-cn:
type: file type: file
behavior: domain behavior: domain
format: mrs format: mrs
path: geosite-cn.mrs path: geosite-cn.mrs
EOF EOF
#对齐rules中的空格 #对齐rules中的空格
sed -i 's/^ *-/ -/g' "$TMPDIR"/rules.yaml sed -i 's/^ *-/ -/g' "$TMPDIR"/rules.yaml
@@ -602,15 +602,15 @@ EOF
cat >"$TMPDIR"/jsons/add_hosts.json <<EOF cat >"$TMPDIR"/jsons/add_hosts.json <<EOF
{ {
"dns": { "dns": {
"servers": [ "servers": [
{ "tag": "hosts_local", "address": "local", "detour": "DIRECT" } { "tag": "hosts_local", "address": "local", "detour": "DIRECT" }
], ],
"rules": [ "rules": [
{ {
"domain": [$hosts_domain], "domain": [$hosts_domain],
"server": "hosts_local" "server": "hosts_local"
} }
] ]
} }
} }
EOF EOF
@@ -643,20 +643,20 @@ EOF
[ -n "$fake_ip_filter_domain" ] && fake_ip_filter_domain="{ \"domain\": [$fake_ip_filter_domain], \"server\": \"dns_direct\" }," [ -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_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\" },"
if [ -z "$(echo "$core_v" | grep -E '^1\.7.*')" ]; then if [ -z "$(echo "$core_v" | grep -E '(^1\.(8|[89]\d*|\d{2,})\.\d+$)|(^(2|[2-9]\d*|\d{2,})\.([0-9]\d*|\d{2,})\.\d+$)')" ]; then
direct_dns="{ \"rule_set\": [\"geosite-cn\"], \"server\": \"dns_direct\" }," direct_dns="{ \"rule_set\": [\"geosite-cn\"], \"server\": \"dns_direct\" },"
#生成add_rule_set.json #生成add_rule_set.json
[ -z "$(cat "$CRASHDIR"/jsons/*.json | grep -Ei '"tag" *: *"geosite-cn"')" ] && cat >"$TMPDIR"/jsons/add_rule_set.json <<EOF [ -z "$(cat "$CRASHDIR"/jsons/*.json | grep -Ei '"tag" *: *"geosite-cn"')" ] && cat >"$TMPDIR"/jsons/add_rule_set.json <<EOF
{ {
"route": { "route": {
"rule_set": [ "rule_set": [
{ {
"tag": "geosite-cn", "tag": "geosite-cn",
"type": "local", "type": "local",
"format": "binary", "format": "binary",
"path": "geosite-cn.srs" "path": "geosite-cn.srs"
} }
] ]
} }
} }
EOF EOF
@@ -668,33 +668,34 @@ EOF
{ {
"dns": { "dns": {
"servers": [ "servers": [
{ {
"tag": "dns_proxy", "tag": "dns_proxy",
"address": "$dns_proxy", "address": "$dns_proxy",
"strategy": "$strategy", "strategy": "$strategy",
"address_resolver": "dns_resolver" "address_resolver": "dns_resolver"
}, { },
{
"tag": "dns_direct", "tag": "dns_direct",
"address": "$dns_direct", "address": "$dns_direct",
"strategy": "$strategy", "strategy": "$strategy",
"address_resolver": "dns_resolver", "address_resolver": "dns_resolver",
"detour": "DIRECT" "detour": "DIRECT"
}, },
{ "tag": "dns_fakeip", "address": "fakeip" }, { "tag": "dns_fakeip", "address": "fakeip" },
{ "tag": "dns_resolver", "address": "223.5.5.5", "detour": "DIRECT" }, { "tag": "dns_resolver", "address": "223.5.5.5", "detour": "DIRECT" },
{ "tag": "block", "address": "rcode://success" }, { "tag": "block", "address": "rcode://success" },
{ "tag": "local", "address": "local", "detour": "DIRECT" } { "tag": "local", "address": "local", "detour": "DIRECT" }
], ],
"rules": [ "rules": [
{ "outbound": ["any"], "server": "dns_direct" }, { "outbound": ["any"], "server": "dns_direct" },
{ "clash_mode": "Global", "server": "$global_dns", "rewrite_ttl": 1 }, { "clash_mode": "Global", "server": "$global_dns", "rewrite_ttl": 1 },
{ "clash_mode": "Direct", "server": "dns_direct" }, { "clash_mode": "Direct", "server": "dns_direct" },
$fake_ip_filter_domain $fake_ip_filter_domain
$fake_ip_filter_suffix $fake_ip_filter_suffix
$fake_ip_filter_regex $fake_ip_filter_regex
$direct_dns $direct_dns
{ "query_type": [ "A", "AAAA" ], "server": "dns_fakeip", "rewrite_ttl": 1 } { "query_type": [ "A", "AAAA" ], "server": "dns_fakeip", "rewrite_ttl": 1 }
], ],
"final": "dns_proxy", "final": "dns_proxy",
"independent_cache": true, "independent_cache": true,
"reverse_mapping": true, "reverse_mapping": true,
@@ -707,9 +708,9 @@ EOF
{ {
"route": { "route": {
"rules": [ "rules": [
{ "inbound": "dns-in", "outbound": "dns-out" } { "inbound": "dns-in", "outbound": "dns-out" }
], ],
"default_mark": $routing_mark "default_mark": $routing_mark
} }
} }
EOF EOF
@@ -741,21 +742,24 @@ EOF
"tag": "mixed-in", "tag": "mixed-in",
"listen": "::", "listen": "::",
"listen_port": $mix_port, "listen_port": $mix_port,
$userpass $userpass
"sniff": false "sniff": false
}, { },
{
"type": "direct", "type": "direct",
"tag": "dns-in", "tag": "dns-in",
"listen": "::", "listen": "::",
"listen_port": $dns_port "listen_port": $dns_port
}, { },
{
"type": "redirect", "type": "redirect",
"tag": "redirect-in", "tag": "redirect-in",
"listen": "::", "listen": "::",
"listen_port": $redir_port, "listen_port": $redir_port,
"sniff": true, "sniff": true,
"sniff_override_destination": $sniffer "sniff_override_destination": $sniffer
}, { },
{
"type": "tproxy", "type": "tproxy",
"tag": "tproxy-in", "tag": "tproxy-in",
"listen": "::", "listen": "::",
@@ -798,8 +802,8 @@ EOF
{ {
"outbounds": [ "outbounds": [
$add_direct $add_direct
$add_reject $add_reject
$add_dnsout $add_dnsout
] ]
} }
EOF EOF