fix: transparent and ports mode using different routing now

This commit is contained in:
mzz2017 committed 2020-01-29 12:59:21 +08:00
1 parent fad06cbe79
commit f5d8ff7592
7 files changed
+197 -132

No files matched your search

+1 -5
View File
@@ -93,11 +93,7 @@
</b-checkbox-button>
</template>
</b-field>
<b-field
v-show="transparent === 'close'"
label="PAC模式"
label-position="on-border"
>
<b-field label="PAC模式" label-position="on-border">
<b-select v-model="pacMode" expanded style="flex-shrink: 0">
<option value="whitelist">大陆白名单(Recommend)</option>
<option value="gfwlist">GFWList</option>
+2 -1
View File
@@ -5,6 +5,7 @@ go 1.12
require (
github.com/Code-Hex/pget v0.0.0-20170428105109-9294f7465fa7
github.com/Code-Hex/updater v0.0.0-20160712085121-c3f278672520 // indirect
github.com/DNSCrypt/dnscrypt-proxy v0.0.0-20200125144523-349320f29126 // indirect
github.com/PuerkitoBio/goquery v1.5.0
github.com/antonholmquist/jason v1.0.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
@@ -35,7 +36,7 @@ require (
github.com/tidwall/gjson v1.3.5
github.com/tidwall/sjson v1.0.4
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
golang.org/x/net v0.0.0-20191014212845-da9a3fd4c582
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
)
+55
View File
@@ -4,9 +4,14 @@ github.com/Code-Hex/pget v0.0.0-20170428105109-9294f7465fa7 h1:FxSHMytwB6Zu/zCDq
github.com/Code-Hex/pget v0.0.0-20170428105109-9294f7465fa7/go.mod h1:GYbU7xYkm++KTsMcfaEQ0nl+ghGWnodX7trdDB2PVj8=
github.com/Code-Hex/updater v0.0.0-20160712085121-c3f278672520 h1:AhI5ytq4dAam2scBpgeQY/9kz/covK9/NMyzO3e8350=
github.com/Code-Hex/updater v0.0.0-20160712085121-c3f278672520/go.mod h1:RZRMRhdqo/22EdcyGiDJdIdCrptsRDEbqQ8/bswHV1E=
github.com/DNSCrypt/dnscrypt-proxy v0.0.0-20200125144523-349320f29126 h1:7EKFz4lHtYe3thFsj2Su6IWEkmBYcYxOByylKY/M6bs=
github.com/DNSCrypt/dnscrypt-proxy v0.0.0-20200125144523-349320f29126/go.mod h1:6jgUr2EBQm7FrQGTK4Dh/RZns67FulBJvabpgyFTDaw=
github.com/PuerkitoBio/goquery v1.5.0 h1:uGvmFXOA73IKluu/F84Xd1tt/z07GYm8X49XKHP7EJk=
github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg=
github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0=
github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o=
github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
github.com/antonholmquist/jason v1.0.0 h1:Ytg94Bcf1Bfi965K2q0s22mig/n4eGqEij/atENBhA0=
@@ -15,10 +20,12 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/cakturk/go-netstat v0.0.0-20190620190123-a633b9c55b1a h1:I0oYYyd2KaFAsWR0BMo3erFXRGyzCzD8BBxGEKN7dq4=
github.com/cakturk/go-netstat v0.0.0-20190620190123-a633b9c55b1a/go.mod h1:G0rQZqjMf5TateNANTgcIsauUkUJuTnHNavCnX84R7Q=
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dchest/safefile v0.0.0-20151022103144-855e8d98f185/go.mod h1:cFRxtTwTOJkz2x3rQUNCYKWC93yP1VKjR8NUhqFxZNU=
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgryski/go-camellia v0.0.0-20140412174459-3be6b3054dd1/go.mod h1:QX5ZVULjAfZJux/W62Y91HvCh9hyW6enAwcrrv/sLj0=
@@ -33,6 +40,8 @@ github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5Jflh
github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
github.com/ebfe/rc2 v0.0.0-20131011165748-24b9757f5521 h1:fBHFH+Y/GPGFGo7LIrErQc3p2MeAhoIQNgaxPWYsSxk=
github.com/ebfe/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:ucvhdsUCE3TH0LoLRb6ShHiJl8e39dGlx6A4g/ujlow=
github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5/go.mod h1:JpoxHjuQauoxiFMl1ie8Xc/7TfLuMZ5eOCONd1sUBHg=
github.com/facebookgo/pidfile v0.0.0-20150612191647-f242e2999868/go.mod h1:3Hzo46xzfVpIdv4lJw7YBp9fUJ7HpUgbjH1fFDgy4qM=
github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/frankban/quicktest v1.7.2 h1:2QxQoC1TS09S7fhCPsrvqYdvP1H5M1P1ih5ABm3BTYk=
@@ -52,12 +61,28 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/gookit/color v1.2.0 h1:lHA77Kuyi5JpBnA9ESvwkY+nanLjRZ0mHbWQXRYk2Lk=
github.com/gookit/color v1.2.0/go.mod h1:AhIE+pS6D4Ql0SQWbBeXPHw7gY0/sjHoA4s/n1KB7xg=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/hashicorp/go-immutable-radix v1.1.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95/go.mod h1:QiyDdbZLaJ/mZP4Zwc9g2QsfaEA4o7XvvgZegSci5/E=
github.com/jedisct1/dlog v0.0.0-20190909160351-692385b00b84/go.mod h1:YXh1b5j+lwirsCCtTJW19DrbpaL9/5UzwNjI78Cvrg8=
github.com/jedisct1/go-clocksmith v0.0.0-20190707124905-73e087c7979c/go.mod h1:SAINchklztk2jcLWJ4bpNF4KnwDUSUTX+cJbspWC2Rw=
github.com/jedisct1/go-dnsstamps v0.0.0-20191014084838-3e6e00f2b602/go.mod h1:PCThSkefP5QIL83fIkZ3Qi5Jt02JlWTFB1j9h69Sf2Y=
github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU=
github.com/jedisct1/xsecretbox v0.0.0-20190909160646-b731c21297f9/go.mod h1:MipBKo+gZlzpd1JXA1OliuwvtQizlFeu4aMAyTLh8bo=
github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/k-sone/critbitgo v1.4.0/go.mod h1:7E6pyoyADnFxlUBEKcnfS49b7SUAQGMK+OAp/UQvo0s=
github.com/kardianos/service v1.0.1-0.20191211031725-3c356ae54c8a/go.mod h1:8CzDhVuCuugtsHyZoTvsOBuvonN/UDBvl0kH+BUxvbo=
github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
@@ -81,6 +106,7 @@ github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2 h1:YocNLcTBdEd
github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2/go.mod h1:76rfSfYPWj01Z85hUf/ituArm797mNKcvINh1OlsZKo=
github.com/mholt/archiver v3.1.1+incompatible h1:1dCVxuqs0dJseYEhi5pl7MYPH9zDa1wBi7mF09cbNkU=
github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU=
github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -106,8 +132,12 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/powerman/check v1.2.1/go.mod h1:IW+hYd9ihaKn7ri1+NGS8WWwrKdytbU8hgNC1wbcurc=
github.com/ricochet2200/go-disk-usage v0.0.0-20150921141558-f0d1b743428f h1:w4VLAgWDnrcBDFSi8Ppn/MrB/Z1A570+MV90CvMtVVA=
github.com/ricochet2200/go-disk-usage v0.0.0-20150921141558-f0d1b743428f/go.mod h1:yhevTRDiduxPJHQDCtlqUn53ojFPkRh/mKhMUzQUCpc=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/stevenroose/gonfig v0.1.4 h1:oaMK7zCihVqlPIHXHNwDT9Hl/tH09RALGQ8TmUuYdl0=
github.com/stevenroose/gonfig v0.1.4/go.mod h1:JBkjIE8NdLbRNBowFCgK7wirNR0GHhnRhtdJgZMIylM=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -138,34 +168,56 @@ gitlab.com/yawning/chacha20.git v0.0.0-20190903091407-6d1cb28dc72c h1:yrfrd1u7MW
gitlab.com/yawning/chacha20.git v0.0.0-20190903091407-6d1cb28dc72c/go.mod h1:3x6b94nWCP/a2XB/joOPMiGYUBvqbLfeY/BkHLeDs6s=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191010185427-af544f31c8ac/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d h1:2+ZP7EfsZV7Vvmx3TIqSlSzATMkTAKqM14YGFPoSKjI=
golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c h1:uOCk1iQW6Vc18bnC13MfzScl+wdKBmM9Y9kU7Z83/lw=
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20191014212845-da9a3fd4c582 h1:p9xBe/w/OzkeYVKm234g55gMdD1nSIooTir5kV11kfA=
golang.org/x/net v0.0.0-20191014212845-da9a3fd4c582/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190116161447-11f53e031339/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b h1:ag/x1USPSsqHud38I9BAC88qdNLDHHtQ4mlgQIZPPNA=
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190529164535-6a60838ec259/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190902133755-9109b7679e13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190909082730-f460065e899a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191009170203-06d7bd2c5f4f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191020212454-3e7259c5e7c2 h1:nq114VpM8lsSlP+lyUbANecYHYiFcSNFtqcBlxRV+gA=
golang.org/x/sys v0.0.0-20191020212454-3e7259c5e7c2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1 h1:gZpLHxUX5BdYLA08Lj4YCJNN/jk7KtquiArPoeX0WvA=
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
@@ -176,5 +228,8 @@ gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXa
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ=
gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+1 -3
View File
@@ -197,10 +197,8 @@ func run() (err error) {
_ = v2ray.RestartV2rayService()
}
//刷新配置以刷新透明代理、ssr server
_ = service.CheckAndStopTransparentProxy()
err = v2ray.UpdateV2rayWithConnectedServer()
//开启透明代理
//_ = service.CheckAndStopTransparentProxy()
//err = service.CheckAndSetupTransparentProxy(true)
if err != nil {
w := configure.GetConnectedServer()
log.Println("which:", w)
+58 -58
View File
@@ -185,64 +185,64 @@ iptables -t mangle -A SSTP_PRE -p udp -m mark ! --mark 1 -j SETMARK
iptables -t mangle -A SSTP_PRE -m mark --mark 1 -p tcp -j TPROXY --on-port 12345 --tproxy-mark 1
iptables -t mangle -A SSTP_PRE -m mark --mark 1 -p udp -j TPROXY --on-port 12345 --tproxy-mark 1
`
if cmds.IsCommandValid("ip6tables") {
commands += `
# 建链
ip6tables -t mangle -N SSTP_OUT
ip6tables -t mangle -N SSTP_PRE
ip6tables -t mangle -A OUTPUT -j SSTP_OUT
ip6tables -t mangle -A PREROUTING -j SSTP_PRE
# 打上 iptables 标记,mark 了的会走代理
ip6tables -t mangle -N SETMARK
ip6tables -t mangle -A SETMARK -i docker+ -j RETURN
`
if s.DnsForward == configure.Yes {
commands += `
ip6tables -t mangle -A SETMARK -p udp --dport 53 -j MARK --set-mark 1
ip6tables -t mangle -A SETMARK -p tcp --dport 53 -j MARK --set-mark 1
`
} else {
commands += `
ip6tables -t mangle -A SETMARK -p udp --dport 53 -j RETURN
ip6tables -t mangle -A SETMARK -p tcp --dport 53 -j RETURN
`
}
commands += `
ip6tables -t mangle -A SETMARK -d ::/128 -j RETURN
ip6tables -t mangle -A SETMARK -d ::1/128 -j RETURN
ip6tables -t mangle -A SETMARK -d ::ffff:0:0/96 -j RETURN
ip6tables -t mangle -A SETMARK -d ::ffff:0:0:0/96 -j RETURN
ip6tables -t mangle -A SETMARK -d 64:ff9b::/96 -j RETURN
ip6tables -t mangle -A SETMARK -d 100::/64 -j RETURN
ip6tables -t mangle -A SETMARK -d 2001::/32 -j RETURN
ip6tables -t mangle -A SETMARK -d 2001:20::/28 -j RETURN
ip6tables -t mangle -A SETMARK -d 2001:db8::/32 -j RETURN
ip6tables -t mangle -A SETMARK -d 2002::/16 -j RETURN
ip6tables -t mangle -A SETMARK -d fc00::/7 -j RETURN
ip6tables -t mangle -A SETMARK -d fe80::/10 -j RETURN
ip6tables -t mangle -A SETMARK -p udp -j MARK --set-mark 1
ip6tables -t mangle -A SETMARK -p tcp -j MARK --set-mark 1
# 走过TPROXY的通行
ip6tables -t mangle -A SSTP_OUT -m mark --mark 0xff -j RETURN
# 本机出方向规则,白名单端口
ip6tables -t mangle -A SSTP_OUT -p tcp -m multiport --sports {{TCP_PORTS}} -j RETURN
ip6tables -t mangle -A SSTP_OUT -p udp -m multiport --sports {{UDP_PORTS}} -j RETURN
# 本机发出去的 TCP 和 UDP 走一下 SETMARK 链
ip6tables -t mangle -A SSTP_OUT -p tcp -m mark ! --mark 1 -j SETMARK
ip6tables -t mangle -A SSTP_OUT -p udp -m mark ! --mark 1 -j SETMARK
# 走过TPROXY的通行
ip6tables -t mangle -A SSTP_PRE -m mark --mark 0xff -j RETURN
# 让内网主机发出的 TCP 和 UDP 走一下 SETMARK 链
ip6tables -t mangle -A SSTP_PRE -p tcp -m mark ! --mark 1 -j SETMARK
ip6tables -t mangle -A SSTP_PRE -p udp -m mark ! --mark 1 -j SETMARK
# 将所有打了标记的 TCP 和 UDP 包透明地转发到代理的监听端口
ip6tables -t mangle -A SSTP_PRE -m mark --mark 1 -p tcp -j TPROXY --on-port 12345 --tproxy-mark 1
ip6tables -t mangle -A SSTP_PRE -m mark --mark 1 -p udp -j TPROXY --on-port 12345 --tproxy-mark 1
`
}
// if cmds.IsCommandValid("ip6tables") {
// commands += `
//# 建链
//ip6tables -t mangle -N SSTP_OUT
//ip6tables -t mangle -N SSTP_PRE
//ip6tables -t mangle -A OUTPUT -j SSTP_OUT
//ip6tables -t mangle -A PREROUTING -j SSTP_PRE
//
//# 打上 iptables 标记,mark 了的会走代理
//ip6tables -t mangle -N SETMARK
//ip6tables -t mangle -A SETMARK -i docker+ -j RETURN
//`
// if s.DnsForward == configure.Yes {
// commands += `
//ip6tables -t mangle -A SETMARK -p udp --dport 53 -j MARK --set-mark 1
//ip6tables -t mangle -A SETMARK -p tcp --dport 53 -j MARK --set-mark 1
//`
// } else {
// commands += `
//ip6tables -t mangle -A SETMARK -p udp --dport 53 -j RETURN
//ip6tables -t mangle -A SETMARK -p tcp --dport 53 -j RETURN
//`
// }
// commands += `
//ip6tables -t mangle -A SETMARK -d ::/128 -j RETURN
//ip6tables -t mangle -A SETMARK -d ::1/128 -j RETURN
//ip6tables -t mangle -A SETMARK -d ::ffff:0:0/96 -j RETURN
//ip6tables -t mangle -A SETMARK -d ::ffff:0:0:0/96 -j RETURN
//ip6tables -t mangle -A SETMARK -d 64:ff9b::/96 -j RETURN
//ip6tables -t mangle -A SETMARK -d 100::/64 -j RETURN
//ip6tables -t mangle -A SETMARK -d 2001::/32 -j RETURN
//ip6tables -t mangle -A SETMARK -d 2001:20::/28 -j RETURN
//ip6tables -t mangle -A SETMARK -d 2001:db8::/32 -j RETURN
//ip6tables -t mangle -A SETMARK -d 2002::/16 -j RETURN
//ip6tables -t mangle -A SETMARK -d fc00::/7 -j RETURN
//ip6tables -t mangle -A SETMARK -d fe80::/10 -j RETURN
//ip6tables -t mangle -A SETMARK -p udp -j MARK --set-mark 1
//ip6tables -t mangle -A SETMARK -p tcp -j MARK --set-mark 1
//
//# 走过TPROXY的通行
//ip6tables -t mangle -A SSTP_OUT -m mark --mark 0xff -j RETURN
//# 本机出方向规则,白名单端口
//ip6tables -t mangle -A SSTP_OUT -p tcp -m multiport --sports {{TCP_PORTS}} -j RETURN
//ip6tables -t mangle -A SSTP_OUT -p udp -m multiport --sports {{UDP_PORTS}} -j RETURN
//# 本机发出去的 TCP 和 UDP 走一下 SETMARK 链
//ip6tables -t mangle -A SSTP_OUT -p tcp -m mark ! --mark 1 -j SETMARK
//ip6tables -t mangle -A SSTP_OUT -p udp -m mark ! --mark 1 -j SETMARK
//
//# 走过TPROXY的通行
//ip6tables -t mangle -A SSTP_PRE -m mark --mark 0xff -j RETURN
//# 让内网主机发出的 TCP 和 UDP 走一下 SETMARK 链
//ip6tables -t mangle -A SSTP_PRE -p tcp -m mark ! --mark 1 -j SETMARK
//ip6tables -t mangle -A SSTP_PRE -p udp -m mark ! --mark 1 -j SETMARK
//# 将所有打了标记的 TCP 和 UDP 包透明地转发到代理的监听端口
//ip6tables -t mangle -A SSTP_PRE -m mark --mark 1 -p tcp -j TPROXY --on-port 12345 --tproxy-mark 1
//ip6tables -t mangle -A SSTP_PRE -m mark --mark 1 -p udp -j TPROXY --on-port 12345 --tproxy-mark 1
//`
// }
//参考http://briteming.hatenablog.com/entry/2019/06/18/175518
//先看要不要把自己的端口加进去
selfPort := strings.Split(global.GetEnvironmentConfig().Address, ":")[1]
-28
View File
@@ -80,34 +80,6 @@ const TemplateJson = `{
"rules": []
}
},
"whitelist": [
{
"type": "field",
"inboundTag": ["pac"],
"outboundTag": "direct",
"domain": ["geosite:cn"]
},
{
"type": "field",
"inboundTag": ["pac"],
"outboundTag": "direct",
"ip": ["geoip:cn", "geoip:private"]
}
],
"gfwlist": [
{
"type": "field",
"inboundTag": ["pac"],
"outboundTag": "proxy",
"domain": ["ext:h2y.dat:gfw"]
},
{
"type": "field",
"inboundTag": ["pac"],
"network": "tcp,udp",
"outboundTag": "direct"
}
],
"tcpSettings": {
"connectionReuse": true,
"header": {
+80 -37
View File
@@ -403,7 +403,6 @@ func NewTemplateFromVmessInfo(v vmessInfo.VmessInfo) (t Template, err error) {
"geosite:cn", // 国内白名单走DNSPod
"domain:ntp.org", // NTP 服务器
"domain:dogedoge.com", // mzz2017爱用的多吉
"domain:233py.com", // DOH服务器
"dns.google", // DOH服务器
"v2raya.mzz.pub", // V2RayA demo
},
@@ -537,7 +536,75 @@ func NewTemplateFromVmessInfo(v vmessInfo.VmessInfo) (t Template, err error) {
)
}
}
//根据设置修改路由
//端口入口有自己的规则
t.Routing.Rules = append(t.Routing.Rules,
RoutingRule{ // socks和http无论在全局还是非全局模式下都走代理
Type: "field",
OutboundTag: "proxy",
InboundTag: []string{"socks", "http"},
},
)
//PAC端口规则
switch setting.PacMode {
case configure.WhitelistMode:
t.Routing.Rules = append(t.Routing.Rules,
RoutingRule{ // 直连中国大陆主流网站 ip 和 私有 ip
Type: "field",
OutboundTag: "direct",
InboundTag: []string{"pac"},
IP: []string{"geoip:private", "geoip:cn"},
},
RoutingRule{ // 直连中国大陆主流网站域名
Type: "field",
OutboundTag: "direct",
InboundTag: []string{"pac"},
Domain: []string{"geosite:cn"},
},
)
case configure.GfwlistMode:
t.Routing.Rules = append(t.Routing.Rules,
RoutingRule{
Type: "field",
OutboundTag: "proxy",
InboundTag: []string{"pac"},
Domain: []string{"ext:h2y.dat:gfw"},
},
RoutingRule{
Type: "field",
OutboundTag: "direct",
InboundTag: []string{"pac"},
},
)
case configure.CustomMode:
for _, v := range setting.CustomPac.RoutingRules {
rule := RoutingRule{
Type: "field",
OutboundTag: string(v.RuleType),
InboundTag: []string{"pac"},
}
for i := range v.Tags {
v.Tags[i] = "ext:custom.dat:" + v.Tags[i]
}
switch v.MatchType {
case configure.DomainMatchRule:
rule.Domain = v.Tags
case configure.IpMatchRule:
rule.IP = v.Tags
}
t.Routing.Rules = append(t.Routing.Rules, rule)
}
//如果默认直连,规则内的才走代理,则需要加上下述规则
if setting.CustomPac.DefaultProxyMode == "direct" {
t.Routing.Rules = append(t.Routing.Rules, RoutingRule{
Type: "field",
OutboundTag: "direct",
InboundTag: []string{"pac"},
})
}
}
//根据是否使用全局代理修改路由
if setting.Transparent != configure.TransparentClose && CheckTProxySupported() == nil {
switch setting.Transparent {
case configure.TransparentProxy:
@@ -546,11 +613,19 @@ func NewTemplateFromVmessInfo(v vmessInfo.VmessInfo) (t Template, err error) {
RoutingRule{ // 直连中国大陆主流网站 ip 和 私有 ip
Type: "field",
OutboundTag: "direct",
InboundTag: []string{"transparent"},
IP: []string{"geoip:private", "geoip:cn"},
},
RoutingRule{ // 直连中国大陆主流网站 ip 和 私有 ip
Type: "field",
OutboundTag: "direct",
InboundTag: []string{"transparent"},
IP: []string{"geoip:private", "geoip:cn"},
},
RoutingRule{ // 直连中国大陆主流网站域名
Type: "field",
OutboundTag: "direct",
InboundTag: []string{"transparent"},
Domain: []string{"geosite:cn"},
},
)
@@ -559,52 +634,20 @@ func NewTemplateFromVmessInfo(v vmessInfo.VmessInfo) (t Template, err error) {
RoutingRule{
Type: "field",
OutboundTag: "proxy",
InboundTag: []string{"transparent"},
Domain: []string{"ext:h2y.dat:gfw"},
},
RoutingRule{
Type: "field",
OutboundTag: "direct",
Network: "tcp,udp",
InboundTag: []string{"transparent"},
},
)
}
} else {
_ = iptables.DeleteRules()
// 不是全局模式,根据设置修改路由部分的PAC规则
switch setting.PacMode {
case configure.WhitelistMode:
t.Routing.Rules = append(t.Routing.Rules, tmplJson.Whitelist...)
case configure.GfwlistMode:
t.Routing.Rules = append(t.Routing.Rules, tmplJson.Gfwlist...)
case configure.CustomMode:
for _, v := range setting.CustomPac.RoutingRules {
rule := RoutingRule{
Type: "field",
OutboundTag: string(v.RuleType),
InboundTag: []string{"pac"},
}
for i := range v.Tags {
v.Tags[i] = "ext:custom.dat:" + v.Tags[i]
}
switch v.MatchType {
case configure.DomainMatchRule:
rule.Domain = v.Tags
case configure.IpMatchRule:
rule.IP = v.Tags
}
t.Routing.Rules = append(t.Routing.Rules, rule)
}
//如果默认直连,规则内的才走代理,则需要加上下述规则
if setting.CustomPac.DefaultProxyMode == "direct" {
t.Routing.Rules = append(t.Routing.Rules, RoutingRule{
Type: "field",
OutboundTag: "direct",
InboundTag: []string{"pac"},
Network: "tcp,udp",
})
}
}
}
return t, nil
}