Commit Graph

315 Commits

Author SHA1 Message Date
gVisor bot
47450aa401 1.fix module package
2.fix govet error
2022-03-18 02:35:15 +08:00
gVisor bot
b8c9a1bf6d update 2022-03-17 23:24:07 +08:00
gVisor bot
db31cfbd7f Merge remote-tracking branch 'yaling888/with-tun' into Alpha
# Conflicts:
#	.github/workflows/codeql-analysis.yml
#	.github/workflows/linter.yml
#	.github/workflows/release.yml
#	Makefile
#	README.md
#	adapter/outbound/vless.go
#	component/geodata/memconservative/cache.go
#	component/geodata/router/condition.go
#	component/geodata/router/condition_geoip.go
#	component/geodata/standard/standard.go
#	component/geodata/utils.go
#	config/config.go
#	config/initial.go
#	constant/metadata.go
#	constant/path.go
#	constant/rule.go
#	constant/rule_extra.go
#	dns/client.go
#	dns/filters.go
#	dns/resolver.go
#	go.mod
#	go.sum
#	hub/executor/executor.go
#	hub/route/configs.go
#	listener/listener.go
#	listener/tproxy/tproxy_linux_iptables.go
#	listener/tun/dev/dev.go
#	listener/tun/dev/dev_darwin.go
#	listener/tun/dev/dev_linux.go
#	listener/tun/dev/dev_windows.go
#	listener/tun/dev/wintun/config.go
#	listener/tun/dev/wintun/dll_windows.go
#	listener/tun/dev/wintun/session_windows.go
#	listener/tun/dev/wintun/wintun_windows.go
#	listener/tun/ipstack/commons/dns.go
#	listener/tun/ipstack/gvisor/tun.go
#	listener/tun/ipstack/gvisor/tundns.go
#	listener/tun/ipstack/gvisor/utils.go
#	listener/tun/ipstack/stack_adapter.go
#	listener/tun/ipstack/system/dns.go
#	listener/tun/ipstack/system/tcp.go
#	listener/tun/ipstack/system/tun.go
#	listener/tun/tun_adapter.go
#	main.go
#	rule/common/base.go
#	rule/common/domain.go
#	rule/common/domain_keyword.go
#	rule/common/domain_suffix.go
#	rule/common/final.go
#	rule/common/geoip.go
#	rule/common/geosite.go
#	rule/common/ipcidr.go
#	rule/common/port.go
#	rule/parser.go
#	rule/process.go
#	test/go.mod
#	test/go.sum
#	transport/vless/xtls.go
#	tunnel/tunnel.go
2022-03-17 17:41:02 +08:00
gVisor bot
f3d1de077e [Fix] Parse 2022-03-17 12:26:43 +08:00
gVisor bot
77f725afb6 [Fix] Parse 2022-03-17 12:23:50 +08:00
gVisor bot
50ab57c72e Merge remote-tracking branch 'clash/dev' into Alpha
# Conflicts:
#	.github/workflows/docker.yml
#	adapter/outboundgroup/fallback.go
#	adapter/outboundgroup/loadbalance.go
#	adapter/outboundgroup/relay.go
#	adapter/outboundgroup/selector.go
#	adapter/outboundgroup/urltest.go
#	config/config.go
#	go.mod
#	go.sum
#	main.go
#	test/go.mod
#	test/go.sum
2022-03-17 01:41:51 +08:00
gVisor bot
90e464ef38 [Fix] 优化geodata初始化逻辑 2022-03-16 22:55:18 +08:00
gVisor bot
446fd99436 Chore: Merge branch 'ogn-dev' into with-tun 2022-03-16 20:16:30 +08:00
gVisor bot
7a3a4413c9 [build test] 2022-03-16 17:29:09 +08:00
gVisor bot
907c68c9cb Migration: go 1.18 2022-03-16 12:10:13 +08:00
gVisor bot
40381afa05 [build test] 2022-03-16 00:43:08 +08:00
gVisor bot
f7759c1468 Merge remote-tracking branch 'clash/dev' into Alpha
# Conflicts:
#	.github/workflows/codeql-analysis.yml
#	.github/workflows/docker.yml
#	.github/workflows/linter.yml
#	.github/workflows/stale.yml
#	Makefile
#	component/dialer/dialer.go
#	config/config.go
#	constant/metadata.go
#	constant/rule.go
#	rule/common/domain.go
#	rule/common/domain_keyword.go
#	rule/common/domain_suffix.go
#	rule/common/final.go
#	rule/common/ipcidr.go
#	rule/geoip.go
#	rule/parser.go
#	rule/port.go
#	rule/process.go
2022-03-15 23:13:41 +08:00
gVisor bot
440b54ab22 [Skip CI] 2022-03-15 22:25:33 +08:00
gVisor bot
fb7ba942c7 Style: code style 2022-03-15 02:55:06 +08:00
gVisor bot
dc0339e399 Chore: embed the RuleExtra into Base 2022-03-13 01:22:05 +08:00
gVisor bot
c8861d83f8 Chore: bump to go1.18rc1, use netip.Addr to replace net.IP with system TUN stack 2022-03-12 02:16:13 +08:00
gVisor bot
0175b103d0 Chore: refactor TUN 2022-03-09 05:08:35 +08:00
gVisor bot
e5358cd03a Feature: resolve ip with a proxy adapter 2022-02-23 02:38:50 +08:00
gVisor bot
7f0de1861a Merge from remote branch 2022-02-23 01:00:27 +08:00
gVisor bot
47359cc80f Fix: routing-mark should effect on root 2022-02-17 14:23:47 +08:00
gVisor bot
a156c88a75 [Fix]GeoSite.dat initial in logic rule 2022-02-06 04:41:34 +08:00
gVisor bot
8ad63d9707 [Fix]GeoSite.dat initial in logic rule 2022-02-06 04:30:54 +08:00
gVisor bot
f5933b91f1 [build] 2022-02-06 01:59:35 +08:00
gVisor bot
b75e8f9500 [FEAT] Add geodata loader mode switch 2022-02-05 02:42:49 +08:00
gVisor bot
e3a61dbbd3 [FEAT] Add geodata loader mode switch 2022-02-05 00:51:06 +08:00
gVisor bot
c57d92d7c1 [Feat]
support trojan xtls
change geodataloader mode as memconservative
2022-02-04 23:33:36 +08:00
gVisor bot
095a65abd9 [Feat]
1.Add DNS over QUIC support
2.Replace Country.mmdb with GeoIP.dat
3.build with Alpha tag
2022-01-27 12:25:53 +08:00
gVisor bot
4795a01a56 [Fixed] GEOSITE rule load fail 2022-01-23 18:27:44 +08:00
gVisor bot
6a78bca9fb [Feature]
1.Add Network rule, match network type(TCP/UDP)
2.Add logic rules(NOT,OR,AND)
-AND,((DOMAIN,baidu.com),(NETWORK,UDP)),REJECT

