mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-10-30 14:55:13 +08:00
🎉 Sync 2026-08-28 01:19:01
This commit is contained in:
github-actions[bot] committed
1 parent
3ebef8b234
commit
a0bd643038
27 files changed
+202
-141
No files matched your search
@@ -69,7 +69,7 @@ check_run_environment() {
|
||||
|
||||
run_xray() {
|
||||
local flag node redir_port socks_address socks_port socks_username socks_password http_address http_port http_username http_password
|
||||
local dns_listen_port direct_dns_query_strategy remote_dns_protocol remote_dns_udp_server remote_dns_tcp_server remote_dns_doh remote_dns_client_ip remote_dns_detour remote_fakedns remote_dns_query_strategy dns_cache
|
||||
local dns_listen_port direct_dns_query_strategy remote_dns_protocol remote_dns_udp_server remote_dns_udp_port remote_dns_tcp_server remote_dns_tcp_port remote_dns_doh remote_dns_client_ip remote_dns_detour remote_fakedns remote_dns_query_strategy dns_cache
|
||||
local loglevel log_file config_file
|
||||
eval_set_val $@
|
||||
node_protocol=$(config_n_get $node protocol)
|
||||
@@ -100,6 +100,7 @@ run_xray() {
|
||||
}
|
||||
}
|
||||
[ -n "$dns_listen_port" ] && {
|
||||
local dns_msg="DNS[${dns_listen_port}]:($(i18n "Direct DNS: %s" "${AUTO_DNS}")"
|
||||
json_add_string "dns_listen_port" "${dns_listen_port}"
|
||||
[ -n "$dns_cache" ] && json_add_string "dns_cache" "${dns_cache}"
|
||||
[ "${node_protocol}" = "_shunt" ] && local write_ipset_direct=$(config_n_get $node write_ipset_direct 0)
|
||||
@@ -129,24 +130,16 @@ run_xray() {
|
||||
set_cache_var "node_${node}_direct_nftset6" "${direct_nftset6}"
|
||||
}
|
||||
}
|
||||
[ "$remote_fakedns" = "1" ] && {
|
||||
json_add_string "remote_dns_fake" "1"
|
||||
json_add_string "remote_dns_fake_strategy" "${remote_dns_query_strategy}"
|
||||
}
|
||||
case "$remote_dns_protocol" in
|
||||
udp)
|
||||
local _dns=$(get_first_dns remote_dns_udp_server 53 | sed 's/#/:/g')
|
||||
local _dns_address=$(echo ${_dns} | awk -F ':' '{print $1}')
|
||||
local _dns_port=$(echo ${_dns} | awk -F ':' '{print $2}')
|
||||
json_add_string "remote_dns_udp_port" "${_dns_port}"
|
||||
json_add_string "remote_dns_udp_server" "${_dns_address}"
|
||||
json_add_string "remote_dns_udp_server" "${remote_dns_udp_server}"
|
||||
json_add_string "remote_dns_udp_port" "${remote_dns_udp_port}"
|
||||
dns_msg="${dns_msg} $(i18n "Remote DNS: %s" "udp://${remote_dns_udp_server}:${remote_dns_udp_port}")"
|
||||
;;
|
||||
tcp)
|
||||
local _dns=$(get_first_dns remote_dns_tcp_server 53 | sed 's/#/:/g')
|
||||
local _dns_address=$(echo ${_dns} | awk -F ':' '{print $1}')
|
||||
local _dns_port=$(echo ${_dns} | awk -F ':' '{print $2}')
|
||||
json_add_string "remote_dns_tcp_port" "${_dns_port}"
|
||||
json_add_string "remote_dns_tcp_server" "${_dns_address}"
|
||||
json_add_string "remote_dns_tcp_server" "${remote_dns_tcp_server}"
|
||||
json_add_string "remote_dns_tcp_port" "${remote_dns_tcp_port}"
|
||||
dns_msg="${dns_msg} $(i18n "Remote DNS: %s" "tcp://${remote_dns_tcp_server}:${remote_dns_tcp_port}")"
|
||||
;;
|
||||
doh)
|
||||
local _doh_url=$(echo $remote_dns_doh | awk -F ',' '{print $1}')
|
||||
@@ -162,11 +155,18 @@ run_xray() {
|
||||
json_add_string "remote_dns_doh_url" "${_doh_url}"
|
||||
json_add_string "remote_dns_doh_host" "${_doh_host}"
|
||||
[ -n "$_doh_bootstrap" ] && json_add_string "remote_dns_doh_ip" "${_doh_bootstrap}"
|
||||
dns_msg="${dns_msg} $(i18n "Remote DNS: %s" "${_doh_url}")"
|
||||
;;
|
||||
esac
|
||||
[ "$remote_fakedns" = "1" ] && {
|
||||
json_add_string "remote_dns_fake" "1"
|
||||
json_add_string "remote_dns_fake_strategy" "${remote_dns_query_strategy}"
|
||||
dns_msg="${dns_msg} + FakeDNS "
|
||||
}
|
||||
[ -n "$remote_dns_detour" ] && json_add_string "remote_dns_detour" "${remote_dns_detour}"
|
||||
[ -n "$remote_dns_query_strategy" ] && json_add_string "remote_dns_query_strategy" "${remote_dns_query_strategy}"
|
||||
[ -n "$remote_dns_client_ip" ] && json_add_string "remote_dns_client_ip" "${remote_dns_client_ip}"
|
||||
log_out="${dns_msg})"
|
||||
}
|
||||
json_add_string "direct_dns_udp_port" "${DIRECT_DNS_UDP_PORT}"
|
||||
json_add_string "direct_dns_udp_server" "${DIRECT_DNS_UDP_SERVER}"
|
||||
@@ -176,6 +176,7 @@ run_xray() {
|
||||
json_add_string "redir_port" "${redir_port}"
|
||||
set_cache_var "node_${node}_redir_port" "${redir_port}"
|
||||
json_add_string "tcp_proxy_way" "${TCP_PROXY_WAY}"
|
||||
[ -n "${log_out}" ] && log_out="Xray[${redir_port}] ${log_out}"
|
||||
}
|
||||
|
||||
json_add_string "node" "${node}"
|
||||
@@ -189,6 +190,8 @@ run_xray() {
|
||||
$XRAY_BIN run -test -c "$config_file" > $test_log_file; local status=$?
|
||||
if [ "${status}" == 0 ]; then
|
||||
ln_run ${QUEUE_RUN} "$XRAY_BIN" xray $log_file run -c "$config_file"
|
||||
[ -n "${log_out}" ] && log 2 ${log_out}
|
||||
unset log_out
|
||||
else
|
||||
_error_log_file=$test_log_file
|
||||
return ${status}
|
||||
@@ -197,7 +200,7 @@ run_xray() {
|
||||
|
||||
run_singbox() {
|
||||
local flag node redir_port socks_address socks_port socks_username socks_password http_address http_port http_username http_password
|
||||
local dns_listen_port direct_dns_query_strategy remote_dns_protocol remote_dns_udp_server remote_dns_tcp_server remote_dns_doh remote_dns_client_ip remote_dns_detour remote_fakedns remote_dns_query_strategy remote_rewrite_ttl dns_cache
|
||||
local dns_listen_port direct_dns_query_strategy remote_dns_protocol remote_dns_udp_server remote_dns_udp_port remote_dns_tcp_server remote_dns_tcp_port remote_dns_doh remote_dns_client_ip remote_dns_detour remote_fakedns remote_dns_query_strategy remote_rewrite_ttl dns_cache
|
||||
local loglevel log_file config_file
|
||||
eval_set_val $@
|
||||
local type=$(echo $(config_n_get $node type) | tr 'A-Z' 'a-z')
|
||||
@@ -239,6 +242,9 @@ run_singbox() {
|
||||
}
|
||||
}
|
||||
[ -n "$dns_listen_port" ] && {
|
||||
local dns_msg="DNS[${dns_listen_port}]:($(i18n "Direct DNS: %s" "${AUTO_DNS}")"
|
||||
json_add_string "dns_listen_port" "${dns_listen_port}"
|
||||
[ -n "$dns_cache" ] && json_add_string "dns_cache" "${dns_cache}"
|
||||
[ "${node_protocol}" = "_shunt" ] && local write_ipset_direct=$(config_n_get $node write_ipset_direct 0)
|
||||
[ "${write_ipset_direct}" = "1" ] && {
|
||||
direct_dnsmasq_listen_port=$(get_new_port auto)
|
||||
@@ -270,21 +276,17 @@ run_singbox() {
|
||||
case "$remote_dns_protocol" in
|
||||
udp|\
|
||||
quic)
|
||||
local _dns=$(get_first_dns remote_dns_udp_server 53 | sed 's/#/:/g')
|
||||
local _dns_address=$(echo ${_dns} | awk -F ':' '{print $1}')
|
||||
local _dns_port=$(echo ${_dns} | awk -F ':' '{print $2}')
|
||||
json_add_string "remote_dns_udp_port" "${_dns_port}"
|
||||
json_add_string "remote_dns_udp_server" "${_dns_address}"
|
||||
json_add_string "remote_dns_udp_server" "${remote_dns_udp_server}"
|
||||
json_add_string "remote_dns_udp_port" "${remote_dns_udp_port}"
|
||||
[ "$remote_dns_protocol" == "quic" ] && json_add_string "remote_dns_quic" "1"
|
||||
dns_msg="${dns_msg} $(i18n "Remote DNS: %s" "${remote_dns_protocol}://${remote_dns_udp_server}:${remote_dns_udp_port}")"
|
||||
;;
|
||||
tcp|\
|
||||
tls)
|
||||
local _dns=$(get_first_dns remote_dns_tcp_server 53 | sed 's/#/:/g')
|
||||
local _dns_address=$(echo ${_dns} | awk -F ':' '{print $1}')
|
||||
local _dns_port=$(echo ${_dns} | awk -F ':' '{print $2}')
|
||||
json_add_string "remote_dns_tcp_port" "${_dns_port}"
|
||||
json_add_string "remote_dns_tcp_server" "${_dns_address}"
|
||||
json_add_string "remote_dns_tcp_server" "${remote_dns_tcp_server}"
|
||||
json_add_string "remote_dns_tcp_port" "${remote_dns_tcp_port}"
|
||||
[ "$remote_dns_protocol" == "tls" ] && json_add_string "remote_dns_tls" "1"
|
||||
dns_msg="${dns_msg} $(i18n "Remote DNS: %s" "${remote_dns_protocol}://${remote_dns_tcp_server}:${remote_dns_tcp_port}")"
|
||||
;;
|
||||
doh|\
|
||||
http3)
|
||||
@@ -302,17 +304,19 @@ run_singbox() {
|
||||
json_add_string "remote_dns_doh_url" "${_doh_url}"
|
||||
json_add_string "remote_dns_doh_host" "${_doh_host}"
|
||||
[ "$remote_dns_protocol" == "http3" ] && json_add_string "remote_dns_http3" "1"
|
||||
dns_msg="${dns_msg} $(i18n "Remote DNS: %s" "${_doh_url}")"
|
||||
;;
|
||||
esac
|
||||
[ "$remote_fakedns" = "1" ] && {
|
||||
json_add_string "remote_dns_fake" "1"
|
||||
dns_msg="${dns_msg} + FakeDNS "
|
||||
}
|
||||
|
||||
[ -n "$remote_dns_detour" ] && json_add_string "remote_dns_detour" "${remote_dns_detour}"
|
||||
[ -n "$remote_dns_query_strategy" ] && json_add_string "remote_dns_query_strategy" "${remote_dns_query_strategy}"
|
||||
[ -n "$remote_dns_client_ip" ] && json_add_string "remote_dns_client_ip" "${remote_dns_client_ip}"
|
||||
|
||||
[ -n "$dns_listen_port" ] && json_add_string "dns_listen_port" "${dns_listen_port}"
|
||||
[ -n "$dns_cache" ] && json_add_string "dns_cache" "${dns_cache}"
|
||||
[ "$remote_fakedns" = "1" ] && json_add_string "remote_dns_fake" "1"
|
||||
[ -n "$remote_rewrite_ttl" ] && json_add_string "remote_rewrite_ttl" "${remote_rewrite_ttl}"
|
||||
log_out="${dns_msg})"
|
||||
}
|
||||
json_add_string "direct_dns_udp_port" "${DIRECT_DNS_UDP_PORT}"
|
||||
json_add_string "direct_dns_udp_server" "${DIRECT_DNS_UDP_SERVER}"
|
||||
@@ -322,6 +326,7 @@ run_singbox() {
|
||||
json_add_string "redir_port" "${redir_port}"
|
||||
set_cache_var "node_${node}_redir_port" "${redir_port}"
|
||||
json_add_string "tcp_proxy_way" "${TCP_PROXY_WAY}"
|
||||
[ -n "${log_out}" ] && log_out="Sing-Box[${redir_port}] ${log_out}"
|
||||
}
|
||||
|
||||
json_add_string "node" "${node}"
|
||||
@@ -335,6 +340,8 @@ run_singbox() {
|
||||
$SINGBOX_BIN check -c "$config_file" > $test_log_file 2>&1; local status=$?
|
||||
if [ "${status}" == 0 ]; then
|
||||
ln_run ${QUEUE_RUN} "$SINGBOX_BIN" "sing-box" "${log_file}" run -c "$config_file"
|
||||
[ -n "${log_out}" ] && log 2 ${log_out}
|
||||
unset log_out
|
||||
else
|
||||
_error_log_file=$test_log_file
|
||||
return ${status}
|
||||
@@ -803,13 +810,28 @@ run_ipset_dnsmasq() {
|
||||
}
|
||||
|
||||
acl_node() {
|
||||
[ ! -f ${TMP_ACL_PATH}/acl_node_default ] && ENABLED_DEFAULT_ACL=0
|
||||
local acl_node_num=$(jsonfilter -s "${acl_json}" -e '$.node_order[*]' | wc -l)
|
||||
[ "${acl_node_num}" == 0 ] && {
|
||||
ENABLED_DEFAULT_ACL=0
|
||||
ENABLED_ACLS=0
|
||||
return
|
||||
}
|
||||
[ "$(uci -q get dhcp.@dnsmasq[0].dns_redirect)" == "1" ] && {
|
||||
uci -q set ${CONFIG}.@global[0].dnsmasq_dns_redirect='1'
|
||||
uci -q commit ${CONFIG}
|
||||
uci -q set dhcp.@dnsmasq[0].dns_redirect='0'
|
||||
uci -q commit dhcp
|
||||
|
||||
json_init
|
||||
json_add_string "LOG" "0"
|
||||
lua $APP_PATH/helper_dnsmasq.lua restart "$(json_dump)"
|
||||
}
|
||||
local run_func
|
||||
[ -n "${XRAY_BIN}" ] && run_func="run_xray"
|
||||
[ -n "${SINGBOX_BIN}" ] && run_func="run_singbox"
|
||||
local acl_node_num=0
|
||||
for nid in $(jsonfilter -s "${acl_json}" -e '$.node_order[*]'); do
|
||||
[ ! -f ${TMP_ACL_PATH}/acl_node_${nid} ] && continue
|
||||
acl_node_num=$(expr $acl_node_num + 1)
|
||||
local _var=$(cat ${TMP_ACL_PATH}/acl_node_${nid} 2>/dev/null)
|
||||
eval local ${_var}
|
||||
local type=$(echo $(config_n_get $node type) | tr 'A-Z' 'a-z')
|
||||
@@ -851,26 +873,24 @@ acl_node() {
|
||||
uci -q add_list dhcp.@dnsmasq[0].addnmount=${GLOBAL_DNSMASQ_CONF_PATH}
|
||||
uci -q commit dhcp
|
||||
|
||||
json_init
|
||||
json_add_string "LOG" "1"
|
||||
lua $APP_PATH/helper_dnsmasq.lua logic_restart "$(json_dump)"
|
||||
lua $APP_PATH/helper_dnsmasq.lua logic_restart
|
||||
else
|
||||
#Run a copy dnsmasq instance, DNS hijack for that need proxy devices.
|
||||
dnsmasq_port=$(get_new_port auto)
|
||||
run_copy_dnsmasq flag="default" listen_port=${dnsmasq_port} local_dns="${DNSMASQ_LOCAL_DNS}" tun_dns="${DNSMASQ_TUN_DNS}" default_dns="${DNSMASQ_DEFAULT_DNS}"
|
||||
#dhcp.leases to hosts
|
||||
$APP_PATH/lease2hosts.sh > /dev/null 2>&1 &
|
||||
log 2 "Dnsmasq[${dnsmasq_port}]:(127.0.0.1:${dns_listen_port})"
|
||||
fi
|
||||
else
|
||||
dnsmasq_port=$(get_new_port auto)
|
||||
run_copy_dnsmasq flag="${flag}" listen_port=${dnsmasq_port} local_dns="${LOCAL_DNS:-${AUTO_DNS}}" tun_dns="127.0.0.1#${dns_listen_port}" default_dns="${AUTO_DNS}"
|
||||
#dhcp.leases to hostsMore actions
|
||||
$APP_PATH/lease2hosts.sh > /dev/null 2>&1 &
|
||||
log 2 "Dnsmasq[${dnsmasq_port}]:(127.0.0.1:${dns_listen_port})"
|
||||
fi
|
||||
rm -f ${TMP_ACL_PATH}/acl_node_${nid}
|
||||
done
|
||||
[ ! -f ${TMP_ACL_PATH}/acl_node_default ] && ENABLED_DEFAULT_ACL=0
|
||||
[ "${acl_node_num}" == 0 ] && ENABLED_ACLS=0 && ENABLED_DEFAULT_ACL=0
|
||||
}
|
||||
|
||||
start() {
|
||||
@@ -892,16 +912,6 @@ start() {
|
||||
nftflag=0
|
||||
USE_TABLES=""
|
||||
check_run_environment
|
||||
[ "$(uci -q get dhcp.@dnsmasq[0].dns_redirect)" == "1" ] && {
|
||||
uci -q set ${CONFIG}.@global[0].dnsmasq_dns_redirect='1'
|
||||
uci -q commit ${CONFIG}
|
||||
uci -q set dhcp.@dnsmasq[0].dns_redirect='0'
|
||||
uci -q commit dhcp
|
||||
|
||||
json_init
|
||||
json_add_string "LOG" "0"
|
||||
lua $APP_PATH/helper_dnsmasq.lua restart "$(json_dump)"
|
||||
}
|
||||
[ -n "$USE_TABLES" ] && source $APP_PATH/${USE_TABLES}.sh start
|
||||
set_cache_var "USE_TABLES" "$USE_TABLES"
|
||||
if [ "$ENABLED_DEFAULT_ACL" == 1 ] || [ "$ENABLED_ACLS" == 1 ]; then
|
||||
|
||||
@@ -191,6 +191,7 @@ function acl_app(l)
|
||||
local config_path = api.TMP_ACL_PATH .. "/" .. flag
|
||||
local config_file = config_path .. ".json"
|
||||
local log_file = v.log == "0" and "/dev/null" or config_path .. ".log"
|
||||
local dns_server, dns_port = api.parseDNS(v.remote_dns)
|
||||
add_args(run_args, "flag", flag)
|
||||
add_args(run_args, "node", node[".name"])
|
||||
add_args(run_args, "redir_port", v.redir_port)
|
||||
@@ -199,8 +200,10 @@ function acl_app(l)
|
||||
add_args(run_args, "dns_listen_port", v.dns_port)
|
||||
add_args(run_args, "direct_dns_query_strategy", v.direct_dns_query_strategy)
|
||||
add_args(run_args, "remote_dns_protocol", v.remote_dns_protocol)
|
||||
add_args(run_args, "remote_dns_tcp_server", v.remote_dns)
|
||||
add_args(run_args, "remote_dns_udp_server", v.remote_dns)
|
||||
add_args(run_args, "remote_dns_tcp_server", dns_server)
|
||||
add_args(run_args, "remote_dns_tcp_port", dns_port)
|
||||
add_args(run_args, "remote_dns_udp_server", dns_server)
|
||||
add_args(run_args, "remote_dns_udp_port", dns_port)
|
||||
add_args(run_args, "remote_dns_doh", v.remote_dns_doh)
|
||||
add_args(run_args, "remote_dns_client_ip", v.remote_dns_client_ip)
|
||||
add_args(run_args, "remote_dns_detour", v.remote_dns_detour)
|
||||
|
||||
@@ -366,6 +366,6 @@ if arg[1] then
|
||||
if arg[2] then
|
||||
var = jsonc.parse(arg[2])
|
||||
end
|
||||
func(var)
|
||||
func(var or {})
|
||||
end
|
||||
end
|
||||
@@ -256,9 +256,9 @@ add_shunt_t_rule() {
|
||||
}
|
||||
|
||||
load_acl() {
|
||||
log_i18n 1 "Access Control:"
|
||||
acl_json=$(lua $APP_PATH/app_acl.lua)
|
||||
acl_node
|
||||
log_i18n 1 "Access Control:"
|
||||
for sid in $(jsonfilter -s "${acl_json}" -e '$.acl[*].flag'); do
|
||||
eval local $(cat "${TMP_ACL_PATH}/${sid}/var")
|
||||
|
||||
|
||||
@@ -294,9 +294,9 @@ add_shunt_t_rule() {
|
||||
}
|
||||
|
||||
load_acl() {
|
||||
log_i18n 1 "Access Control:"
|
||||
acl_json=$(lua $APP_PATH/app_acl.lua)
|
||||
acl_node
|
||||
log_i18n 1 "Access Control:"
|
||||
for sid in $(jsonfilter -s "${acl_json}" -e '$.acl[*].flag'); do
|
||||
eval $(cat "${TMP_ACL_PATH}/${sid}/var")
|
||||
|
||||
|
||||
@@ -253,28 +253,6 @@ hosts_foreach() {
|
||||
done
|
||||
}
|
||||
|
||||
get_first_dns() {
|
||||
local __hosts_val=${1}; shift 1
|
||||
__first() {
|
||||
[ -z "${2}" ] && return 0
|
||||
echo "${2}#${3}"
|
||||
return 1
|
||||
}
|
||||
eval "hosts_foreach \"${__hosts_val}\" __first \"$@\""
|
||||
}
|
||||
|
||||
get_last_dns() {
|
||||
local __hosts_val=${1}; shift 1
|
||||
local __first __last
|
||||
__every() {
|
||||
[ -z "${2}" ] && return 0
|
||||
__last="${2}#${3}"
|
||||
__first=${__first:-${__last}}
|
||||
}
|
||||
eval "hosts_foreach \"${__hosts_val}\" __every \"$@\""
|
||||
[ "${__first}" == "${__last}" ] || echo "${__last}"
|
||||
}
|
||||
|
||||
check_port_exists() {
|
||||
local port=$1
|
||||
local protocol=$2
|
||||
|
||||
Reference in new issue
Block a user