Backups/immortalwrt-mt798x
1
0
Fork 0
mirror of https://github.com/hanwckf/immortalwrt-mt798x.git synced 2025-01-10 03:09:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

luci-app-passwall: bump to 3.9-43

Browse Source
This commit is contained in:
CN_SZTL 2020-08-25 20:15:33 +08:00
parent b5b0af7434
commit 30afb65702
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
8 changed files with 146 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/lienol/luci-app-passwall/Makefile
View File

@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall
PKG_VERSION:=3.9
PKG_RELEASE:=42
PKG_DATE:=20200822
PKG_RELEASE:=43
PKG_DATE:=20200825
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

9
package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
View File

@ -101,7 +101,7 @@ end
s:tab("DNS", translate("DNS"))
o = s:taboption("DNS", Value, "up_china_dns", translate("Resolver For Local/WhiteList Domains") .. "(UDP)")
o.description = translate("Forced to local filter mode on 'Not China List' mode<br />IP:Port mode acceptable, multi value split with english comma.")
o.description = translate("IP:Port mode acceptable, multi value split with english comma.")
o.default = "default"
o:value("default", translate("Default"))
o:value("223.5.5.5", "223.5.5.5 (" .. translate("Ali") .. "DNS)")
@ -182,7 +182,12 @@ o:depends({dns_mode = "chinadns-ng", up_trust_chinadns_ng_dns = "dns2socks"})
o:depends({dns_mode = "dns2socks"})
o:depends({dns_mode = "pdnsd"})
o = s:taboption("DNS", Button, "clear_ipset", translate("Clear IPSET"))
o = s:taboption("DNS", ListValue, "dns_default", translate("Dnsmasq default dns"), translate("When the accessed domain name does not exist in the rule list, the default DNS used."))
o.default = "china"
o:value("china", translate("China"))
o:value("remote", translate("Remote"))
o = s:taboption("DNS", Button, "clear_ipset", translate("Clear IPSET"), translate("Try this feature if the rule modification does not take effect."))
o.inputstyle = "remove"
function o.write(e, e)
luci.sys.call("/etc/init.d/" .. appname .. " stop && /usr/share/" .. appname .. "/iptables.sh flush_ipset && /etc/init.d/" .. appname .. " restart")

27
package/lienol/luci-app-passwall/po/zh_Hans/passwall.po
View File

@ -151,8 +151,8 @@ msgstr "定义接受 IP:Port 形式的输入，以指定其它域名服务的过
msgid "Resolver For Local/WhiteList Domains"
msgstr "解析本地和白名单域名"
msgid "Forced to local filter mode on 'Not China List' mode<br />IP:Port mode acceptable, multi value split with english comma."
msgstr "在 '中国列表以外' 模式下会被强制设置为设定的DNS过滤服务<br />接受 IP:Port 形式的输入，多个以英文逗号分隔。"
msgid "IP:Port mode acceptable, multi value split with english comma."
msgstr "接受 IP:Port 形式的输入，多个以英文逗号分隔。"
msgid "Ali"
msgstr "阿里"
@ -184,14 +184,23 @@ msgstr "ChinaDNS-NG 公平模式"
msgid "Filtered DNS(For Proxied Domains)"
msgstr "域名过滤服务(用于被代理的域名)"
msgid "IP:Port mode acceptable, the 1st for 'dns2socks' if split with english comma."
msgstr "接受 IP:Port 形式的输入，多个以英文逗号分隔 ，'dns2socks' 模式下仅首个有效。"
msgid "Cache Resolved"
msgstr "缓存解析结果"
msgid "Dnsmasq default dns"
msgstr "Dnsmasq的默认DNS"
msgid "When the accessed domain name does not exist in the rule list, the default DNS used."
msgstr "当访问的域名不存在规则列表中，使用的默认DNS。"
msgid "Clear IPSET"
msgstr "清空 IPSET"
msgid "IP:Port mode acceptable, the 1st for 'dns2socks' if split with english comma."
msgstr "接受 IP:Port 形式的输入，多个以英文逗号分隔 ，'dns2socks' 模式下仅首个有效。"
msgid "Try this feature if the rule modification does not take effect."
msgstr "如果修改规则后没有生效，请尝试此功能。"
msgid "The server client can also use this rule to scientifically surf the Internet."
msgstr "本机服务器的客户端也可以使用这个代理模式上网。"
@ -622,8 +631,8 @@ msgstr "防火墙域名列表(gfwlist)更新URL"
msgid "China IPs(chnroute) Update URL"
msgstr "中国IP段(chnroute)更新URL"
msgid "China IPv6s(chnroute) Update URL"
msgstr "中国IPv6段(chnroute)更新URL"
msgid "China IPv6s(chnroute6) Update URL"
msgstr "中国IPv6段(chnroute6)更新URL"
msgid "Rule status"
msgstr "规则版本"
@ -703,6 +712,12 @@ msgstr "Kcptun 客户端路径"
msgid "Brook Path"
msgstr "Brook 路径"
msgid "Trojan-Go Version API"
msgstr "Trojan-Go 版本 API"
msgid "alternate API URL for version checking"
msgstr "用于版本检查的 API URL"
msgid "Node Subscribe"
msgstr "节点订阅"