(cherry picked from commit d7092e2e37f2c48282c878edea1b2ebc2912b09a)
2022-01-22 22:37:07 +08:00
gVisor bot
0867bb8b8a [Fixed] auto-route support use ip route 2022-01-22 13:24:31 +08:00
gVisor bot
3c645b4f54 [Refactor]
1.allow maybe empty group
2.use COMPATIBLE(DIRECT alias) when proxy group is empty
3.http provider pass through tunnel
2022-01-18 21:09:36 +08:00
gVisor bot
12f95a46d4 [Refactor] lazy loading geosite.bat 2022-01-11 22:17:24 +08:00
gVisor bot
fea7d47d19 [Style] Modify the default configuration, tun config delete default hijack dns and modify auto-route to false. modify NameServer to 223.5.5.5 and 119.29.29.29 by Skyxim 2022-01-09 00:36:05 +08:00
gVisor bot
b1ce65f78c make tun config compatible with premium 2022-01-05 01:56:35 +08:00
gVisor bot
13392ea6b4 Revert "make tun config compatible with premium"
This reverts commit ba6fdd2962.
2022-01-05 01:56:05 +08:00
gVisor bot
acf9ba1280 make tun config compatible with premium 2022-01-05 01:50:43 +08:00
gVisor bot
f507672d4b make tun config compatible with premium 2022-01-05 00:33:42 +08:00
gVisor bot
5db5d143ca [test] 2021-12-27 06:44:17 +08:00
gVisor bot
5317d6e3e6 [Feature] 添加unified-delay boolean 控制延迟测试,默认为false,当设置true时忽略握手延迟,将统一延迟结果,从而利于不同协议的url-test 2021-12-26 21:20:41 +08:00
gVisor bot
46b2d3b0c1 [Fixed] launch resolver an enhancer when tun mode 2021-12-09 23:00:54 +08:00
gVisor bot
3fd3057f4e [Fixed]Meaningless pointer 2021-12-07 20:49:39 +08:00
gVisor bot
590565f5c1 Feature:Supported Rule-Set 2021-12-02 22:56:17 +08:00
gVisor bot
c5257c5190 [style] 2021-12-01 16:51:31 +08:00
gVisor bot
d3708a2e71 Revert "[test] rule providers"
This reverts commit d4cc650633.
2021-11-26 00:57:33 +08:00
gVisor bot
3459ed005b [test] rule providers 2021-11-25 23:33:06 +08:00
gVisor bot
826b79a748 [fix] rule providers 2021-11-25 21:52:07 +08:00
gVisor bot
e69c54cfcd [test] 2021-11-17 16:03:47 +08:00
gVisor bot
d3521e6b3a [test]core 1.8 2021-11-16 20:08:52 +08:00
gVisor bot
a226cba447 Chore: update dependencies and rename profile props 2021-11-08 20:48:29 +08:00
gVisor bot
f7d136f56c Merge from remote branch 2021-10-28 11:36:11 +08:00
gVisor bot
a40706ba21 Fix: unexpected proxy dial behavior on mapping mode 2021-10-18 21:08:27 +08:00
gVisor bot
d7e31932c7 Feature: persistence fakeip (#1662) 2021-10-11 20:48:58 +08:00
gVisor bot
249d830d73 Merge from remote branch 2021-09-17 15:07:27 +08:00
gVisor bot
68813be155 Fix: should not unmarshal to pointer (#1615) 2021-09-13 23:43:28 +08:00
gVisor bot
317bf173df Merge from remote branch 2021-09-08 04:42:56 +08:00
gVisor bot
da551ac737 Feature: add dhcp type dns client (#1509) 2021-09-06 23:07:34 +08:00
gVisor bot
3817f2ae91 Feature: add source ipcidr condition to rule final 2021-09-01 18:29:48 +08:00
gVisor bot
8595347485 Merge from remote branch 2021-09-01 00:38:43 +08:00
gVisor bot
edf35558f0 Feature: add geoip-code option 2021-08-25 15:15:13 +08:00
gVisor bot
8b2f737511 Merge from remote branch 2021-07-07 03:53:32 +08:00
gVisor bot
c586479a13 Feature: support multiport condition for rule SRC-PORT and DST-PORT 2021-07-06 15:07:05 +08:00
gVisor bot
e259cea893 Chore: move provider interface to constant 2021-07-06 00:31:13 +08:00
gVisor bot
38c102a93d Code: refresh code 2021-07-01 22:49:29 +08:00
gVisor bot
542325aae4 Style: code style 2021-06-10 14:05:56 +08:00
gVisor bot
a409e7f2aa Feature: dns resolve domain through nameserver-policy (#1406) 2021-05-19 11:17:35 +08:00
gVisor bot
d4fffbdbb5 Feature: support store group selected node to cache (enable by default) 2021-02-18 23:41:50 +08:00
gVisor bot
ed77eeeb97 Fix: get general should return correct result (#1172) 2021-01-07 13:59:39 +08:00
gVisor bot
e063713174 Chore: move find process name to a single part 2020-12-17 22:17:27 +08:00
gVisor bot
9c80233034 Feature: add lazy for proxy group and provider 2020-11-19 00:53:22 +08:00
gVisor bot
ec41d4f5f7 Feature: add disable-udp option for all proxy group 2020-11-13 21:48:52 +08:00
gVisor bot
ac72e27e41 Feature: add TCP TPROXY support (#1049) 2020-11-09 10:46:10 +08:00
gVisor bot
54618e59c9 Feature: support domain in fallback filter (#964) 2020-09-28 22:17:10 +08:00
gVisor bot
ea4e10353a Chore: code style 2020-09-20 15:53:27 +08:00
gVisor bot
6ca03f5a90 Chore: pass staticcheck 2020-08-25 22:19:59 +08:00
gVisor bot
b61e1cd00c Feature: dns server could lookup hosts (#872) 2020-08-11 10:28:17 +08:00
gVisor bot
a1accd76db Feature: support PROCESS-NAME on macOS 2020-07-19 13:18:23 +08:00
gVisor bot
062fbffbae Chore: remove forward compatibility code 2020-06-27 14:28:10 +08:00
gVisor bot
f7aa21c0e5 Chore: move experimental features to stable 2020-06-27 14:19:31 +08:00
gVisor bot
216116e128 Change: ipv6 logic 2020-06-18 18:11:02 +08:00
gVisor bot
b79022a891 Feature: add default hosts localhost 2020-06-07 17:25:51 +08:00
gVisor bot
bdd5db95d8 Chore: move rule parser to rules 2020-06-05 17:43:50 +08:00
gVisor bot
506ccf80d3 Chore: provider error adjust 2020-06-01 00:39:41 +08:00
gVisor bot
759b7aa934 Feature: domain trie support wildcard alias 2020-05-28 12:13:05 +08:00
gVisor bot
03c0f2e7f1 Feature: add Mixed(http+socks5) proxy listening (#685) 2020-05-12 11:29:53 +08:00
gVisor bot
3542b3e3b1 Improve: provider can be auto GC 2020-04-26 22:38:15 +08:00
gVisor bot
98db1988c6 Fix: typo (#624) 2020-04-08 15:49:12 +08:00
gVisor bot
2193e571e1 Fix: rules parse (#568) 2020-03-09 10:40:21 +08:00
gVisor bot
a957540ce5 Fix: provider parse 2020-03-08 23:34:46 +08:00
gVisor bot
3086b68798 Change: rename some field 2020-03-07 20:01:24 +08:00
gVisor bot
c808d8a84f Fix: domain dns crash 2020-02-17 22:13:15 +08:00
gVisor bot
38e0b9da50 Feature: add default-nameserver and outbound interface 2020-02-15 21:42:46 +08:00
gVisor bot
60b035fa27 Chore: fix typo (#490) 2020-01-30 17:03:10 +08:00
gVisor bot
5e3d3dbf00 Chore: fix typo (#479) 2020-01-11 21:02:55 +08:00
gVisor bot
260db753ae Chore: export raw config struct (#475) 2020-01-11 00:22:34 +08:00
gVisor bot
7c17184745 Feature: add fake-ip-filter 2019-12-28 00:10:06 +08:00
gVisor bot
3562d982aa Fix: missing health check instance 2019-12-27 20:12:15 +08:00
gVisor bot
fb02956013 Fix: should initial compatible provider 2019-12-10 17:27:07 +08:00
gVisor bot
ecc943997d Feature: add experimental provider 2019-12-08 12:17:24 +08:00
gVisor bot
88e7005382 Feature: update config API support raw yaml payload 2019-12-01 13:22:47 +08:00
gVisor bot
45b938ea42 Fix: throw correct error in read config 2019-11-12 10:09:12 +08:00
gVisor bot
f9b35c7a44 Fix: unsupported rule should throw error 2019-11-04 23:07:19 +08:00
gVisor bot
726281255c Fix: NoResolveIP should return current value (#390) 2019-11-04 10:42:39 +08:00
gVisor bot
f046ad73d2 Feature: add no-resolve for ip rules (#375) 2019-10-28 00:02:23 +08:00
gVisor bot
204ff1a356 Feature: experimental support snell 2019-10-09 18:46:23 +08:00
gVisor bot
b38663a209 Feature: add fallback filters (#105) 2019-09-15 13:36:45 +08:00
gVisor bot
4994510c87 Feature: move hosts to the top 2019-09-14 20:01:08 +08:00
gVisor bot
3663e583f4 Fix: parse error in proxyGroupsDagSort (#298) 2019-09-13 15:04:51 +08:00
gVisor bot
7afb0cc5d9 Fix: should keep the original order of proxy groups (#284) 2019-08-28 23:44:32 +08:00
gVisor bot
92f3d9ae5b Feature: allow arbitrary order in proxy group (#89) 2019-08-12 10:11:44 +08:00
gVisor bot
f10b8f8af2 Feature: support customizing bind-address when allow-lan is true (#255) 2019-08-08 13:45:07 +08:00
gVisor bot
6a5d32bf61 Fix: don't read yml if not exist (#253) 2019-08-07 14:21:39 +08:00
gVisor bot
24bd2afbd8 Improve(fakeip): use lru cache to avoid outdate 2019-07-26 19:09:13 +08:00
gVisor bot
ce94ed8802 Feature(dns): support custom hosts 2019-07-14 19:29:58 +08:00
gVisor bot
9ddc9207ff Chore: update dependencies & fix typo 2019-06-29 16:48:48 +08:00
gVisor bot
83f3bec20c Feature: custom dns ipv4/ipv6 dual stack 2019-06-29 00:58:59 +08:00
gVisor bot
be170308c2 Feature: support DoH 2019-06-28 12:29:08 +08:00
gVisor bot
7eadec6eef Fix: log correctly path 2019-06-27 22:56:24 +08:00
gVisor bot
b115c369db Feature: local socks5/http(s) auth (#216) 2019-06-27 17:04:25 +08:00
gVisor bot
697b82b9fe Fix: check target is valid in rules (#210) 2019-06-20 11:03:50 +08:00
gVisor bot
6a3284ba68 Standardized: use recommend extension & forward compatibility before 1.0 2019-06-18 20:55:26 +08:00
gVisor bot
8a4497ddf4 Feature: make the selector proxies order as same as the order in the config file (#180)
* make the proxies order the same as the order in config file

* formatting & rename variable
2019-05-15 14:40:14 +08:00
gVisor bot
7062bb4bba Feature: add DST-PORT and SRC-PORT 2019-05-09 21:00:29 +08:00
gVisor bot
9c315339fd Feature: support fakeip 2019-05-03 00:05:14 +08:00
gVisor bot
358344da70 Feature: add experimental config for resolving ip fail behavior 2019-04-24 12:02:52 +08:00
gVisor bot
4d61ae689f Fix: IP-CIDR invalid payload crash 2019-03-30 14:11:59 +08:00
gVisor bot
b26e6c5a59 Feature: add interval url test for load-balance 2019-03-28 19:00:41 +08:00
gVisor bot
86e97cc596 Improve: Dial would reset proxy alive status 2019-03-16 00:43:16 +08:00
gVisor bot
b41d106f78 Improve: support tcp dns server & return an error when parsing nameserver (#127) 2019-03-01 00:52:30 +08:00
gVisor bot
ef2b5d306d Chore: rename final 2019-02-18 21:53:57 +08:00
gVisor bot
0d9bbcc50c Feature: add load-balance group 2019-02-15 14:25:20 +08:00
gVisor bot
3a3fad3d32 Fix: parse proxies shadow variable 2019-02-04 09:39:17 +08:00
gVisor bot
d292743981 Feature: SOURCE-IP-CIDR rule type (#96) 2019-02-02 21:03:13 +08:00
gVisor bot
3b75395670 Chore: print origin rule when format error (#92) 2019-01-14 10:35:11 +08:00
gVisor bot
373a6cad22 Fix: ignore some general configuration 2018-12-21 22:51:37 +08:00
gVisor bot
a3fee826f1 Fix: parse external-ui 2018-12-21 10:55:21 +08:00
gVisor bot
b7cfde189c Feature: add custom ui support in API 2018-12-20 01:29:13 +08:00
gVisor bot
4e33035730 Fix: dns crash & remove unused debug log 2018-12-10 11:00:52 +08:00
gVisor bot
794bbb87da Fix: crash when dns not set 2018-12-05 21:52:31 +08:00
gVisor bot
81ade5cfca Feature: add custom DNS support (#56) 2018-12-05 21:13:29 +08:00
gVisor bot
7f31c3d7a4 Fix: policy group unexpectedly closed 2018-12-05 18:19:30 +08:00
gVisor bot
2eadc67535 Feature: add http/https [connect] proxy (#52) 2018-12-03 23:27:00 +08:00
gVisor bot
35b40e77a3 Change: replace FINAL with MATCH in a progressive way 2018-11-21 18:21:24 +08:00
gVisor bot
0dd9b38514 Chore: improve code architecture 2018-11-21 13:47:46 +08:00
gVisor bot
009b985c49 Fix: weak type proxy name 2018-10-27 12:57:56 +08:00
gVisor bot
2dc7ca4134 Fix: selector no longer randomly selects 2018-10-18 23:24:04 +08:00
gVisor bot
29172c5bb3 Chore: refactoring code of config path 2018-10-14 21:22:58 +08:00
gVisor bot
27a17c899b Feature: add authorization for API 2018-10-06 13:15:02 +08:00
gVisor bot
35378f7ab9 Break Change: use yml, which is easier to parse, as the config format 2018-10-02 15:26:36 +08:00
gVisor bot
f73013006a Chore: make the code more semantic 2018-09-30 12:25:52 +08:00
gVisor bot
bbfd2f3a71 Add: fallback policy group 2018-09-26 00:34:15 +08:00
gVisor bot
3338642eed Improve: cleanup code 2018-09-21 11:33:29 +08:00
gVisor bot
40982266de Fix: Rule with ipv6 address 2018-09-16 23:35:37 +08:00
gVisor bot
42b9e0c9e7 Feature: add shadowsocks simple-obfs support 2018-09-16 23:02:32 +08:00
gVisor bot
1c4b253ff0 Improve: add DOMAIN rule 2018-09-09 15:01:46 +08:00
gVisor bot
050c236e78 Feature: support vmess tls mode 2018-09-08 19:53:24 +08:00
gVisor bot
e5b4e29507 Feature: add vmess support 2018-09-06 10:53:29 +08:00
gVisor bot
229d2bf93e Fix: log format type 2018-08-27 08:50:27 +08:00
gVisor bot
2667e519a1 Fix: updateConfig api crash 2018-08-26 22:43:38 +08:00
gVisor bot
3df8ee56d6 Improve: clean code 2018-08-12 16:18:58 +08:00
gVisor bot
2aa9bcaf9c New: custom socks5 proxy support 2018-08-12 13:50:54 +08:00
gVisor bot
2deab8707e Update: README.md 2018-08-12 04:22:14 +08:00
gVisor bot
13cf2bb270 New: redir proxy 2018-08-12 04:00:34 +08:00
gVisor bot
a0dd4ffddc Fix: update proxy config api 2018-08-12 02:23:46 +08:00
gVisor bot
ab8181de1b Fixed: global mode and update log level 2018-08-04 23:04:16 +08:00
gVisor bot
2a6db98d67 Improve: config convergent and add log-level 2018-07-26 00:04:59 +08:00