mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-11-15 21:13:00 +08:00
💋 Sync 2026-10-16 23:55:30
This commit is contained in:
github-actions[bot] committed
1 parent
76f10c2a74
commit
1849cc6156
254 files changed
+25484
-8840
No files matched your search
@@ -1,35 +1,39 @@
|
||||
#!/bin/sh
|
||||
|
||||
[ "$ACTION" = "ifup" ] || [ "$ACTION" = "ifupdate" ] || exit 0
|
||||
[ -n "$DEVICE" ] || exit 0
|
||||
|
||||
. /usr/share/passwall2/utils.sh
|
||||
|
||||
([ "$(get_cache_var "ENABLED_DEFAULT_ACL")" = "1" ] || [ "$(get_cache_var "ENABLED_ACLS")" = "1" ]) && [ -f ${LOCK_PATH}/${CONFIG}_ready.lock ] && {
|
||||
[ -f "${LOCK_PATH}/${CONFIG}_ready.lock" ] || exit 0
|
||||
[ "$(get_cache_var "ENABLED_DEFAULT_ACL")" = "1" ] || [ "$(get_cache_var "ENABLED_ACLS")" = "1" ] || exit 0
|
||||
|
||||
default_device=$(ip route show default 2>/dev/null | awk -F 'dev ' '{print $2}' | awk '{print $1}' | head -n1)
|
||||
default6_device=$(ip -6 route show default 2>/dev/null | awk -F 'dev ' '{print $2}' | awk '{print $1}' | head -n1)
|
||||
( [ "$default_device" = "$DEVICE" ] || [ "$default6_device" = "$DEVICE" ] ) && {
|
||||
default_device=$(ip route show default 2>/dev/null | awk '{ for (i = 1; i < NF; i++) if ($i == "dev") { print $(i + 1); break } exit }')
|
||||
default6_device=$(ip -6 route show default 2>/dev/null | awk '{ for (i = 1; i < NF; i++) if ($i == "dev") { print $(i + 1); break } exit }')
|
||||
[ "$default_device" = "$DEVICE" ] || [ "$default6_device" = "$DEVICE" ] || exit 0
|
||||
|
||||
if [ "$ACTION" = "ifupdate" ]; then
|
||||
USE_TABLES=$(get_cache_var "USE_TABLES")
|
||||
[ -n "$USE_TABLES" ] && { ${APP_PATH}/${USE_TABLES}.sh update_wan_sets >/dev/null 2>&1 & }
|
||||
exit 0
|
||||
fi
|
||||
if [ "$ACTION" = "ifupdate" ]; then
|
||||
USE_TABLES=$(get_cache_var "USE_TABLES")
|
||||
[ -n "$USE_TABLES" ] && { "${APP_PATH}/${USE_TABLES}.sh" update_wan_sets >/dev/null 2>&1 & }
|
||||
exit 0
|
||||
fi
|
||||
|
||||
[ ! -d ${LOCK_PATH} ] && mkdir -p ${LOCK_PATH}
|
||||
LOCK_FILE="${LOCK_PATH}/${CONFIG}_ifup.lock"
|
||||
if [ -s ${LOCK_FILE} ]; then
|
||||
SPID=$(cat ${LOCK_FILE})
|
||||
if [ -e /proc/${SPID}/status ]; then
|
||||
exit 1
|
||||
fi
|
||||
cat /dev/null > ${LOCK_FILE}
|
||||
fi
|
||||
echo $$ > ${LOCK_FILE}
|
||||
|
||||
/etc/init.d/${CONFIG} restart >/dev/null 2>&1 &
|
||||
logger -p notice -t network -s "${CONFIG}: restart when $INTERFACE ifup"
|
||||
|
||||
rm -rf ${LOCK_FILE}
|
||||
}
|
||||
mkdir -p "$LOCK_PATH" || {
|
||||
logger -p err -t network -s "${CONFIG}: cannot create lock directory $LOCK_PATH"
|
||||
exit 1
|
||||
}
|
||||
|
||||
(
|
||||
command exec 9>"${LOCK_PATH}/${CONFIG}_ifup.lock" || {
|
||||
logger -p err -t network -s "${CONFIG}: cannot open ifup lock"
|
||||
exit 1
|
||||
}
|
||||
flock -xn 9 || exit 0
|
||||
|
||||
# Keep this lock file: removing it would allow locks on different inodes.
|
||||
# The worker holds the lock until restart returns; children must not inherit it.
|
||||
logger -p notice -t network -s "${CONFIG}: restart when $INTERFACE ifup" 9>&-
|
||||
"/etc/init.d/${CONFIG}" restart 9>&-
|
||||
) </dev/null >/dev/null 2>&1 &
|
||||
|
||||
exit 0
|
||||
@@ -30,9 +30,26 @@ local has_ssr = api.is_finded("ssr-local") and api.is_finded("ssr-redir")
|
||||
local has_singbox = api.finded_com("sing-box")
|
||||
local has_xray = api.finded_com("xray")
|
||||
local DEFAULT_ALLOWINSECURE = true
|
||||
local DEFAULT_FILTER_KEYWORD_MODE = uci_get("@global_subscribe[0]", "filter_keyword_mode") or "0"
|
||||
local DEFAULT_FILTER_KEYWORD_DISCARD_LIST = uci_get("@global_subscribe[0]", "filter_discard_list") or {}
|
||||
local DEFAULT_FILTER_KEYWORD_KEEP_LIST = uci_get("@global_subscribe[0]", "filter_keep_list") or {}
|
||||
-- Expand each DynamicList row, preserving spaces and ignoring empty or duplicate keywords.
|
||||
local function split_filter_keywords(list)
|
||||
local keywords, seen = {}, {}
|
||||
if type(list) == "string" then list = {list} end
|
||||
for _, row in ipairs(list or {}) do
|
||||
for keyword in row:gmatch("[^|]+") do
|
||||
if not seen[keyword] then
|
||||
seen[keyword] = true
|
||||
keywords[#keywords + 1] = keyword
|
||||
end
|
||||
end
|
||||
end
|
||||
return keywords
|
||||
end
|
||||
|
||||
local DEFAULT_FILTER_KEYWORD = {
|
||||
mode = uci_get("@global_subscribe[0]", "filter_keyword_mode") or "0",
|
||||
discard_list = split_filter_keywords(uci_get("@global_subscribe[0]", "filter_discard_list")),
|
||||
keep_list = split_filter_keywords(uci_get("@global_subscribe[0]", "filter_keep_list"))
|
||||
}
|
||||
-- Nodes should be retrieved using the core type (if not set on the node subscription page, the default type will be used automatically).
|
||||
local DEFAULT_SS_TYPE = api.get_core("ss_type", {{has_ss_rust,"shadowsocks-rust"},{has_singbox,"sing-box"},{has_xray,"xray"}})
|
||||
local DEFAULT_TROJAN_TYPE = api.get_core("trojan_type", {{has_singbox,"sing-box"},{has_xray,"xray"}})
|
||||
@@ -44,71 +61,38 @@ local core_has = {
|
||||
["sing-box"] = has_singbox,
|
||||
["shadowsocks-rust"] = has_ss_rust,
|
||||
}
|
||||
-- Determine whether to filter node keywords
|
||||
local function is_filter_keyword(sub_cfg, value)
|
||||
local mode = DEFAULT_FILTER_KEYWORD_MODE
|
||||
local discard_list = DEFAULT_FILTER_KEYWORD_DISCARD_LIST
|
||||
local keep_list = DEFAULT_FILTER_KEYWORD_KEEP_LIST
|
||||
if sub_cfg then
|
||||
local filter_keyword_mode = sub_cfg.filter_keyword_mode or "5" -- 5 is global
|
||||
if filter_keyword_mode == "0" then
|
||||
mode = "0"
|
||||
elseif filter_keyword_mode == "1" then
|
||||
mode = "1"
|
||||
discard_list = sub_cfg.filter_discard_list or {}
|
||||
elseif filter_keyword_mode == "2" then
|
||||
mode = "2"
|
||||
keep_list = sub_cfg.filter_keep_list or {}
|
||||
elseif filter_keyword_mode == "3" then
|
||||
mode = "3"
|
||||
keep_list = sub_cfg.filter_keep_list or {}
|
||||
discard_list = sub_cfg.filter_discard_list or {}
|
||||
elseif filter_keyword_mode == "4" then
|
||||
mode = "4"
|
||||
keep_list = sub_cfg.filter_keep_list or {}
|
||||
discard_list = sub_cfg.filter_discard_list or {}
|
||||
-- Prepare once per subscription; mode 5 or an unset mode inherits the global filter.
|
||||
local function prepare_keyword_filter(sub_cfg)
|
||||
local mode = sub_cfg and sub_cfg.filter_keyword_mode
|
||||
if mode == "0" or mode == "1" or mode == "2" or mode == "3" or mode == "4" then
|
||||
return {
|
||||
mode = mode,
|
||||
discard_list = split_filter_keywords(sub_cfg.filter_discard_list),
|
||||
keep_list = split_filter_keywords(sub_cfg.filter_keep_list)
|
||||
}
|
||||
end
|
||||
return DEFAULT_FILTER_KEYWORD
|
||||
end
|
||||
|
||||
local function match_filter_keywords(value, keywords)
|
||||
for _, keyword in ipairs(keywords) do
|
||||
if value:find(keyword, 1, true) then
|
||||
return true
|
||||
end
|
||||
end
|
||||
if mode == "1" then
|
||||
for k,v in ipairs(discard_list) do
|
||||
if value:find(v, 1, true) then
|
||||
return true
|
||||
end
|
||||
end
|
||||
elseif mode == "2" then
|
||||
local result = true
|
||||
for k,v in ipairs(keep_list) do
|
||||
if value:find(v, 1, true) then
|
||||
result = false
|
||||
end
|
||||
end
|
||||
return result
|
||||
elseif mode == "3" then
|
||||
local result = false
|
||||
for k,v in ipairs(discard_list) do
|
||||
if value:find(v, 1, true) then
|
||||
result = true
|
||||
end
|
||||
end
|
||||
for k,v in ipairs(keep_list) do
|
||||
if value:find(v, 1, true) then
|
||||
result = false
|
||||
end
|
||||
end
|
||||
return result
|
||||
elseif mode == "4" then
|
||||
local result = true
|
||||
for k,v in ipairs(keep_list) do
|
||||
if value:find(v, 1, true) then
|
||||
result = false
|
||||
end
|
||||
end
|
||||
for k,v in ipairs(discard_list) do
|
||||
if value:find(v, 1, true) then
|
||||
result = true
|
||||
end
|
||||
end
|
||||
return result
|
||||
return false
|
||||
end
|
||||
|
||||
-- Decide whether to discard a parsed node using the current subscription's filter.
|
||||
local function is_filter_keyword(filter, value)
|
||||
if filter.mode == "1" then
|
||||
return match_filter_keywords(value, filter.discard_list)
|
||||
elseif filter.mode == "2" then
|
||||
return not match_filter_keywords(value, filter.keep_list)
|
||||
elseif filter.mode == "3" then
|
||||
return match_filter_keywords(value, filter.discard_list) and not match_filter_keywords(value, filter.keep_list)
|
||||
elseif filter.mode == "4" then
|
||||
return match_filter_keywords(value, filter.discard_list) or not match_filter_keywords(value, filter.keep_list)
|
||||
end
|
||||
return false
|
||||
end
|
||||
@@ -2520,6 +2504,7 @@ local function parse_link(raw, add_mode, group, sub_cfg)
|
||||
if sub_cfg then
|
||||
cfgid = sub_cfg[".name"]
|
||||
end
|
||||
local keyword_filter = add_mode == "2" and prepare_keyword_filter(sub_cfg)
|
||||
local nodes, szType, clashTable
|
||||
local node_list = {}
|
||||
-- ssd appear to be in this format, starting with ssd://.
|
||||
@@ -2563,7 +2548,7 @@ local function parse_link(raw, add_mode, group, sub_cfg)
|
||||
log(2, i18n.translatef("Discard node: %s, Reason:", node.remarks) .. " " .. node.error_msg)
|
||||
elseif not node.type then
|
||||
log(2, i18n.translatef("Discard node: %s, Reason:", node.remarks) .. " " .. i18n.translatef("No usable binary was found."))
|
||||
elseif (add_mode == "2" and is_filter_keyword(sub_cfg, node.remarks)) or not node.address or node.remarks == "NULL" or node.address == "127.0.0.1" or
|
||||
elseif (add_mode == "2" and is_filter_keyword(keyword_filter, node.remarks)) or not node.address or node.remarks == "NULL" or node.address == "127.0.0.1" or
|
||||
(not datatypes.hostname(node.address) and not (api.is_ip(node.address))) then
|
||||
log(2, i18n.translatef("Discard filter nodes: %s type node %s", node.type, node.remarks))
|
||||
else
|
||||
|
||||
Reference in new issue
Block a user