update 04-06 23:43

This commit is contained in:
github-actions[bot] 2022-04-06 23:43:08 +08:00
parent edf91f3e06
commit 03dc229705
11 changed files with 460 additions and 704 deletions

View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall PKG_NAME:=luci-app-passwall
PKG_VERSION:=4.52 PKG_VERSION:=4.52
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \ CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \

View File

@ -548,6 +548,7 @@ load_acl() {
local ipt_tmp=$ipt_n local ipt_tmp=$ipt_n
if [ "$TCP_PROXY_MODE" != "disable" ]; then if [ "$TCP_PROXY_MODE" != "disable" ]; then
[ "$TCP_NO_REDIR_PORTS" != "disable" ] && { [ "$TCP_NO_REDIR_PORTS" != "disable" ] && {
[ -n "${is_tproxy}" ] && ipt_tmp=$ipt_m
$ipt_tmp -A PSW $(comment "默认") -p tcp -m multiport --dport $TCP_NO_REDIR_PORTS -j RETURN $ipt_tmp -A PSW $(comment "默认") -p tcp -m multiport --dport $TCP_NO_REDIR_PORTS -j RETURN
$ip6t_m -A PSW $(comment "默认") -p tcp -m multiport --dport $TCP_NO_REDIR_PORTS -j RETURN $ip6t_m -A PSW $(comment "默认") -p tcp -m multiport --dport $TCP_NO_REDIR_PORTS -j RETURN
} }

File diff suppressed because it is too large Load Diff

View File

@ -867,6 +867,12 @@
103.183.124.0/23 103.183.124.0/23
103.183.26.0/23 103.183.26.0/23
103.183.66.0/23 103.183.66.0/23
103.184.44.0/23
103.184.46.0/23
103.184.60.0/23
103.185.228.0/23
103.185.78.0/23
103.185.80.0/23
103.19.12.0/22 103.19.12.0/22
103.19.232.0/22 103.19.232.0/22
103.19.40.0/22 103.19.40.0/22

View File

@ -34,7 +34,9 @@
2001:df0:4500::/48 2001:df0:4500::/48
2001:df0:59c0::/48 2001:df0:59c0::/48
2001:df0:85c0::/48 2001:df0:85c0::/48
2001:df0:8d40::/48
2001:df0:9c0::/48 2001:df0:9c0::/48
2001:df0:9d40::/48
2001:df0:b180::/48 2001:df0:b180::/48
2001:df0:bf80::/48 2001:df0:bf80::/48
2001:df0:d880::/48 2001:df0:d880::/48
@ -210,8 +212,11 @@
2400:6200::/32 2400:6200::/32
2400:6600::/32 2400:6600::/32
2400:6640::/32 2400:6640::/32
2400:66a0::/32
2400:66c0::/32 2400:66c0::/32
2400:66e0::/32
2400:6740::/32 2400:6740::/32
2400:67a0::/32
2400:67c0::/32 2400:67c0::/32
2400:6840::/32 2400:6840::/32
2400:68c0::/32 2400:68c0::/32

View File

@ -1,3 +1,4 @@
courier.push.apple.com
rbsxbxp-mim.vivox.com rbsxbxp-mim.vivox.com
rbsxbxp.www.vivox.com rbsxbxp.www.vivox.com
rbsxbxp-ws.vivox.com rbsxbxp-ws.vivox.com

View File

@ -35,6 +35,8 @@
1337xto.to 1337xto.to
1337xx.to 1337xx.to
16fhgdty.xyz 16fhgdty.xyz
177picyy.com
18comic.org
18novel.xyz 18novel.xyz
18p2p.com 18p2p.com
1degree.com.au 1degree.com.au
@ -64,6 +66,9 @@
2buybeatsbydre.com 2buybeatsbydre.com
2ch.net 2ch.net
2drdrebeats.com 2drdrebeats.com
2k.com
2kcoretech.online
2kgames.com
2mdn.net 2mdn.net
2o7.net 2o7.net
40shopping.com 40shopping.com
@ -98,6 +103,7 @@
85tube.com 85tube.com
881903.com 881903.com
8muses.com 8muses.com
90seconds.asia
91.51rmc.com 91.51rmc.com
91porn.com 91porn.com
920share.com 920share.com
@ -114,6 +120,7 @@
9to5mac.com 9to5mac.com
9to5terminal.com 9to5terminal.com
9to5toys.com 9to5toys.com
a-hentai.tv
a.91gay.me a.91gay.me
a.kslive.tv a.kslive.tv
a0pple.net a0pple.net
@ -279,6 +286,7 @@ afpforum.com
agendaweek.com agendaweek.com
agu.org agu.org
agzy1.com agzy1.com
ahegao.online
ahmia.fi ahmia.fi
aiaa.org aiaa.org
aiasahi.jp aiasahi.jp
@ -601,6 +609,7 @@ angulardart.org
anidom.com anidom.com
anigema.jp anigema.jp
animedao-tv.com animedao-tv.com
animeidhentai.com
animezilla.com animezilla.com
ankarazirvesi2018.com ankarazirvesi2018.com
anm.co.uk anm.co.uk
@ -1005,6 +1014,7 @@ aspnetcdn.com
asproex.com asproex.com
asproexapi.com asproexapi.com
assetsadobe.com assetsadobe.com
assistirhentai.com
associates-amazon.com associates-amazon.com
assylum.com assylum.com
astm.org astm.org
@ -2411,6 +2421,7 @@ bybeatsdre.com
bydrebeats.com bydrebeats.com
bypasscensorship.org bypasscensorship.org
byspotify.com byspotify.com
byteoversea.com
c-ij.com c-ij.com
c-span.org c-span.org
c-spanvideo.org c-spanvideo.org
@ -2445,6 +2456,7 @@ callersbane.com
callhulu.com callhulu.com
calvappd.me calvappd.me
cam4.com cam4.com
cambiaip.org
cambridge.org cambridge.org
cambridgedigital.net cambridgedigital.net
cambridgemaths.org cambridgemaths.org
@ -2872,9 +2884,11 @@ collins.in
colorprotechnology.com colorprotechnology.com
cometotheduckside.com cometotheduckside.com
commandandconquer.com commandandconquer.com
comments.app
commerceos.com commerceos.com
como-hackearfacebook.com como-hackearfacebook.com
comodo.com comodo.com
comodo.net
comodoca.com comodoca.com
comodoca2.com comodoca2.com
comodoca3.com comodoca3.com
@ -3105,6 +3119,8 @@ dengiamerika.com
deno.land deno.land
dentalhypotheses.com dentalhypotheses.com
dependabot.com dependabot.com
deps.dev
deps.info
desertbmw.com desertbmw.com
designeriphonescases.com designeriphonescases.com
desk.com desk.com
@ -3178,6 +3194,7 @@ dictate.ms
didce.com didce.com
diddykongracing.com diddykongracing.com
dierectv.com dierectv.com
digicert-cn.com
digicert.com digicert.com
digital-id.ch digital-id.ch
digital-rb.com digital-rb.com
@ -3419,6 +3436,7 @@ dotherex.com
dotmac.de dotmac.de
doubleclick.com doubleclick.com
doubleclick.net doubleclick.net
doujin-freee.com
douwriteright.com douwriteright.com
douya.org douya.org
dowjones.com dowjones.com
@ -3993,6 +4011,7 @@ eprintsw.com
erabaru.net erabaru.net
eracom.com.tw eracom.com.tw
erlang.org erlang.org
erogames.com
es-visiontimes.com es-visiontimes.com
esbeatsbydrebuy.com esbeatsbydrebuy.com
escandinavia-arg.com escandinavia-arg.com
@ -4317,6 +4336,7 @@ fandom.com
fandom.zendesk.com fandom.zendesk.com
fanhaodian.com fanhaodian.com
fantv.hk fantv.hk
fapster.xxx
farfetch-apps.com farfetch-apps.com
farfetch-contents.com farfetch-contents.com
farfetch.com farfetch.com
@ -4958,7 +4978,6 @@ git-scm.com
git.io git.io
gitbook.com gitbook.com
gitbook.io gitbook.io
github-avatars.oss-cn-hongkong.aliyuncs.com
github-cloud.s3.amazonaws.com github-cloud.s3.amazonaws.com
github.blog github.blog
github.com github.com
@ -5429,8 +5448,31 @@ hegre.com
heinonline.org heinonline.org
hellokittybeats.com hellokittybeats.com
hellosmartbook.com hellosmartbook.com
hentai-for.net
hentai-fun.com
hentai-moon.com
hentai.io
hentai.tv
hentai0.com
hentai2012.com
hentaiathome.net hentaiathome.net
hentaicore.org
hentaidude.com
hentaifox.com
hentaigamer.org
hentaigasm.com
hentaihaven.com
hentaihaven.me
hentaihaven.red
hentaihaven.xxx
hentaiheroes.com
hentaimangaporn.com
hentaiplay.net
hentairead.com
hentaitube.online
hentaiverse.org hentaiverse.org
hentaiworld.eu
hentaiworld.tv
heptio.com heptio.com
heraldsun.com.au heraldsun.com.au
heroesofdragonage.com heroesofdragonage.com
@ -5467,6 +5509,7 @@ hipzoom.net
historyofdota.com historyofdota.com
historyofdota.net historyofdota.net
historyofdota.org historyofdota.org
hitomi.la
hitun.io hitun.io
hk01.com hk01.com
hkbn.com.hk hkbn.com.hk
@ -6381,6 +6424,7 @@ iwork.com
iwork.se iwork.se
iwork.wang iwork.wang
ixquick.com ixquick.com
ixxx.com
iza.ne.jp iza.ne.jp
j2objc.org j2objc.org
jable.tv jable.tv
@ -6390,6 +6434,7 @@ japan-whores.com
japanesebeauties.net japanesebeauties.net
japanknowledge.com japanknowledge.com
jav.guru jav.guru
jav.place
jav01.cc jav01.cc
jav101.com jav101.com
jav168.cc jav168.cc
@ -6850,6 +6895,7 @@ managed-pki.de
managedmeetingrooms.com managedmeetingrooms.com
mandatewire.com mandatewire.com
manhuagui.com manhuagui.com
manhwahentai.me
manorama.com manorama.com
manoramanews.com manoramanews.com
manoramaonline.com manoramaonline.com
@ -7698,6 +7744,8 @@ myfreecams.com
myfun.com myfun.com
myguide.hk myguide.hk
myhelpinglab.com myhelpinglab.com
myhentaicomics.com
myhentaigallery.com
myhpsupport.com myhpsupport.com
myhulu.com myhulu.com
myicloud.net myicloud.net
@ -7900,7 +7948,11 @@ nfsworld.com
ngeo.com ngeo.com
nginx.com nginx.com
nginx.org nginx.org
nhentai.com
nhentai.io
nhentai.net nhentai.net
nhentai.to
nhentai.xxx
nhncorp.jp nhncorp.jp
nicesshop.net nicesshop.net
nicodic.jp nicodic.jp
@ -8175,6 +8227,7 @@ nurofen.ru
nurofen.sk nurofen.sk
nurofengel.com nurofengel.com
nurofensk-prod-env.eu-west-1.elasticbeanstalk.com nurofensk-prod-env.eu-west-1.elasticbeanstalk.com
nutaku.net
nutramigen.net nutramigen.net
nutramigen.pl nutramigen.pl
nvidia.asia nvidia.asia
@ -8279,6 +8332,7 @@ offresspecialesbmw.ca
offrezdesipods.com offrezdesipods.com
ogameblog.com ogameblog.com
ogp.me ogp.me
ohentai.org
ohyeah1080.com ohyeah1080.com
ok.ru ok.ru
okaapps.com okaapps.com
@ -8339,6 +8393,8 @@ opengraphprotocol.org
openjsf.org openjsf.org
openmaps.org openmaps.org
openresty.org openresty.org
opensourceinsight.dev
opensourceinsights.dev
openssl.org openssl.org
openstreetmap.com openstreetmap.com
openstreetmap.net openstreetmap.net
@ -8361,6 +8417,7 @@ oracle.com
oraclecloud.com oraclecloud.com
oraclefoundation.org oraclefoundation.org
oracleimg.com oracleimg.com
oracleinfinity.io
orbitera.com orbitera.com
oreil.ly oreil.ly
oreilly.com oreilly.com
@ -8418,6 +8475,7 @@ paaypal.com
pacifickitchenandhome.com pacifickitchenandhome.com
packagist.org packagist.org
packer.io packer.io
pacloudflare.com
page.link page.link
page3.com page3.com
pagecdn.com pagecdn.com
@ -8864,6 +8922,7 @@ polymerproject.org
popcap.com popcap.com
popjav.tv popjav.tv
porn.com porn.com
porn300.com
pornacho.com pornacho.com
pornbest.org pornbest.org
pornbrb.com pornbrb.com
@ -8874,6 +8933,7 @@ pornhubpremium.com
pornkai.com pornkai.com
pornmd.com pornmd.com
pornogramxxx.com pornogramxxx.com
pornrips.cc
pornstarbyface.com pornstarbyface.com
porntea.com porntea.com
pornzog.com pornzog.com
@ -9619,6 +9679,7 @@ site.com
sitepoint.com sitepoint.com
skate2.com skate2.com
skillshare.com skillshare.com
skunkgirl.cc
sky.com sky.com
skyassets.com skyassets.com
skyoceanrescue.com skyoceanrescue.com
@ -10154,6 +10215,7 @@ tailf.com
tailwindtraders.com tailwindtraders.com
taipeitimes.com taipeitimes.com
taiwannews.com.tw taiwannews.com.tw
take2games.com
takegoto.com takegoto.com
talentlens.com talentlens.com
talksport.com talksport.com
@ -10267,6 +10329,7 @@ thegooglestore.com
theguardian.com theguardian.com
theguardiandns.com theguardiandns.com
thehealthsite.com thehealthsite.com
thehentaiworld.com
thehulubraintrust.com thehulubraintrust.com
theinitium.com theinitium.com
theinstagramhack.com theinstagramhack.com
@ -10280,6 +10343,7 @@ themercury.com.au
themessengeradelaide.com.au themessengeradelaide.com.au
themoviedb.org themoviedb.org
thenationalpulse.com thenationalpulse.com
thenewgirlspooping.com
thenewslens.com thenewslens.com
thenextweb.com thenextweb.com
theopportunityproject.org theopportunityproject.org
@ -10343,6 +10407,7 @@ thomsonreuters.in
thomsonreuters.ru thomsonreuters.ru
thomsonreutersmexico.com thomsonreutersmexico.com
thtmod1.com thtmod1.com
thumbzilla.com
thunderbird.net thunderbird.net
thunderbolttechnology.net thunderbolttechnology.net
tiberiumalliances.com tiberiumalliances.com
@ -10353,6 +10418,7 @@ tidal.com
tidalhifi.com tidalhifi.com
tidelift.com tidelift.com
tiendabestbuy.com tiendabestbuy.com
tik-tokapi.com
tiktok.com tiktok.com
tiktokcdn.com tiktokcdn.com
tiktokv.com tiktokv.com
@ -10362,6 +10428,7 @@ timelinestoryteller.com
timesmembership.com timesmembership.com
timestalks.com timestalks.com
tinyurl.com tinyurl.com
tiohentai.com
tiresplus.com tiresplus.com
titanfall.com titanfall.com
tkb008.xyz tkb008.xyz
@ -10392,6 +10459,7 @@ touchsmartpc.net
touchsmartpc.org touchsmartpc.org
toutapp.com toutapp.com
towerauction.com towerauction.com
townofsins.com
townsvillebulletin.com.au townsvillebulletin.com.au
tr.com tr.com
tracking-location.com tracking-location.com
@ -10451,6 +10519,7 @@ tube8.com
tubesafari.com tubesafari.com
tubetubetube.com tubetubetube.com
tug.org tug.org
tukif.com
tumblr.com tumblr.com
tunsafe.com tunsafe.com
tuta.io tuta.io
@ -10470,8 +10539,10 @@ tvmedia.net.au
tvmost.com.hk tvmost.com.hk
tvnaviweb.jp tvnaviweb.jp
tvpromise.com tvpromise.com
twcomix.com
tweetdeck.com tweetdeck.com
twgreatnews.com twgreatnews.com
twhentai.com
twimg.com twimg.com
twinprime.com twinprime.com
twister.net.co twister.net.co
@ -10537,6 +10608,7 @@ umamusume.akamaized.net
umass.edu umass.edu
un.org un.org
unbrandedproducts.com unbrandedproducts.com
uncensoredhentai.xxx
underlords.com underlords.com
unfiltered.news unfiltered.news
unity.com unity.com
@ -11309,6 +11381,7 @@ wariowarediy.com
warp.plus warp.plus
warroom.org warroom.org
wasdj.com wasdj.com
washa.tv
washingtondcbmw.com washingtondcbmw.com
washingtonpost.com washingtonpost.com
watch-ebay.org watch-ebay.org
@ -11393,6 +11466,7 @@ whatthefox.com
wheelpop.com wheelpop.com
wheelworks.net wheelworks.net
whereilive.com.au whereilive.com.au
whichav.video
whimn.com.au whimn.com.au
whisolutions.com whisolutions.com
whispersystems.org whispersystems.org
@ -11487,6 +11561,7 @@ wmcloud.org
wmflabs.org wmflabs.org
wmfusercontent.org wmfusercontent.org
wmt.co wmt.co
wnacg.org
wofl.tv wofl.tv
woflthenewsstation.com woflthenewsstation.com
wogx.com wogx.com
@ -11607,7 +11682,9 @@ xdsummit.com
xdty.org xdty.org
xenoblade.com xenoblade.com
xeon.com xeon.com
xero.porn
xhamster.com xhamster.com
xhamster.desi
xhamsterlive.com xhamsterlive.com
xhcdn.com xhcdn.com
xindelu.com xindelu.com
@ -11827,6 +11904,7 @@ yahoodns.net
yahoofinance.com yahoofinance.com
yahoohealth.com yahoohealth.com
yahoomusic.com yahoomusic.com
yahoosandbox.com
yahoosportsbook.com yahoosportsbook.com
yale.edu yale.edu
yamaxun.com yamaxun.com

View File

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall2 PKG_NAME:=luci-app-passwall2
PKG_VERSION:=1.2 PKG_VERSION:=1.2
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \ CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \

View File

@ -15,7 +15,7 @@ config global_delay
config global_forwarding config global_forwarding
option process '0' option process '0'
option tcp_no_redir_ports 'disable' option tcp_no_redir_ports '5223'
option udp_no_redir_ports '53' option udp_no_redir_ports '53'
option accept_icmp '0' option accept_icmp '0'
option tcp_proxy_way 'redirect' option tcp_proxy_way 'redirect'

View File

@ -1,3 +1,4 @@
courier.push.apple.com
rbsxbxp-mim.vivox.com rbsxbxp-mim.vivox.com
rbsxbxp.www.vivox.com rbsxbxp.www.vivox.com
rbsxbxp-ws.vivox.com rbsxbxp-ws.vivox.com

View File

@ -347,14 +347,8 @@ load_acl() {
} }
# 加载默认代理模式 # 加载默认代理模式
local ipt_tmp=$ipt_n
if [ "$TCP_PROXY_MODE" != "disable" ]; then if [ "$TCP_PROXY_MODE" != "disable" ]; then
[ "$TCP_NO_REDIR_PORTS" != "disable" ] && { local ipt_tmp=$ipt_n
$ipt_tmp -A PSW2 $(comment "默认") -p tcp -m multiport --dport $TCP_NO_REDIR_PORTS -j RETURN
$ip6t_m -A PSW2 $(comment "默认") -p tcp -m multiport --dport $TCP_NO_REDIR_PORTS -j RETURN
}
ipt_tmp=$ipt_n
[ "$NODE" != "nil" ] && { [ "$NODE" != "nil" ] && {
msg="TCP默认代理使用节点[$(config_n_get $NODE remarks)] [$(get_action_chain_name $TCP_PROXY_MODE)]" msg="TCP默认代理使用节点[$(config_n_get $NODE remarks)] [$(get_action_chain_name $TCP_PROXY_MODE)]"
if [ -n "${is_tproxy}" ]; then if [ -n "${is_tproxy}" ]; then
@ -364,7 +358,11 @@ load_acl() {
msg="${msg}(REDIRECT:${REDIR_PORT})代理" msg="${msg}(REDIRECT:${REDIR_PORT})代理"
fi fi
[ "$TCP_NO_REDIR_PORTS" != "disable" ] && msg="${msg}${TCP_NO_REDIR_PORTS}外的" [ "$TCP_NO_REDIR_PORTS" != "disable" ] && {
$ipt_tmp -A PSW2 $(comment "默认") -p tcp -m multiport --dport $TCP_NO_REDIR_PORTS -j RETURN
$ip6t_m -A PSW2 $(comment "默认") -p tcp -m multiport --dport $TCP_NO_REDIR_PORTS -j RETURN
msg="${msg}${TCP_NO_REDIR_PORTS}外的"
}
msg="${msg}所有端口" msg="${msg}所有端口"
$ipt_tmp -A PSW2 $(comment "默认") -p tcp -d $FAKE_IP $(REDIRECT $REDIR_PORT $is_tproxy) $ipt_tmp -A PSW2 $(comment "默认") -p tcp -d $FAKE_IP $(REDIRECT $REDIR_PORT $is_tproxy)