mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-11-16 21:43:33 +08:00
🌈 Sync 2026-04-08 22:17:33
This commit is contained in:
1 parent
babac663b9
commit
5fb3abba3a
23 files changed
+1227
-868
No files matched your search
@@ -28,6 +28,7 @@ function index()
|
||||
entry({"admin", "services", appname, "show"}, call("show_menu")).leaf = true
|
||||
entry({"admin", "services", appname, "hide"}, call("hide_menu")).leaf = true
|
||||
entry({"admin", "services", appname, "ip"}, call('check_ip')).leaf = true
|
||||
entry({"admin", "services", appname, "adblock_refresh"}, call('adblock_refresh')).leaf = true
|
||||
local e
|
||||
if uci:get(appname, "@global[0]", "hide_from_luci") ~= "1" then
|
||||
e = entry({"admin", "services", appname}, alias("admin", "services", appname, "settings"), _("Pass Wall"), -1)
|
||||
@@ -296,6 +297,26 @@ function clear_log()
|
||||
luci.sys.call("echo '' > /tmp/log/passwall.log")
|
||||
end
|
||||
|
||||
function adblock_refresh()
|
||||
local icount = 0
|
||||
|
||||
local status = luci.sys.call("/usr/share/passwall/adblock.sh >/dev/null 2>&1")
|
||||
if status == 0 then
|
||||
icount = tonumber(luci.sys.exec("wc -l < /usr/share/passwall/rules/block_host"))
|
||||
if icount>0 then
|
||||
retstring = tostring(math.ceil(icount))
|
||||
else
|
||||
retstring = "-1"
|
||||
end
|
||||
elseif status == 2 then
|
||||
retstring = "0"
|
||||
else
|
||||
retstring = "-1"
|
||||
end
|
||||
luci.http.prepare_content("application/json")
|
||||
luci.http.write_json({ret=retstring})
|
||||
end
|
||||
|
||||
function check_site(host, port)
|
||||
local nixio = require "nixio"
|
||||
local socket = nixio.socket("inet", "stream")
|
||||
|
||||
@@ -547,6 +547,27 @@ function o.cfgvalue(self, section)
|
||||
api.url("flush_set") .. "?redirect=1&reload=1", set_title)
|
||||
end
|
||||
|
||||
o = s:taboption("DNS", Flag, "adblock", translate("Enable adblock"))
|
||||
o.rmempty = false
|
||||
|
||||
local UD="" rule_count="0"
|
||||
if nixio.fs.access("/usr/share/passwall/rules/block_host") then
|
||||
UD = os.date("%Y-%m-%d %H:%M", nixio.fs.stat("/usr/share/passwall/rules/block_host").ctime)
|
||||
rule_count = tonumber(luci.sys.exec("wc -l < /usr/share/passwall/rules/block_host"))
|
||||
end
|
||||
o = s:taboption("DNS", DummyValue, "refresh_data", translate("Subscribe Rules Data"))
|
||||
o.rawhtml = true
|
||||
o.template = appname .. "/global/adblock_refresh"
|
||||
o.value = rule_count.." "..translate("Records")
|
||||
o.description = string.format(translate("Domain / DNSMASQ rules auto-convert").."<br/><strong>"..translate("Last Update Checked")..":</strong> %s<br/>",UD)
|
||||
o:depends("adblock",1)
|
||||
|
||||
o = s:taboption("DNS", DynamicList, "ad_url", translate("Anti-AD Rules Subscribe"))
|
||||
o:value("https://cdn.jsdelivr.net/gh/privacy-protection-tools/anti-AD/anti-ad-domains.txt", translate("anti-AD"))
|
||||
o:value("https://cdn.jsdelivr.net/gh/neodevpro/neodevhost/domain", translate("NEO DEV HOST"))
|
||||
o.default = "https://cdn.jsdelivr.net/gh/privacy-protection-tools/anti-AD/anti-ad-domains.txt"
|
||||
o:depends("adblock",1)
|
||||
|
||||
s:tab("Proxy", translate("Mode"))
|
||||
|
||||
o = s:taboption("Proxy", Flag, "use_direct_list", translatef("Use %s", translate("Direct List")))
|
||||
|
||||
@@ -152,7 +152,7 @@ o.validate = function(self, value)
|
||||
end
|
||||
|
||||
---- Block Hosts
|
||||
local block_host = path .. "block_host"
|
||||
local block_host = path .. "my_block_host"
|
||||
o = s:taboption("block_list", TextValue, "block_host", "", "<font color='red'>" .. translate("These had been joined websites will be block. Please input the domain names of websites, every line can input only one website domain. For example: twitter.com.") .. "</font>")
|
||||
o.rows = 15
|
||||
o.wrap = "off"
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
<%+cbi/valueheader%>
|
||||
<script type="text/javascript">//<![CDATA[
|
||||
function refresh_data(btn,dataname)
|
||||
{
|
||||
btn.disabled=true;
|
||||
btn.value='<%:Refresh...%>';
|
||||
murl=dataname;
|
||||
XHR.get('<%=luci.passwall.api.url("adblock_refresh")%>',
|
||||
{set:murl},
|
||||
function(x,rv)
|
||||
{
|
||||
var s=document.getElementById(dataname+'-status');
|
||||
if (s)
|
||||
{
|
||||
if (rv.ret=="0")
|
||||
s.innerHTML="<font color='green'>"+"<%:No new data!%> "+"</font>";
|
||||
else if(rv.ret=="-1")
|
||||
{
|
||||
s.innerHTML="<font color='red'>"+"<%:Refresh Error!%> "+"</font>";
|
||||
}
|
||||
else{
|
||||
s.innerHTML="<font color='green'>"+"<%:Refresh OK!%> "+"<%:Total Records:%>"+rv.ret+"</font>";
|
||||
}
|
||||
}
|
||||
btn.disabled=false;
|
||||
btn.value='<%:Refresh Data%>';
|
||||
}
|
||||
);
|
||||
return false;
|
||||
}
|
||||
//]]></script>
|
||||
<input type="button" class="cbi-button cbi-input-reload" value="<%:Refresh Data%>" onclick="return refresh_data(this,'<%=self.option%>')"/>
|
||||
<span id="<%=self.option%>-status"><em><%=self.value%></em></span>
|
||||
<%+cbi/valuefooter%>
|
||||
@@ -1,6 +1,42 @@
|
||||
msgid "Pass Wall"
|
||||
msgstr "PassWall"
|
||||
|
||||
msgid "Enable adblock"
|
||||
msgstr "启用广告屏蔽"
|
||||
|
||||
msgid "Records"
|
||||
msgstr "条记录"
|
||||
|
||||
msgid "Refresh..."
|
||||
msgstr "正在更新,请稍候.."
|
||||
|
||||
msgid "No new data!"
|
||||
msgstr "你已经是最新数据,无需更新!"
|
||||
|
||||
msgid "Refresh Error!"
|
||||
msgstr "更新失败!"
|
||||
|
||||
msgid "Refresh OK!"
|
||||
msgstr "更新成功!"
|
||||
|
||||
msgid "Total Records:"
|
||||
msgstr "新的总规则数:"
|
||||
|
||||
msgid "Refresh Data"
|
||||
msgstr "更新订阅规则"
|
||||
|
||||
msgid "Last Update Checked"
|
||||
msgstr "上一次规则更新时间"
|
||||
|
||||
msgid "Subscribe Rules Data"
|
||||
msgstr "去广告规则"
|
||||
|
||||
msgid "AdGuardHome / Host / DNSMASQ / Domain rules auto-convert"
|
||||
msgstr "Domain / DNSMASQ 规则自动识别, 自动去重"
|
||||
|
||||
msgid "Anti-AD Rules Subscribe"
|
||||
msgstr "广告过滤规则订阅 URL"
|
||||
|
||||
msgid "Auto"
|
||||
msgstr "自动"
|
||||
|
||||
|
||||
@@ -5,6 +5,9 @@ LOCK_FILE="/var/lock/ad_download.lock"
|
||||
TMP_DIR="/tmp/ad_download"
|
||||
RULES_PATH="/usr/share/passwall/rules"
|
||||
|
||||
# ========== 白名单:合并后需要排除的域名 ==========
|
||||
WHITELIST="ip-api.com"
|
||||
|
||||
# ========== 加锁,防止重复运行 ==========
|
||||
exec 200>"$LOCK_FILE"
|
||||
if ! flock -n 200; then
|
||||
@@ -94,32 +97,42 @@ INDEX=0
|
||||
for url in $AD_URLS; do
|
||||
[ -z "$url" ] && continue
|
||||
INDEX=$((INDEX + 1))
|
||||
process_url "$INDEX" "$url" &
|
||||
process_url "$INDEX" "$url"
|
||||
done
|
||||
|
||||
# 等待所有后台任务完成
|
||||
wait
|
||||
|
||||
# ========== 合并、去重、去空行 ==========
|
||||
# ========== 合并、去重、去空行、排除白名单 ==========
|
||||
[ -f $RULES_PATH/my_block_host ] || touch $RULES_PATH/my_block_host
|
||||
if ls "$TMP_DIR"/parsed_*.txt >/dev/null 2>&1; then
|
||||
awk '!seen[$0]++ && NF' "$TMP_DIR"/parsed_*.txt > $RULES_PATH/ads_host
|
||||
COUNT=$(wc -l < "$RULES_PATH/ads_host")
|
||||
echo "========================================"
|
||||
echo "[DONE] 合并完成: $RULES_PATH/ads_host"
|
||||
echo "[DONE] 总域名数: $COUNT"
|
||||
echo "========================================"
|
||||
NEW_FILE="$TMP_DIR/ad_domains_new.txt"
|
||||
awk -v wl="$WHITELIST" '
|
||||
BEGIN {
|
||||
n = split(wl, a, " ")
|
||||
for (i = 1; i <= n; i++) white[a[i]] = 1
|
||||
}
|
||||
NF && !seen[$0]++ && !($0 in white)
|
||||
' "$TMP_DIR"/parsed_*.txt $RULES_PATH/my_block_host > "$NEW_FILE"
|
||||
|
||||
# ========== 比较新旧文件 hash ==========
|
||||
if [ -f "$RULES_PATH/block_host" ]; then
|
||||
OLD_HASH=$(md5sum "$RULES_PATH/block_host" | awk '{print $1}')
|
||||
else
|
||||
OLD_HASH=""
|
||||
fi
|
||||
NEW_HASH=$(md5sum "$NEW_FILE" | awk '{print $1}')
|
||||
|
||||
if [ "$OLD_HASH" = "$NEW_HASH" ]; then
|
||||
rm -f "$NEW_FILE"
|
||||
else
|
||||
[ -s $NEW_FILE ] && {
|
||||
rm -f $RULES_PATH/block_host
|
||||
mv -f "$NEW_FILE" "$RULES_PATH/block_host"
|
||||
/etc/init.d/passwall reload > /dev/null 2>&1 &
|
||||
}
|
||||
fi
|
||||
else
|
||||
echo "[ERROR] 没有成功解析任何文件"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
[ -s $RULES_PATH/ads_host ] && {
|
||||
[ -s $RULES_PATH/my_block_host ] && {
|
||||
rm -f $RULES_PATH/block_host
|
||||
awk '!/^[[:space:]]*(#|$)/ && !seen[$0]++' $RULES_PATH/ads_host $RULES_PATH/my_block_host > $RULES_PATH/block_host
|
||||
} || ln -sf $RULES_PATH/ads_host $RULES_PATH/block_host
|
||||
}
|
||||
[ "$OLD_HASH" != "$NEW_HASH" ] && exit 0 || exit 2
|
||||
|
||||
/etc/init.d/passwall reload > /dev/null 2>&1 &
|
||||
|
||||
exit 0
|
||||
@@ -1085,8 +1085,8 @@ socks_node_switch() {
|
||||
done
|
||||
|
||||
for filename in $(ls ${TMP_SCRIPT_FUNC_PATH}); do
|
||||
cmd=$(cat ${TMP_SCRIPT_FUNC_PATH}/${filename})
|
||||
[ -n "$(echo $cmd | grep "${flag}")" ] && rm -f ${TMP_SCRIPT_FUNC_PATH}/${filename}
|
||||
grep -q "${flag}" "${TMP_SCRIPT_FUNC_PATH}/${filename}" && \
|
||||
rm -f "${TMP_SCRIPT_FUNC_PATH}/${filename}" "${TMP_PATH}/script_rstats/${filename}.count"
|
||||
done
|
||||
local bind_local=$(config_n_get $flag bind_local 0)
|
||||
local bind="0.0.0.0"
|
||||
@@ -1539,6 +1539,14 @@ start_dns() {
|
||||
fi
|
||||
}
|
||||
|
||||
start_adblock() {
|
||||
[ "$(config_t_get global adblock 0)" != "1" ] && {
|
||||
[ -s $RULES_PATH/my_block_host ] && ln -sf $RULES_PATH/my_block_host $RULES_PATH/block_host
|
||||
return
|
||||
}
|
||||
"$APP_PATH/adblock.sh" > /dev/null 2>&1 &
|
||||
}
|
||||
|
||||
start_haproxy() {
|
||||
[ "$(config_t_get global_haproxy balancing_enable 0)" != "1" ] && return
|
||||
haproxy_path=$TMP_PATH/haproxy
|
||||
@@ -1853,6 +1861,7 @@ start() {
|
||||
export ENABLE_DEPRECATED_GEOIP=true
|
||||
export SS_SYSTEM_DNS_RESOLVER_FORCE_BUILTIN=1
|
||||
ulimit -n 65535
|
||||
start_adblock
|
||||
start_haproxy
|
||||
start_socks
|
||||
nftflag=0
|
||||
|
||||
@@ -49,7 +49,7 @@ test_node() {
|
||||
local _type=$(echo $(config_n_get ${node_id} type) | tr 'A-Z' 'a-z')
|
||||
[ -n "${_type}" ] && {
|
||||
local _tmp_port=$(get_new_port 48800 tcp,udp)
|
||||
$APP_FILE run_socks flag="test_node_${node_id}" node=${node_id} bind=127.0.0.1 socks_port=${_tmp_port} config_file=test_node_${node_id}.json
|
||||
NO_REC_PROCESS=1 $APP_FILE run_socks flag="test_node_${node_id}" node=${node_id} bind=127.0.0.1 socks_port=${_tmp_port} config_file=test_node_${node_id}.json
|
||||
local curlx="socks5h://127.0.0.1:${_tmp_port}"
|
||||
sleep 1s
|
||||
local _proxy_status=$(test_url "${probe_url}" ${retry_num} ${connect_timeout} "-x $curlx")
|
||||
|
||||
@@ -57,7 +57,7 @@ url_test_node() {
|
||||
}
|
||||
else
|
||||
local _tmp_port=$(get_new_port 48900 tcp,udp)
|
||||
/usr/share/${CONFIG}/app.sh run_socks flag="url_test_${node_id}" node=${node_id} bind=127.0.0.1 socks_port=${_tmp_port} config_file=url_test_${node_id}.json
|
||||
NO_REC_PROCESS=1 /usr/share/${CONFIG}/app.sh run_socks flag="url_test_${node_id}" node=${node_id} bind=127.0.0.1 socks_port=${_tmp_port} config_file=url_test_${node_id}.json
|
||||
local curlx="socks5h://127.0.0.1:${_tmp_port}"
|
||||
fi
|
||||
sleep 1s
|
||||
|
||||
@@ -455,6 +455,7 @@ ln_run() {
|
||||
${file_func:-echolog " - ${ln_name}"} "$@" 2>&1 | logger -t PASSWALL_${protocol}_${ln_name} &
|
||||
fi
|
||||
fi
|
||||
[ -n "$NO_REC_PROCESS" ] && return
|
||||
process_count=$(ls $TMP_SCRIPT_FUNC_PATH | wc -l)
|
||||
process_count=$((process_count + 1))
|
||||
echo "${file_func:-echolog " - ${ln_name}"} $@ >${output}" > $TMP_SCRIPT_FUNC_PATH/$process_count
|
||||
|
||||
Reference in new issue
Block a user