11
package/lienol/luci-app-passwall/root/etc/config/passwall
View File

@ -6,6 +6,7 @@ config global
option dns_mode 'pdnsd'
option up_china_dns 'default'
option dns_forward '8.8.4.4'
option dns_default 'china'
option use_tcp_node_resolve_dns '1'
option tcp_proxy_mode 'chnroute'
option udp_proxy_mode 'chnroute'
@ -40,12 +41,12 @@ config global_rules
option auto_update '0'
option chnlist_update '1'
option chnroute_update '1'
option chnroute6_update '0'
option chnroute6_update '1'
option gfwlist_update '1'
option gfwlist_version '2020-08-20'
option chnroute_version '2020-08-20'
option chnroute6_version '2020-08-20'
option chnlist_version '2020-08-20'
option chnroute6_version '2020-08-22'
option gfwlist_version '2020-08-24'
option chnroute_version '2020-08-24'
option chnlist_version '2020-08-24'
option enable_custom_url '0'
option gfwlist_url 'https://cdn.jsdelivr.net/gh/Loukky/gfwlist-by-loukky/gfwlist.txt'
option chnroute_url 'https://ispip.clang.cn/all_cn.txt'

27
package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
View File

@ -283,6 +283,7 @@ load_config() {
DNS_MODE=$(config_t_get global dns_mode pdnsd)
DNS_FORWARD=$(config_t_get global dns_forward 8.8.4.4:53 | sed 's/:/#/g')
DNS_CACHE=$(config_t_get global dns_cache 1)
DNS_DEFAULT=$(config_t_get global dns_default china)
process=1
if [ "$(config_t_get global_forwarding process 0)" = "0" ]; then
process=$(cat /proc/cpuinfo | grep 'processor' | wc -l)
@ -696,7 +697,7 @@ start_dns() {
[ "$(config_t_get global fair_mode 1)" = "1" ] && extra_mode="-f"
ln_start_bin "$(first_type chinadns-ng)" chinadns-ng -l "${DNS_PORT}" ${china_ng_chn:+-c "${china_ng_chn}"} ${chnlist_param:+-m "${chnlist_param}" -M} ${china_ng_gfw:+-t "${china_ng_gfw}"} ${gfwlist_param:+-g "${gfwlist_param}"} $extra_mode
echolog " + 过滤服务：ChinaDNS-NG(:${DNS_PORT}${extra_mode}) + ${msg}：中国域名列表：${china_ng_chn:-D114.114.114.114}，防火墙域名列表：${china_ng_gfw:-D8.8.8.8}"
[ -n "${global}${chnlist}" ] && [ -z "${returnhome}" ] && TUN_DNS="${china_ng_gfw}"
#[ -n "${global}${chnlist}" ] && [ -z "${returnhome}" ] && TUN_DNS="${china_ng_gfw}"
;;
*)
TUN_DNS="$(echo ${DNS_MODE} | sed 's/:/#/g')"
@ -740,24 +741,29 @@ add_dnsmasq() {
[ "${DNS_MODE}" = "other_dns" ] || [ "${DNS_MODE}" = "chinadns-ng" ] && force_local=3
fi
[ "${DNS_MODE}" = "other_dns" ] || [ "${DNS_MODE}" = "chinadns-ng" ] || [ -n "${global}${chnlist}" ] && filtered_dns=1
[ "${DNS_DEFAULT}" = "china" ] && unset filtered_dns
#始终用国内DNS解析节点域名
fwd_dns="${LOCAL_DNS}"
servers=$(uci show "${CONFIG}" | grep ".address=" | cut -d "'" -f 2)
hosts_foreach "servers" host_from_url | grep -v "google.c" | grep '[a-zA-Z]$' | sort -u | gen_dnsmasq_items "vpsiplist" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/vpsiplist_host.conf"
echolog " - [$?]节点列表中的域名(vpsiplist)：${fwd_dns:-默认}"
fwd_dns="${LOCAL_DNS}"
[ -z "${global}" ] && {
[ -z "${chnlist}" ] || [ -n "${returnhome}" ] && [ -n "${force_local}" ] && unset fwd_dns
[ "${DNS_DEFAULT}" = "china" ] && unset fwd_dns
[ "${DNS_MODE}" = "chinadns-ng" ] && unset fwd_dns
[ "${DNS_MODE}" = "other_dns" ] && fwd_dns="${TUN_DNS}"
sort -u "${RULES_PATH}/direct_host" | gen_dnsmasq_items "whitelist" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/direct_host.conf"
echolog " - [$?]域名白名单(whitelist)：${fwd_dns:-默认}"
}
servers=$(uci show "${CONFIG}" | grep ".address=" | cut -d "'" -f 2)
[ "${filtered_dns}" = "1" ] && [ "${DNS_MODE}" != "chinadns-ng" ] && [ -z "${global}${chnlist}" ] && unset fwd_dns
hosts_foreach "servers" host_from_url | grep -v "google.c" | grep '[a-zA-Z]$' | sort -u | gen_dnsmasq_items "vpsiplist" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/vpsiplist_host.conf"
echolog " - [$?]节点列表中的域名(vpsiplist)：${fwd_dns:-默认}"
[ -n "${returnhome}" ] || [ "${filtered_dns}" = "1" ] && {
[ -n "${gfwlist}" ] && fwd_dns="${LOCAL_DNS}"
[ -n "${returnhome}" ] && fwd_dns="${TUN_DNS}"
[ "${filtered_dns}" = "1" ] && [ -z "${chnlist}" ] && unset fwd_dns
[ "${DNS_DEFAULT}" = "china" ] && unset fwd_dns
[ -n "${global}" ] && unset fwd_dns
sort -u "${RULES_PATH}/chnlist" | gen_dnsmasq_items "chnroute" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/chinalist_host.conf"
echolog " - [$?]中国域名表(chnroute)：${fwd_dns:-默认}"
@ -769,7 +775,7 @@ add_dnsmasq() {
sort -u "${RULES_PATH}/proxy_host" | gen_dnsmasq_items "blacklist" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/proxy_host.conf"
echolog " - [$?]代理域名表(blacklist)：${fwd_dns:-默认}"
[ -n "${gfwlist}" ] || [ "${filtered_dns}" = "1" ] && [ -z "${returnhome}" ] && {
[ -z "${returnhome}" ] && {
[ "${filtered_dns}" = "1" ] && [ "${DNS_MODE}" != "chinadns-ng" ] && unset fwd_dns
sort -u "${TMP_PATH}/gfwlist.txt" | gen_dnsmasq_items "gfwlist" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/gfwlist.conf"
#sort -u "${TMP_PATH}/gfwlist.txt" | gen_dnsmasq_items "gfwlist,gfwlist6" "${fwd_dns}" "${TMP_DNSMASQ_PATH}/gfwlist.conf"
@ -792,14 +798,15 @@ add_dnsmasq() {
echo "conf-dir=${TMP_DNSMASQ_PATH}" > "${DNSMASQ_PATH}/dnsmasq-${CONFIG}.conf"
[ "${filtered_dns}" = "1" ] && [ -z "${returnhome}" ] && servers="${TUN_DNS}"
if [ "${DNS_MODE}" = "chinadns-ng" ]; then
[ -z "${global}${chnlist}" ] && servers="127.0.0.1#${DNS_PORT}" && msg="chinadns-ng"
fi
[ -n "${chnlist}" ] && msg="中国列表以外"
[ -n "${returnhome}" ] && msg="中国列表"
[ -n "${global}" ] && msg="全局"
if [ "${DNS_MODE}" = "other_dns" ]; then
msg="指定DNS"
elif [ "${DNS_MODE}" = "chinadns-ng" ]; then
#[ -z "${global}${chnlist}" ] && servers="127.0.0.1#${DNS_PORT}" && msg="chinadns-ng"
#直接交给Chinadns-ng处理
servers="${TUN_DNS}" && msg="chinadns-ng"
else
[ "${IS_DEFAULT_DNS}" = "1" ] && [ "${filtered_dns}" != "1" ] && {
echolog " - 不强制设置默认DNS(上级分配)！"

309
package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnlist
View File

File diff suppressed because it is too large Load Diff

1
package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnroute
View File

@ -4076,6 +4076,7 @@
103.154.162.0/23
103.154.164.0/23
103.154.168.0/23
103.154.242.0/23
103.192.0.0/22
103.192.4.0/22
103.192.8.0/22

14
package/lienol/luci-app-passwall/root/usr/share/passwall/rules/gfwlist.conf
View File

@ -4922,20 +4922,22 @@ server=/.xxxfuckmom.com/127.0.0.1#7913
ipset=/.xxxfuckmom.com/gfwlist
server=/.macts.com.tw/127.0.0.1#7913
ipset=/.macts.com.tw/gfwlist
server=/.xn--90wwvt03e.com/127.0.0.1#7913
ipset=/.xn--90wwvt03e.com/gfwlist
server=/.crrev.com/127.0.0.1#7913
ipset=/.crrev.com/gfwlist
server=/.hitomi.la/127.0.0.1#7913
ipset=/.hitomi.la/gfwlist
server=/.xn--90wwvt03e.com/127.0.0.1#7913
ipset=/.xn--90wwvt03e.com/gfwlist
server=/.xn--oiq.cc/127.0.0.1#7913
ipset=/.xn--oiq.cc/gfwlist
server=/.xn--i2ru8q2qg.com/127.0.0.1#7913
ipset=/.xn--i2ru8q2qg.com/gfwlist
server=/.heungkongdiscuss.com/127.0.0.1#7913
ipset=/.heungkongdiscuss.com/gfwlist
server=/.xn--4gq171p.com/127.0.0.1#7913
ipset=/.xn--4gq171p.com/gfwlist
server=/.heungkongdiscuss.com/127.0.0.1#7913
ipset=/.heungkongdiscuss.com/gfwlist
server=/.jingsim.org/127.0.0.1#7913
ipset=/.jingsim.org/gfwlist
server=/.atc.org.au/127.0.0.1#7913
ipset=/.atc.org.au/gfwlist
server=/.asianews.it/127.0.0.1#7913
@ -9696,8 +9698,8 @@ server=/.freechinaforum.org/127.0.0.1#7913
ipset=/.freechinaforum.org/gfwlist
server=/.spotify.com/127.0.0.1#7913
ipset=/.spotify.com/gfwlist
server=/.jingsim.org/127.0.0.1#7913
ipset=/.jingsim.org/gfwlist
server=/.comparitech.com/127.0.0.1#7913
ipset=/.comparitech.com/gfwlist
server=/.tibetanaidproject.org/127.0.0.1#7913
ipset=/.tibetanaidproject.org/gfwlist
server=/.goagent.biz/127.0.0.1#7913