diff --git a/cups/files/etc/cups/cupsd.conf b/cups/files/etc/cups/cupsd.conf index 59e874332..645381def 100644 --- a/cups/files/etc/cups/cupsd.conf +++ b/cups/files/etc/cups/cupsd.conf @@ -46,7 +46,7 @@ ServerAlias * Order Allow,Deny Allow From 127.0.0.1 -Allow From 192.168.1.0/24 +#Allow From 192.168.1.0/24 Allow all @@ -55,6 +55,6 @@ AuthType Basic AuthClass System Order Allow,Deny Allow From 127.0.0.1 -Allow From 192.168.1.0/24 +#Allow From 192.168.1.0/24 Allow all diff --git a/luci-app-mosdns/root/etc/mosdns/serverlist.txt b/luci-app-mosdns/root/etc/mosdns/serverlist.txt index e972f61a8..d1bfbc73d 100644 --- a/luci-app-mosdns/root/etc/mosdns/serverlist.txt +++ b/luci-app-mosdns/root/etc/mosdns/serverlist.txt @@ -794,6 +794,7 @@ 5faad595f4.com 5fst22.cn 5glyqw.com +5ibanma.com 5ijo.01net.com 5ijs.vip 5imoney.com @@ -4591,6 +4592,7 @@ beaubitternessapplication.com beautylamp.cn beavertron.com bebadu.com +bebaytowns.com bebelait.com bebi.com bebreloomr.com @@ -4608,6 +4610,7 @@ bedsbreath.com bedsideseller.com bedsitetrypa.com bedspursueclueless.com +bedumbserugate.com beeaimaid.com beefymartpronunciation.com beegmove.com @@ -5784,6 +5787,7 @@ cdgfa.ifeng.com cdgxq.com cdhhbyy.cn cdiah.com +cdikrxknopf.com cdjkngs.cn cdlinli.com cdlkzb.com @@ -5954,6 +5958,7 @@ changedcombustible.com changement.pro changhehengqi.com chango.com +chanmao.online channelintelligence.com chaoge.club chaogej.com @@ -6449,6 +6454,7 @@ cntrafficpro.com cnxad.net cnxdztpgjyc.com cnxmyb.cn +cnxscqqgjf.top cnxunkewang.info cny.yoyo.org cnyibs.com @@ -8030,6 +8036,7 @@ disapprovalhardwareenvy.com disarrayanticipatedversion.com disavowmigration.com disbandcrumena.com +dischargedecent.com discordclosure.com discountclick.com discountryvc.club @@ -8163,6 +8170,7 @@ dlski.space dltenjy.cn dltinaozs.com dlvds9i67c60j.cloudfront.net +dlvjmr.cn dlxgm.cn dlxrlc2ni2.com dlyukun.cn @@ -9042,6 +9050,7 @@ engagesrvr.filefactory.com engageya.com engine.eroge.com engine.espace.netavenir.com +engine.fxempire.com engine.laweekly.com enginedriverflexible.com enginedriverhaw.com @@ -9869,6 +9878,7 @@ flashclicks.com flashinginvolvementmatches.com flashtalking.com flashymass.com +flasknstall.click flaskstationsubsequent.com flatcapspriggy.cam flatepicbats.com @@ -11847,6 +11857,7 @@ holdierpriv.club holdspreoccupation.com holidayhappy.online hollowafterthought.com +holydelicatessen.com holyyjs.xyz homchang.site home-prize-winner-ma2d.live @@ -11876,6 +11887,7 @@ hongtefm.com hongwenge.com hongyangbg.com honhon.top +honoka.design honorablehall.com honorableland.com honorablesimilar.com @@ -12140,6 +12152,7 @@ hw6.com hwanjia.com hxadt.com hxbt.alading123.com +hxbylm.vip hxclove.club hxf1688.xyz hxfree.vip @@ -13235,6 +13248,7 @@ jltzknvw.com jlvqhftliz.com jlwljym.com jlxzt.com +jlyayxz.cn jlys.fun jm166.cn jmdardu.cn @@ -13257,6 +13271,7 @@ jnffgawh.com jngapkf.cn jnhofgrcmsqw.xyz jnjcxx.com +jnkangnuo.com jnkqds.cn jnmqym4.cn jnrtavp2x66u.com @@ -13973,6 +13988,7 @@ kronosspell.com krouekal.com krxd.net ks67.com +ksaggspp.xyz ksdqhiaythajdv.com ksdr.xyz ksharu.com @@ -14481,6 +14497,7 @@ linghangshouji.com linglingccc.xyz lingqinga.cn lingquan.vip +lingquanba.wang lingzhushijie.cn linicom.co.il linicom.co.uk @@ -14890,6 +14907,7 @@ lw88.site lwgadm.com lwlscy.com lx2rv.com +lx52168.online lxanimation.cn lxgmgalmrxqlj.xyz lxhjaq.cn @@ -16092,6 +16110,7 @@ myfastcdn.com myfengyi.xyz myfineartde.biz mygoodlives.com +mygqhvz.cn mykhtesikvuz.com mykiger.com mykpkyvtuqmonij.com @@ -16708,6 +16727,7 @@ nrgat.com nrnma.com nrnwubdanwl.com nryceuula.com +ns-zhy.com ns003.com ns1.chinayms.com ns1p.net @@ -18083,6 +18103,8 @@ pjtymy.cn pjx1ky4xhwip.com pk965.com pkbook.com.cn +pkfyelxxpbisf.com +pkfyelxxpbisf.top pkgebysm.com pkhhyool.com pkk1.zuimeiniwo.com @@ -18477,6 +18499,7 @@ prevotch.com prfctmney.com prfqcdfws.com prfuxl.xyz +prgznhukaoggg.com prheoxpdoqmjou.com priceplaneadulthood.com pricestern.top @@ -19211,6 +19234,7 @@ qscwdv.top qservz.com qshxc.com qslychhjeo.com +qsnyswg.cn qtbb6.com qtmojo.cn qtrwwov.cn @@ -19338,6 +19362,7 @@ qzkxt.com qzlglizfy.com qzmixun.com qzqyw.cn +qzvlbjatsgzgn.com qzxmtyy.com qzy123.ink qzyfpfyy.com @@ -19458,6 +19483,7 @@ rauwoafe.com ravalads.com ravaquinal.com rawasy.com +rawjeansadvertising.com rawoarsy.com rayjump.com razdvabm.com @@ -19743,6 +19769,7 @@ republika.onet.pl requentlyfths.club requested.cn requestvirginity.com +requial.com requiresdetached.com rereddit.com rereegny.net @@ -19837,6 +19864,7 @@ reversionconceivedremarks.com revfusion.net reviabiliseriez.site revimedia.com +revincenizam.com revive.docmatic.org revive.dubcnm.com revive.haskovo.net @@ -20751,10 +20779,12 @@ sfhyojoctcry.com sfixretarum.com sfjviolrukaysn.xyz sflywdvzyh.com +sflywfcanq.com sfoimvwyyf.com sftapi.com sfxl.com.cn sfz023.com +sfzover.com sg01.top sg2rgnza7k9t.com sgaga.xyz @@ -21467,6 +21497,7 @@ spitzerpfunde.com spjxwlkj.com spkcmgydiuin.com spkoevngk.com +splakesmutty.com splashfloating.com splashforgodm.com splashsjewels.com @@ -21907,6 +21938,7 @@ sudahj.com suddensidewalk.com suecubrearrange.com sueencumberpiggy.com +sufferingslippery.com sufficient.cn suffocatepremise.com sugarcurtain.com @@ -22073,6 +22105,7 @@ sxmutan.com sxmyyx.com sxouyada.cn sxrgd.com +sxrs.shop sxsui.cn sxswjkgs.com sxtcdjy.com @@ -22406,6 +22439,7 @@ teracreative.com terats.com teresacd.cn termadodad.com +termitekalinga.com terningpail.com terra8nb.com terraclicks.com @@ -22600,6 +22634,7 @@ throattrees.com throbbingmill.com throposehodger.pro throtle.io +throughlavish.com thruport.com thrustdeadconsiderably.com thrustlumpypulse.com @@ -22679,6 +22714,7 @@ tingeffukec.one tingfengyu.top tinglian.com tingthenee.biz +tingyusw.xyz tinkerta.com tinkerwidth.com tinkshop.cn @@ -23445,6 +23481,7 @@ uaxyutpxh.xyz ub1.job592.com ubalh.com uballcc.com +ubgkvsjnbjtk.com ubilox.com ubjectsandie.biz ubmcvideo.baidustatic.com @@ -24515,6 +24552,7 @@ waust.at wauthaik.net wauthaum.com wautoosa.net +wavail.com waveclks.com wavysumatone.cam waxpigbaa.com @@ -25452,6 +25490,7 @@ xingnu.site xingpingmaoyi.cn xingsky.cn xingtu.ltd +xingxingdd.com xingxingdm.com xingyou46.icu xingzhu.top @@ -25603,6 +25642,7 @@ xrfabakydcwngov.xyz xroynaxvqvouy.com xs.houyi.baofeng.net xsdizch.cn +xsdlt.top xsgkjsb.cn xsjyun.cn xsrs.com @@ -26302,6 +26342,7 @@ yzftqx.cn yzh360.com yzjihang.cn yzjlsb.com +yzjy.pro yzlwuuzzehjh.com yzt001.com yzus09by.com diff --git a/luci-app-mosdns/root/etc/mosdns/whitelist.txt b/luci-app-mosdns/root/etc/mosdns/whitelist.txt index ceb5c2477..dbd3b617b 100644 --- a/luci-app-mosdns/root/etc/mosdns/whitelist.txt +++ b/luci-app-mosdns/root/etc/mosdns/whitelist.txt @@ -1 +1,2 @@ -example.example \ No newline at end of file +example.example +stat.xiaomi.com diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 9a5490f6a..e1a066a74 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -6,15 +6,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall -PKG_VERSION:=4.49 +PKG_VERSION:=4.50 PKG_RELEASE:=1 -#20220207 +#20220219 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Brook \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria \ + CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_IPv6_Nat \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_PDNSD \ @@ -30,8 +31,7 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Xray \ - CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin \ - CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_IPv6_Nat + CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin LUCI_TITLE:=LuCI support for PassWall LUCI_PKGARCH:=all @@ -43,6 +43,7 @@ LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \ +PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG:chinadns-ng \ +PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy:haproxy \ +PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria:hysteria \ + +PACKAGE_$(PKG_NAME)_INCLUDE_IPv6_Nat:ip6tables-mod-nat \ +PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \ +PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy:naiveproxy \ +PACKAGE_$(PKG_NAME)_INCLUDE_PDNSD:pdnsd-alt \ @@ -59,8 +60,7 @@ LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray-core \ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin:v2ray-plugin \ +PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core \ - +PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin:xray-plugin \ - +PACKAGE_$(PKG_NAME)_INCLUDE_IPv6_Nat:ip6tables-mod-nat + +PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin:xray-plugin define Package/$(PKG_NAME)/config menu "Configuration" @@ -81,6 +81,11 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria bool "Include Hysteria" default n +config PACKAGE_$(PKG_NAME)_INCLUDE_IPv6_Nat + depends on PACKAGE_ip6tables + bool "Include IPv6 Nat" + default n + config PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun bool "Include Kcptun" default n @@ -143,11 +148,6 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin bool "Include Xray-Plugin (Shadowsocks Plugin)" default n -config PACKAGE_$(PKG_NAME)_INCLUDE_IPv6_Nat - depends on PACKAGE_ip6tables - bool "Include IPv6 Nat" - default n - endmenu endef diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_v2ray.lua b/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_v2ray.lua index 32a611a81..689c44af2 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_v2ray.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_v2ray.lua @@ -6,6 +6,7 @@ local node_section = var["-node"] local proto = var["-proto"] local proxy_way = var["-proxy_way"] local redir_port = var["-redir_port"] +local sniffing = var["-sniffing"] local route_only = var["-route_only"] local local_socks_address = var["-local_socks_address"] or "0.0.0.0" local local_socks_port = var["-local_socks_port"] @@ -280,7 +281,7 @@ if node_section then protocol = "dokodemo-door", settings = {network = proto, followRedirect = true}, streamSettings = {sockopt = {tproxy = proxy_way}}, - sniffing = {enabled = true, destOverride = {"http", "tls", (dns_fakedns) and "fakedns"}, metadataOnly = false, routeOnly = route_only and true or nil} + sniffing = {enabled = sniffing and true or false, destOverride = {"http", "tls", (dns_fakedns) and "fakedns"}, metadataOnly = false, routeOnly = route_only and true or nil} }) end diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua index bee188241..52a1de489 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua @@ -179,6 +179,19 @@ o:value("disable", translate("No patterns are used")) o:value("default", translate("Default")) o:value("1:65535", translate("All")) +---- TCP Proxy Drop Ports +o = s:option(Value, "tcp_proxy_drop_ports", translate("TCP Proxy Drop Ports")) +o.default = "default" +o:value("disable", translate("No patterns are used")) +o:value("default", translate("Default")) + +---- UDP Proxy Drop Ports +o = s:option(Value, "udp_proxy_drop_ports", translate("UDP Proxy Drop Ports")) +o.default = "default" +o:value("disable", translate("No patterns are used")) +o:value("default", translate("Default")) +o:value("80,443", translate("QUIC")) + ---- TCP Redir Ports o = s:option(Value, "tcp_redir_ports", translate("TCP Redir Ports")) o.default = "default" @@ -280,12 +293,4 @@ o = s:option(Value, "dns_client_ip", translate("EDNS Client Subnet")) o.datatype = "ipaddr" o:depends("v2ray_dns_mode", "doh") -o = s:option(ListValue, "dns_query_strategy", translate("Query Strategy")) -o.default = "UseIPv4" -o:value("UseIPv4") -o:value("UseIPv6") -o:value("UseIP") -o:depends("dns_mode", "v2ray") -o:depends("dns_mode", "xray") - return m diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua index 8a191ed89..b5d122150 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -187,9 +187,6 @@ if api.is_finded("smartdns") then group_domestic.description = translate("You only need to configure domestic DNS packets in SmartDNS and set it redirect or as Dnsmasq upstream, and fill in the domestic DNS group name here.") end -o = s:taboption("DNS", Flag, "filter_proxy_ipv6", translate("Filter Proxy Host IPv6"), translate("Experimental feature.")) -o.default = "0" - ---- DNS Forward Mode dns_mode = s:taboption("DNS", ListValue, "dns_mode", translate("Filter Mode")) dns_mode.rmempty = false @@ -279,16 +276,6 @@ o.datatype = "ipaddr" o:depends("v2ray_dns_mode", "tcp") o:depends("v2ray_dns_mode", "doh") -o = s:taboption("DNS", ListValue, "dns_query_strategy", translate("Query Strategy")) -o.default = "UseIPv4" -o:value("UseIPv4") -o:value("UseIPv6") -o:value("UseIP") -o:depends({dns_mode = "v2ray", v2ray_dns_mode = "tcp"}) -o:depends({dns_mode = "v2ray", v2ray_dns_mode = "doh"}) -o:depends({dns_mode = "xray", v2ray_dns_mode = "tcp"}) -o:depends({dns_mode = "xray", v2ray_dns_mode = "doh"}) - o = s:taboption("DNS", Flag, "dns_cache", translate("Cache Resolved")) o.default = "1" o:depends({dns_mode = "dns2socks"}) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua index e92fc8f5c..752afd425 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua @@ -68,6 +68,17 @@ o.default = "disable" o:value("disable", translate("No patterns are used")) o:value("1:65535", translate("All")) +---- TCP Proxy Drop Ports +o = s:option(Value, "tcp_proxy_drop_ports", translate("TCP Proxy Drop Ports")) +o.default = "disable" +o:value("disable", translate("No patterns are used")) + +---- UDP Proxy Drop Ports +o = s:option(Value, "udp_proxy_drop_ports", translate("UDP Proxy Drop Ports")) +o.default = "80,443" +o:value("disable", translate("No patterns are used")) +o:value("80,443", translate("QUIC")) + ---- TCP Redir Ports o = s:option(Value, "tcp_redir_ports", translate("TCP Redir Ports")) o.default = "22,25,53,143,465,587,853,993,995,80,443" @@ -114,8 +125,13 @@ o = s:option(Flag, "accept_icmpv6", translate("Hijacking ICMPv6 (IPv6 PING)")) o:depends("ipv6_tproxy", true) o.default = 0 -o = s:option(Flag, "route_only", translate("Sniffing Route Only (V2Ray/Xray)")) +o = s:option(Flag, "sniffing", translate("Sniffing (V2Ray/Xray)"), translate("When using the V2ray/Xray shunt, must be enabled, otherwise the shunt will invalid.")) +o.default = 1 +o.rmempty = false + +o = s:option(Flag, "route_only", translate("Sniffing Route Only (Xray)"), translate("When enabled, the server not will resolve the domain name again.")) o.default = "1" +o:depends("sniffing", true) --[[ ---- TCP Redir Port diff --git a/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm b/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm index 6894947e6..34590f1f1 100644 --- a/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm +++ b/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm @@ -48,11 +48,13 @@ local api = require "luci.model.cbi.passwall.api.api" function add_node() { var nodes_link = document.getElementById("nodes_link").value; if (nodes_link.trim() != "") { - if (nodes_link.indexOf("ss://") == 0 || nodes_link.indexOf("ssr://") == 0 || nodes_link.indexOf("vmess://") == 0 || nodes_link.indexOf("vless://") == 0 || nodes_link.indexOf("trojan://") == 0 || nodes_link.indexOf("trojan-go://") == 0) { + var supports = "ss ssr vmess vless trojan trojan-go hysteria"; + var itype = nodes_link.split('://')[0]; + if (itype.trim() != "" && supports.indexOf(itype) > 0) { ajax_add_node(nodes_link); } else { - alert("<%:Please enter the correct link, ss:// ssr:// vmess:// vless:// trojan://%>"); + alert("<%:Please enter the correct link.%>"); } } else { @@ -79,7 +81,7 @@ local api = require "luci.model.cbi.passwall.api.api"