From 4707abb5764b056199582d6856d0a683751ad9ef Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 11 Aug 2019 17:31:02 +0800 Subject: [PATCH] luci-app-openclash: bump to v0.33.7-beta --- package/cnsztl/luci-app-openclash/Makefile | 8 +- .../files/etc/config/openclash | 3 +- .../config/openclash_custom_fake_black.conf | 54 +++++++++++++ .../files/etc/init.d/openclash | 17 +++- .../files/etc/openclash/openclash_version | 4 +- .../lua/luci/model/cbi/openclash/settings.lua | 80 ++++++++++++++----- .../share/openclash/openclash_fake_block.sh | 13 +++ .../files/usr/share/openclash/yml_change.sh | 10 ++- .../i18n/zh-cn/openclash.zh-cn.po | 27 ++++++- 9 files changed, 184 insertions(+), 32 deletions(-) create mode 100644 package/cnsztl/luci-app-openclash/files/etc/config/openclash_custom_fake_black.conf create mode 100755 package/cnsztl/luci-app-openclash/files/usr/share/openclash/openclash_fake_block.sh diff --git a/package/cnsztl/luci-app-openclash/Makefile b/package/cnsztl/luci-app-openclash/Makefile index 055d6725fe..525ae5896c 100644 --- a/package/cnsztl/luci-app-openclash/Makefile +++ b/package/cnsztl/luci-app-openclash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-openclash -PKG_VERSION:=0.33.6 +PKG_VERSION:=0.33.7 PKG_RELEASE:=beta PKG_MAINTAINER:=vernesong @@ -42,6 +42,7 @@ if [ -f "/etc/config/openclash" ]; then cp "/etc/config/openclash" "/tmp/openclash.bak" 2>/dev/null cp "/etc/config/openclash_custom_rules.list" "/tmp/openclash_custom_rules.list.bak" 2>/dev/null cp "/etc/config/openclash_custom_hosts.list" "/tmp/openclash_custom_hosts.list.bak" 2>/dev/null + cp "/etc/config/openclash_custom_fake_black.conf" "/tmp/openclash_custom_fake_black.conf.bak" 2>/dev/null fi endef @@ -59,8 +60,9 @@ uci set firewall.openclash.reload=1 >/dev/null 2>&1 uci commit firewall >/dev/null 2>&1 if [ -f "/tmp/openclash.bak" ]; then mv "/tmp/openclash.bak" "/etc/config/openclash" 2>/dev/null - #mv "/tmp/openclash_custom_rules.list.bak" "/etc/config/openclash_custom_rules.list" 2>/dev/null + mv "/tmp/openclash_custom_rules.list.bak" "/etc/config/openclash_custom_rules.list" 2>/dev/null mv "/tmp/openclash_custom_hosts.list.bak" "/etc/config/openclash_custom_hosts.list" 2>/dev/null + mv "/tmp/openclash_custom_fake_black.conf.bak" "/etc/config/openclash_custom_fake_black.conf" 2>/dev/null fi if [ -f "/tmp/config.yaml" ]; then mv "/tmp/config.yaml" "/etc/openclash/config.yaml" 2>/dev/null @@ -79,6 +81,7 @@ fi cp "/etc/config/openclash" "/tmp/openclash.bak" 2>/dev/null cp "/etc/config/openclash_custom_rules.list" "/tmp/openclash_custom_rules.list.bak" 2>/dev/null cp "/etc/config/openclash_custom_hosts.list" "/tmp/openclash_custom_hosts.list.bak" 2>/dev/null + cp "/etc/config/openclash_custom_fake_black.conf" "/tmp/openclash_custom_fake_black.conf.bak" 2>/dev/null endef define Package/$(PKG_NAME)/postrm @@ -96,6 +99,7 @@ fi rm -rf /tmp/Proxy_Group 2>/dev/null rm -rf /tmp/openclash_last_version 2>/dev/null rm -rf /tmp/clash_last_version 2>/dev/null + rm -rf /etc/openclash/dnsmasq_fake_block.conf 2>/dev/null uci delete firewall.openclash >/dev/null 2>&1 uci commit firewall >/dev/null 2>&1 uci delete ucitrack.@openclash[-1] >/dev/null 2>&1 diff --git a/package/cnsztl/luci-app-openclash/files/etc/config/openclash b/package/cnsztl/luci-app-openclash/files/etc/config/openclash index b0cda05ae8..ca0b152100 100644 --- a/package/cnsztl/luci-app-openclash/files/etc/config/openclash +++ b/package/cnsztl/luci-app-openclash/files/etc/config/openclash @@ -15,4 +15,5 @@ config openclash 'config' option other_rule_auto_update '0' option core_version '0' option en_mode 'redir-host' - option enable_redirect_dns '1' \ No newline at end of file + option enable_redirect_dns '1' + option dns_advanced_setting '0' \ No newline at end of file diff --git a/package/cnsztl/luci-app-openclash/files/etc/config/openclash_custom_fake_black.conf b/package/cnsztl/luci-app-openclash/files/etc/config/openclash_custom_fake_black.conf new file mode 100644 index 0000000000..1ab4108ded --- /dev/null +++ b/package/cnsztl/luci-app-openclash/files/etc/config/openclash_custom_fake_black.conf @@ -0,0 +1,54 @@ +#放行NTP服务 +time.windows.com +time.nist.gov +time.apple.com +time.asia.apple.com +cn.ntp.org.cn +edu.ntp.org.cn +hk.ntp.org.cn +tw.ntp.org.cn +us.ntp.org.cn +sgp.ntp.org.cn +kr.ntp.org.cn +jp.ntp.org.cn +de.ntp.org.cn +ina.ntp.org.cn +0.openwrt.pool.ntp.org +1.openwrt.pool.ntp.org +2.openwrt.pool.ntp.org +3.openwrt.pool.ntp.org +ntp.aliyun.com +ntp1.aliyun.com +ntp2.aliyun.com +ntp3.aliyun.com +ntp4.aliyun.com +ntp5.aliyun.com +ntp6.aliyun.com +ntp7.aliyun.com +time1.aliyun.com +time2.aliyun.com +time3.aliyun.com +time4.aliyun.com +time5.aliyun.com +time6.aliyun.com +time7.aliyun.com +s1c.time.edu.cn +s2m.time.edu.cn +s1b.time.edu.cn +s1e.time.edu.cn +s2a.time.edu.cn +s2b.time.edu.cn +time1.apple.com +time2.apple.com +time3.apple.com +time4.apple.com +time5.apple.com +time6.apple.com +time7.apple.com +time1.google.com +time2.google.com +time3.google.com +time4.google.com +#放行网易云音乐 +.music.163.com +interface.music.163.com diff --git a/package/cnsztl/luci-app-openclash/files/etc/init.d/openclash b/package/cnsztl/luci-app-openclash/files/etc/init.d/openclash index 8181ddd0b6..d502ba0239 100755 --- a/package/cnsztl/luci-app-openclash/files/etc/init.d/openclash +++ b/package/cnsztl/luci-app-openclash/files/etc/init.d/openclash @@ -55,6 +55,19 @@ revert_dns() { uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto uci set dhcp.@dnsmasq[0].noresolv=0 uci commit dhcp + rm -rf /tmp/dnsmasq.d/dnsmasq_openclash.conf >/dev/null 2>&1 +} + +fake_block() { + if [ "$1" = "fake-ip" ]; then + if [ ! -f /etc/openclash/dnsmasq_fake_block.conf ]; then + sh /usr/share/openclash/openclash_fake_block.sh + elif [ "$(awk -F '/' '{print $3}' /etc/openclash/dnsmasq_fake_block.conf |head -1)" != "$2" ] && [ ! -z "$2" ]; then + sh /usr/share/openclash/openclash_fake_block.sh + fi + mkdir -p /tmp/dnsmasq.d + ln -s /etc/openclash/dnsmasq_fake_block.conf /tmp/dnsmasq.d/dnsmasq_openclash.conf + fi } yml_check() @@ -326,6 +339,7 @@ if [ "$enable" -eq 1 ] && [ -f "$CONFIG_FILE" ]; then socks_port=$(uci get openclash.config.socks_port 2>/dev/null) enable_redirect_dns=$(uci get openclash.config.enable_redirect_dns 2>/dev/null) lan_ip=$(uci get network.lan.ipaddr 2>/dev/null) + direct_dns=$(uci get openclash.config.direct_dns 2>/dev/null) echo "第二步: 配置文件检查..." >$START_LOG yml_check "$en_mode" "$enable_custom_dns" "$CONFIG_FILE" "$BACKUP_FILE" "$START_BACKUP" grep "^ \{0,\}Proxy:" $CONFIG_FILE >/dev/null 2>&1 && grep "^ \{0,\}Proxy Group:" $CONFIG_FILE >/dev/null 2>&1 && grep "^ \{0,\}Rule:" $CONFIG_FILE >/dev/null 2>&1 @@ -396,10 +410,10 @@ fi echo "${LOGTIME} Warring: OpenClash May Can Not Take Over DNS, Please Use OpenClash for Upstream DNS Resolve Server" >> $LOG_FILE sleep 5 fi - ipset flush music 2>/dev/null [ "$enable_redirect_dns" != "0" ] && { change_dns } + fake_block "$en_mode" "$direct_dns" /etc/init.d/dnsmasq restart >/dev/null 2>&1 if pidof clash >/dev/null; then echo "第八步: 添加 OpenClash 计划任务,启动进程守护程序..." >$START_LOG @@ -484,7 +498,6 @@ stop() echo "第五步：删除 OpenClash 残留文件..." >$START_LOG enable=$(uci get openclash.config.enable 2>/dev/null) if [ "$enable" -eq 0 ]; then - ipset flush music 2>/dev/null rm -rf $LOG_FILE 2>/dev/null rm -rf /www/openclash 2>/dev/null rm -rf /tmp/openclash_last_version 2>/dev/null diff --git a/package/cnsztl/luci-app-openclash/files/etc/openclash/openclash_version b/package/cnsztl/luci-app-openclash/files/etc/openclash/openclash_version index 36de2ebe0f..1eb0338c4c 100644 --- a/package/cnsztl/luci-app-openclash/files/etc/openclash/openclash_version +++ b/package/cnsztl/luci-app-openclash/files/etc/openclash/openclash_version @@ -1,2 +1,2 @@ -v0.33.6-beta -data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWoAAAAqCAMAAACtKeEJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjE1RTJCOTA0QjlENTExRTk4RThBODRFQjRDNjZFODkyIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjE1RTJCOTA1QjlENTExRTk4RThBODRFQjRDNjZFODkyIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTVFMkI5MDJCOUQ1MTFFOThFOEE4NEVCNEM2NkU4OTIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MTVFMkI5MDNCOUQ1MTFFOThFOEE4NEVCNEM2NkU4OTIiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz6BLYKKAAADAFBMVEUHVoQHZpzh7/eWlpZFmsoKdbMbhcHB1eCKioqAgIArjcaEvN2hoaEVapoccaJiYmIJca1jlbHKyspqamoHX5HR0dHv9PfR5vJtbW2yytiHv99FgKIJY5Y1dZrOzs6enp6StcmizOUGcKzGxsYjaZIFbakIZJk/Pz92ttoKaqHn5+cEU4AEXI4hdqZFRUVTi6o6lsoXgL10p8RGRkYkeqoGVYJFkr2Tu9MHXI1WlLiEhIQwk8sjhLySkpK5ubmlpaWpqanAwMC1tbVycnLa2tqCgoJkq9OsrKx4eHhXpNFlZWVEibFLS0vf398FaaJBQUHg4OCDqsEEYJRnrdYFWoqy1elDQ0OkzuaUxuIUfbgGcrBzsdQJbKUJWIWhxdqyzdy2tray0+Z0dHTCwsI0fKWEtNBynrh2dnaDs8/w9fejyN6z0eK+vr6hv9AYbZ6vr68mcZ0FZZtKns9Jns5zoLplqM+iwNGTxOAGdLMEYpjd3d0XYo5HnM2CrseDq8JFh602kcYFa6WJweJDfqAmb5lZp9Ohw9cCc7QBcrNRUVFTU1NUVFRVVVULfL1SUlIFdrcHeLkKe7xWVlYEdrYDdLQOgMAEdbYOf8ADdLUDdbUSg8MSg8QShMQThMUAcrJXV1cGd7gOf78Nfr8Nfr4Mfb4Mfb0IebkIeboJeroJe7sJers6OjqqqqrV1dWrq6vU1NQ9PT1ISEg8PDw7OztJSUnw9/t+fn7q6urC3u6dnZ3z8/NMTEx/f3/09PSDvNzB3u6CqcCErMLg6vDA1N/B3e319fUUXonQ3+eMjIyFvt7W1tbB3e50s9iDr8iEvd3g6u/R4OiGhoYHWIfD3+/C3+8FdLRInc7B2+ro6OgLerl7e3uDu9zC3Otor9dGm8smisQHZ51jnb7C3u+yz+BVos9jn8KEuNYmbZSAudnQ5PAKebkndaIFZ5/B1+SEq8IRgsMQgcIPgMFZWVlaWlpfX19bW1tcXFxeXl5NTU1PT09QUFBYWFhdXV1OTk7///////8b4XlMAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADCVJREFUeNrsVwlUVNcZfoIsKgoICrgAojjC4IgZUUNEWVxGZRGjYKjGLdrEVi2SaIyJMWvrIAik6d5AohUVkUVGFoPirlFxSTRLU2OStmYxbZPQCBg++t9735t5D4R44jk2k+N3Du/+//dv937vzXsHqbX16EqvBjvGqD//8PHBs5bWVql1RlyDXWPUn+wB9/m0Skfjrts3Rv3RLnCfRVp53d6l/oN94Fkp7ls7x6h/2wfuk769K/Udwo9A6v/YCaRv7B13pb5jGP6lnUD6r73jrtR3TuqX7QTS1/aO4b+1E9xUapPblJWOpv+rgKbIW50//NUO8HL3v/Xrt6ot+6XzC/1UNE8aFt6+WuR115Kr8Oar3xvSV+3gVgmOyim+X90mfKc4fs/KN/DGLWYOf60DzOGncAjXkN3fFIdzeIG7qxyE+2Z4m2LnVM7307IkdUfTXlvVb9VrnaKd1O5vAKELAgIW1wBTblfqyFsW7Dak3nJznMQj90y/92NYnNVsBnDu4MHVjwAZIgl+Bw/6oU3WlnCLCJzU9szAW1u2dDjv5JZOId1ogxggSsdxPnTKjdvEJBR/z0qDznCLmcOztt4M3YGB8wguSFXTGauvMnbdIUGfPriOuQOB+9VZzhb48UCItilJvbUjkNRbO4XUThyc1yWVxccbdbp431sVxnfSJHeVa5pk+k6pJyk5GpiURjapqXebUW2k/stNMQzz58118hjQHxY17TRvnndISJcLB/EWc0PmzRsQEjKAbshJdVYqXEQgRNs0g1U5Z2SoqYxwYZxUtQjP0OQItJW6N/x1+4TZkhR/48Zu7BYeIF8n9QYJ2I3+HGeAR0/wl3sM16gY3RyZW2nijkC3E6iU+1fiBF3dY/jHgJnqTuIrUcl6KnPVvYmbxFoedVTvuNfWLA5noLuwUjEnK2s2/uXEHG8gPMsGj6GfseXdMVjG1rkh77LF6RweUyVRq6sD3s1qj0v4KPwj2oHlpJzI3+gOU8mUjwoyfYSV6qwt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 \ No newline at end of file +v0.33.7-beta +data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWoAAAAqCAMAAACtKeEJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjI0M0NCRkI2QkI0NzExRTlBMjU5OEZBNEU2RTExQTkyIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjI0M0NCRkI3QkI0NzExRTlBMjU5OEZBNEU2RTExQTkyIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MjQzQ0JGQjRCQjQ3MTFFOUEyNTk4RkE0RTZFMTFBOTIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MjQzQ0JGQjVCQjQ3MTFFOUEyNTk4RkE0RTZFMTFBOTIiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz6S2OH6AAADAFBMVEWVlZWUxeEHZ50rjcYJcq1FmspjlbGKioqAgICy0+YGXpEFaaKhoaGEvN0dcqIHVoRiYmLKyspqamrR0dEVapptbW2izOQKYZPOzs6enp6StcnR5vPv9PcGcKxFgKLGxsY1dZoFbakKdrQ6lcokaZIJZJgEXI6Gv98/Pz/n5+cIXIwidaVFRUVTi6oXgL2xythXpNF0p8QKaqFGRkYkeqoEU4B2ttqTu9OEhIRFia8jhLwbhcFzsdSSkpK5ublkq9OlpaUEYJVFkb2pqanAwMC1tbVycnLa2tqCgoKsrKx4eHhlZWVGirFLS0vf399BQUEGVYLg4OBKn88JbKXA1OBXlbkGcrBDQ0NmrdYUfbhmqc8FWoq2trYJWIV0dHTCwsI0fKWDqsGhv9B2dna+vr5ynrikzuay1ekYbZ2vr6+xzdwmcZ2ixtsHdbIFZZvw9fdJns6iyd9zoLqiwNEFYpjd3d1HnM2CrscYYo2JweJDfqA2kcYmb5mhw9eDs89Zp9MCc7QBcrNRUVFTU1NUVFRVVVULfL1SUlIFdrcKe7wHeLlWVlYEdrYDdbUOf8ADdLQDdLUEdbYOgMASg8MSg8QShMQThMUAcrIGd7hXV1cOf78Nfr8Nfr4Mfb4Mfb0IebkIeboJe7sJeroJers6OjqqqqrV1dXU1NSrq6s9PT1ISEg8PDw7OztJSUl+fn7q6urw9/vC3u6dnZ1MTEzz8/N/f3/09PSDvNzg6vDB3u6CqcDB1eHh7/fA1N+ErMLB3e319fWMjIzW1tYUXomFvt7B3e7g7vaDr8jg6u/R4OiGhoZ0s9iEvd3D3+/C3++EtNAHWId7e3uDu9wFdLTQ3+dGm8vo6Ohjnb7C3OvB2+por9cLermyz+AmisTC3u9Vo9CDq8IFZ58bcKA1hrTP5PEmbZRjn8KBuNjR5O+Eq8JlmLQLb6iXl5cwk8tFh60RgsMQgcIPgMFZWVlaWlpfX19bW1tcXFxeXl5NTU1PT09QUFBYWFhdXV1OTk7///////8hQVs5AAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAAC9tJREFUeNrslwtUVHUexy/KywEbRNEBQkUEBxjFGEdJwyAewhigsYmZj3Q3TLeQ0p7WtusgBNM+ah9B2QoIgzAODI+Ql6gpPrEss8f2tN223bLdrdjkET/29///7525dwbIk+e43Y6fc7z39/7d+53LvUduaOjQJt8eGTPvTz983n/UOjTEDS1P7pE18/4oB74IHOIOJV+SN/P+IAu+sHKbLsld6t/Lg0e55G9lzrx/y4MvuG+vSX2V+BFI/R+ZwH0jd65JfdWI/FImcP+VO9ekvnpSPysTuK/lTuRvZMKwUuu9U1Mv6v+vAupjLnd/5PMj8OzYv8yadZtj9MtFT84ShWnR/BCHxtvsSDK3wZnnvzfcV0541wGlLtXvqyvEL/Xi9+x8GV6+zMrIF0bAhd5FR4gkOPYMu7mOJ6mb28HcM5KqWWBH0p0LZ0ba9kLurNwXRsVJap+XAcJX+/uvawJIvVKpYy5bsCuQetfwHIUtN9x6+3tgXSSO5gKc7OzcugUglxVBVGdnFEirVrXznATYJe1+ZdeuEfcd3TUq3IADiQCxasqp8NSBKyQFTN+zU6PWXGZl5IvDMhZg+hqkHbLF4dytn5DoIy0sfLrzEeJOB1gpKopew9MJLZKhKPWLI4FSvzgqnJM4cEqdUZOWplWr0/wuVxi/lBQfkatP0X+n1ClCjQS9MMguNc52WOUg9Z+HZT5sXpM54/PQqWAVRXe5rlmjiI4ec7YTXiE+ihoaHR2KP8hRUdXnUxiTtsBnkqG5pGtRbq44lBvCjKOiESG5khqGo9QTQKVuZOZgRtrAwF7YyzwA/pgyAVBAT/x3cTnQ7GH6ck+kGpnA8yJx6/TUYXgehjp+fh0cxqNPIv0YEFM8iX0l6shMYa94NsZSyMhDkou+Lp+xCGAss7LBJT9/I/xzBnGmAITk23ENpdF3F8D95JwZ/S45zTgJq/KdyYaWCEkgFz4I+QCvwHqU35lN3/tz0RTe7WgGMit7kXQaVyIFH+pewd5Z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 \ No newline at end of file diff --git a/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua b/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua index becc5296a9..79c3237389 100644 --- a/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua +++ b/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua @@ -13,6 +13,7 @@ s.title = translate("Will Modify The Config File Or Subscribe According To The S s.anonymous = true s:tab("settings", translate("General-Settings")) +s:tab("dns", translate("DNS Setting")) s:tab("rules", translate("Rules Setting")) s:tab("dashboard", translate("Dashboard Settings")) s:tab("config_update", translate("Config Update")) @@ -44,24 +45,6 @@ o:value("redir-host", translate("redir-host")) o:value("fake-ip", translate("fake-ip")) o.default = "redir-host" -o = s:taboption("settings", ListValue, "enable_redirect_dns", translate("Redirect Local DNS Setting")) -o.description = translate("Set Local DNS Redirect") -o:value("0", translate("Disable")) -o:value("1", translate("Enable")) -o.default = 1 - -o = s:taboption("settings", ListValue, "enable_custom_dns", translate("Custom DNS Setting")) -o.description = translate("Set OpenClash Upstream DNS Resolve Server") -o:value("0", translate("Disable")) -o:value("1", translate("Enable")) -o.default = 0 - -o = s:taboption("settings", ListValue, "ipv6_enable", translate("Enable ipv6 Resolve")) -o.description = translate("Force Enable to Resolve ipv6 DNS Requests") -o:value("0", translate("Disable")) -o:value("1", translate("Enable")) -o.default=0 - o = s:taboption("settings", Value, "proxy_port") o.title = translate("Redir Port") o.default = 7892 @@ -83,6 +66,67 @@ o.datatype = "port" o.rmempty = false o.description = translate("Please Make Sure Ports Available") +---- DNS Settings +o = s:taboption("dns", ListValue, "enable_redirect_dns", translate("Redirect Local DNS Setting")) +o.description = translate("Set Local DNS Redirect") +o:value("0", translate("Disable")) +o:value("1", translate("Enable")) +o.default = 1 + +o = s:taboption("dns", ListValue, "enable_custom_dns", translate("Custom DNS Setting")) +o.description = translate("Set OpenClash Upstream DNS Resolve Server") +o:value("0", translate("Disable")) +o:value("1", translate("Enable")) +o.default = 0 + +o = s:taboption("dns", ListValue, "ipv6_enable", translate("Enable ipv6 Resolve")) +o.description = translate("Force Enable to Resolve ipv6 DNS Requests") +o:value("0", translate("Disable")) +o:value("1", translate("Enable")) +o.default=0 + +o = s:taboption("dns", ListValue, "dns_advanced_setting", translate("Advanced Setting")) +o.description = translate("DNS Advanced Settings") +o:value("0", translate("Disable")) +o:value("1", translate("Enable")) +o.default=0 + +o = s:taboption("dns", Value, "direct_dns", translate("Specify DNS Server")) +o.description = translate("Specify DNS Server For List, Only One IP Server Address Support") +o.default="114.114.114.114" +o.placeholder = translate("114.114.114.114 or 127.0.0.1#5300") +o:depends("dns_advanced_setting", "1") + +o = s:taboption("dns", Button, translate("Fake-IP Block List Update")) +o.title = translate("Fake-IP Block List Update") +o:depends("dns_advanced_setting", "1") +o.inputtitle = translate("Check And Update") +o.inputstyle = "reload" +o.write = function() + uci:set("openclash", "config", "enable", 1) + uci:commit("openclash") + SYS.call("sh /usr/share/openclash/openclash_fake_block.sh && /etc/init.d/openclash restart >/dev/null 2>&1 &") + HTTP.redirect(DISP.build_url("admin", "services", "openclash")) +end + +custom_fake_black = s:taboption("dns", Value, "custom_fake_black") +custom_fake_black.template = "cbi/tvalue" +custom_fake_black.description = translate("Domain Names In The List Do Not Return Fake-IP, One rule per line") +custom_fake_black.rows = 20 +custom_fake_black.wrap = "off" +custom_fake_black:depends("dns_advanced_setting", "1") + +function custom_fake_black.cfgvalue(self, section) + return NXFS.readfile("/etc/config/openclash_custom_fake_black.conf") or "" +end +function custom_fake_black.write(self, section, value) + + if value then + value = value:gsub("\r\n?", "\n") + NXFS.writefile("/etc/config/openclash_custom_fake_black.conf", value) + end +end + ---- Rules Settings o = s:taboption("rules", ListValue, "enable_custom_clash_rules", translate("Custom Clash Rules")) o.description = translate("Use Custom Rules") diff --git a/package/cnsztl/luci-app-openclash/files/usr/share/openclash/openclash_fake_block.sh b/package/cnsztl/luci-app-openclash/files/usr/share/openclash/openclash_fake_block.sh new file mode 100755 index 0000000000..77c3a44d14 --- /dev/null +++ b/package/cnsztl/luci-app-openclash/files/usr/share/openclash/openclash_fake_block.sh @@ -0,0 +1,13 @@ +#! /bin/sh +echo "Fake-IP..." >$START_LOG +direct_dns=$(uci get openclash.config.direct_dns 2>/dev/null) +[ -z "$direct_dns" ] && { + direct_dns="114.114.114.114" + } +rm -rf /etc/openclash/dnsmasq_fake_block.conf 2>/dev/null +for i in `cat /etc/config/openclash_custom_fake_black.conf` +do + if [ -z "$(echo $i |grep '^ \{0,\}#' 2>/dev/null)" ]; then + echo "server=/$i/$direct_dns" >>/etc/openclash/dnsmasq_fake_block.conf + fi +done diff --git a/package/cnsztl/luci-app-openclash/files/usr/share/openclash/yml_change.sh b/package/cnsztl/luci-app-openclash/files/usr/share/openclash/yml_change.sh index 4576e8cadc..aa7f5ca7a1 100755 --- a/package/cnsztl/luci-app-openclash/files/usr/share/openclash/yml_change.sh +++ b/package/cnsztl/luci-app-openclash/files/usr/share/openclash/yml_change.sh @@ -9,10 +9,12 @@ fi if [ "$2" = "fake-ip" ]; then - if [ ! -z "$(grep "^ \{0,\}fake-ip-range:" "$7")" ]; then - sed -i "/^ \{0,\}fake-ip-range:/c\ fake-ip-range: 198.18.0.1/16" "$7" - else - sed -i "/enhanced-mode:/a\ fake-ip-range: 198.18.0.1/16" "$7" + if [ -z "$(grep "^ \{0,\}fake-ip-range: 198.18.0.1/16" "$7")" ]; then + if [ ! -z "$(grep "^ \{0,\}fake-ip-range:" "$7")" ]; then + sed -i "/^ \{0,\}fake-ip-range:/c\ fake-ip-range: 198.18.0.1/16" "$7" + else + sed -i "/enhanced-mode:/a\ fake-ip-range: 198.18.0.1/16" "$7" + fi fi else sed -i '/^ \{0,\}fake-ip-range:/d' "$7" 2>/dev/null diff --git a/package/cnsztl/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po b/package/cnsztl/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po index 414484cbb9..6548c1b6ea 100644 --- a/package/cnsztl/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po +++ b/package/cnsztl/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po @@ -9,7 +9,7 @@ msgid "A Clash Client For OpenWrt" msgstr "一个运行在OpenWrt上的Clash客户端，兼容Shadowsocks、Vmess等协议，根据灵活的规则配置实现策略代理" msgid "Will Modify The Config File Or Subscribe According To The Settings On This Page" -msgstr "将按照以下设置本地化配置文件和获取订阅" +msgstr "将按照本页设置本地化配置文件和获取订阅" msgid "Technical Support" msgstr "技术支持" @@ -23,6 +23,9 @@ msgstr "接管设置" msgid "General-Settings" msgstr "全局设置" +msgid "DNS Setting" +msgstr "DNS设置" + msgid "Config Update" msgstr "配置文件订阅" @@ -108,7 +111,25 @@ msgid "Use Custom Rules" msgstr "启用后将把自定义规则增加到配置文件并优先匹配，规则请到下方文本框编辑" msgid "Add Custom DNS Servers" -msgstr "设置自定义上游DNS服务器，在上方全局设置中启用本功能后生效" +msgstr "设置自定义上游DNS服务器，在上方DNS设置中启用本功能后生效" + +msgid "Advanced Setting" +msgstr "高级设置" + +msgid "DNS Advanced Settings" +msgstr "DNS高级设置，如您不知道选项有何用，请不要随意修改" + +msgid "Specify DNS Server" +msgstr "（Fake-IP模式）黑名单DNS服务器" + +msgid "Specify DNS Server For List, Only One IP Server Address Support" +msgstr "指定下方列表中域名的DNS服务器，只支持填写一个IP地址，更改后点击下方按钮生效" + +msgid "Domain Names In The List Do Not Return Fake-IP, One rule per line" +msgstr "每行请只填写一个域名，列表中的域名在（Fake-IP模式）下查询DNS时将返回真实IP地址，更改后点击上方按钮生效" + +msgid "Fake-IP Block List Update" +msgstr "更新Fake-IP域名黑名单" msgid "Set OpenClash Upstream DNS Resolve Server" msgstr "启用将覆盖配置文件内的设置，请先在下方配置好服务器" @@ -145,7 +166,7 @@ msgstr "" "允许解析IPV6类型的DNS请求，如果您没有公网IPV6地址但开启了IPV6的DHCP服务，客户端连接可能会出现异常" msgid "Rules Setting" -msgstr "规则设置(访问控制)" +msgstr "规则设置（访问控制）" msgid "Server Config" msgstr "配置文件"