Commit graph

298 commits

Author SHA1 Message Date
gVisor bot
6204a65489 chore: embed hysteria, clean irrelevant codes, code from https://github.com/HyNetwork/hysteria 2022-07-03 18:26:46 +08:00
gVisor bot
2a01a0b583 Chore: cleanup code 2022-06-30 17:12:06 +08:00
gVisor bot
192ae06fe5 Fix: proxy provider filter validation (#2198) 2022-06-30 17:08:53 +08:00
gVisor bot
197e41ca65 Fix concurrency vmess udp write 2022-06-28 08:12:56 +08:00
gVisor bot
21e9374ed6 Merge branch 'dev' into Alpha 2022-06-26 21:53:03 +08:00
gVisor bot
5740dd225e fix: hysteria dial use external context 2022-06-26 21:52:22 +08:00
gVisor bot
5d9b999fa0 chore: hysteria params verify 2022-06-25 12:43:47 +08:00
gVisor bot
afeb80ea3d fix: proxy provider force update on init 2022-06-25 12:42:52 +08:00
gVisor bot
f0b3c6a0c9 fix: tcp concurrent force close when context done 2022-06-25 09:16:28 +08:00
gVisor bot
e107b18954 chore: healthcheck only once check at same time 2022-06-25 08:53:04 +08:00
gVisor bot
5cc7c795eb chore: remove unused 2022-06-20 22:25:59 +08:00
gVisor bot
2f339c2ef5 Merge remote-tracking branch 'Meta/Alpha' into Alpha
# Conflicts:
#	go.mod
#	go.sum
2022-06-19 22:30:02 +08:00
gVisor bot
695e3e2175 fix: url test http response not closed 2022-06-19 17:29:46 +08:00
gVisor bot
6d0a800a83 Add shadowsocks uot in relay 2022-06-18 16:38:44 +08:00
gVisor bot
fd40911fde fix: force update provider happen loopback 2022-06-18 16:05:09 +08:00
gVisor bot
22226d5e68 Add shadowsocks uot and test 2022-06-18 10:50:33 +08:00
gVisor bot
4180bfa360 chore: Allow VLESS protocol TLS to be FALSE 2022-06-16 01:20:33 +08:00
gVisor bot
8cfba45016 Merge branch 'dev' into Alpha 2022-06-14 20:23:51 +08:00
gVisor bot
4029da1dc8 fix: up/down of hysteria must be a valid value 2022-06-14 20:23:36 +08:00
gVisor bot
882a7ab3e9 Refactor: vmess
Add support for vmess length masking/packetaddr/authenticated length

Add support for zero/aes-128-cfb protcol
2022-06-14 13:21:22 +08:00
gVisor bot
2bbfa562ce refactor: deprecated params(up_mbps,down_mpbs,auth) in hysteria; up/down no use append unit equivalent up_mbps/down_mbps, default unit is Mbps; up/down become a required option. 2022-06-12 11:52:15 +08:00
gVisor bot
d39783fe7e fix: sni invalid on hysteria 2022-06-12 00:00:42 +08:00
gVisor bot
0bd925db78 fix: Vmess URI Scheme 解析问题 2022-06-10 03:15:30 +08:00
gVisor bot
15ce48e1ae fix: vmess ws 2022-06-09 16:23:15 +08:00
gVisor bot
2d16e6d021 chore: refine code 2022-06-08 01:47:50 +08:00
gVisor bot
41d0aac5ec fix: group filter touch provider 2022-06-07 17:19:25 +08:00
gVisor bot
0165dc980d fix: hysteria dialer 2022-06-07 15:49:10 +08:00
gVisor bot
a03df5233f fix: hysteria parse auth 2022-06-07 15:24:46 +08:00
gVisor bot
15154fba73 fix: hysteria parse 2022-06-07 14:53:00 +08:00
gVisor bot
3c5b69b884 feat: add hysteria 2022-06-07 13:46:54 +08:00
gVisor bot
aa76324ac6 feat: add support for shadowsocks 2022 ciphers 2022-06-06 19:56:36 +08:00
gVisor bot
0e8c87474b feat: proxy provider 支持V2ray格式订阅链接 2022-06-05 17:14:24 +08:00
gVisor bot
8479c2fd4c Feature: add V2Ray subscription support to proxy provider 2022-06-05 15:59:47 +08:00
gVisor bot
1db0adfadc Chore: make hadowsocks2 lib embed 2022-06-04 20:29:33 +08:00
gVisor bot
0a50209328 fix: 当初始化失败时,定时更新失效 2022-06-04 19:15:30 +08:00
gVisor bot
5953a4cfb5 refactor: 抽离http请求方法 2022-06-04 19:14:39 +08:00
gVisor bot
fa6c28e4e4 chore: 更新geox时通过内存存储 2022-06-03 16:50:49 +08:00
gVisor bot
23cfe20eab chore: 选择fallback时,当节点不可用时触发urltest 2022-06-03 13:32:11 +08:00
gVisor bot
dc18026481 Chore: embed shadowsocks2 2022-06-01 21:43:20 +08:00
gVisor bot
b0f7b9e4e0 feat: proxies group URLTest api 2022-05-30 22:07:09 +08:00
gVisor bot
7a75f2b125 fix: 调整获取远程目的的位置 2022-05-28 20:01:27 +08:00
gVisor bot
82dcecc693 fix: npe 2022-05-27 20:33:27 +08:00
gVisor bot
9dd290cdbd refactor: 获取远程目的从tunnel中剔除,移至tracker 2022-05-27 09:00:48 +08:00
gVisor bot
f30721e3bf refactor: 优化UDP远程目标获取 2022-05-26 23:41:09 +08:00
gVisor bot
3e082166be fix: 更新错误时未停止后续流程,日志修改 2022-05-26 23:13:36 +08:00
gVisor bot
b3017fea94 fix: 启动时检测provider文件是否过期,强制更新 2022-05-26 21:05:00 +08:00
gVisor bot
649177855a Chore: upgrade to yaml v3 2022-05-26 17:47:05 +08:00
gVisor bot
010a2aaf9c feat: fallback can be select by user 2022-05-24 10:17:44 +08:00
gVisor bot
ba7e0887bd feat: IN-TYPE rule support
eg. IN-TYPE,SOCKS/REDIR/INNER,Proxy
support list: HTTP HTTPS SOCKS SOCKS4 SOCKS5 REDIR TPROXY TUN INNER
2022-05-20 23:17:16 +08:00
gVisor bot
db2bf61714 refactor: 修改sticky-session尝试逻辑 2022-05-19 20:27:26 +08:00
gVisor bot
4e984588f1 fix: sticky-sessions异常 2022-05-18 22:29:27 +08:00
gVisor bot
18ee3ceac5 chore: Android auto-detect-interface plus 2022-05-18 12:00:57 +08:00
gVisor bot
6475f60ce3 fix: 删除udp触发的错误逻辑 2022-05-17 21:23:28 +08:00
gVisor bot
91262c256a refactor: 重构失败主动健康检测 2022-05-17 21:15:14 +08:00
gVisor bot
cae1e23735 chore: 暴露数据给前端 2022-05-17 16:47:21 +08:00
gVisor bot
c260affd46 refactor: 重构StickySessions 2022-05-17 13:28:54 +08:00
gVisor bot
375ed774be refactor: strategyStickySessions 2022-05-16 17:46:28 +08:00
gVisor bot
05a484ec56 fix: strategyStickySessions nil pointer 2022-05-16 17:06:44 +08:00
gVisor bot
7facfc5486 revert: yaml v2 2022-05-14 23:36:19 +08:00
gVisor bot
449bc28ac0 fix: print process path logic 2022-05-12 18:57:30 +08:00
gVisor bot
c3f871005b feat: add strategy:sticky-sessions for LoadBalance
Signed-off-by: Meta <maze.y2b@gmail.com>
2022-05-09 18:56:36 +08:00
gVisor bot
f0754dbcb4 revert: tls handshake timeout recovery 10s 2022-05-08 21:56:59 +08:00
gVisor bot
9d0b06a173 chore: update dependencies 2022-05-08 00:47:01 +08:00
gVisor bot
4ccedb34e8 fix: provider auto update 2022-05-08 00:04:16 +08:00
gVisor bot
d1e6239372 chore: the uuid-map is transferred to the protocol 2022-05-06 13:28:09 +08:00
gVisor bot
bb8fbd97db fix uuid match 2022-05-06 13:08:27 +08:00
gVisor bot
b1c3a102cf fix: loadbalance group npe 2022-05-04 19:52:48 +08:00
gVisor bot
319884469d feat: Expose remote destination (udp proxy maybe domain of node) 2022-05-04 16:57:08 +08:00
gVisor bot
adcad74452 refactor: provider init order 2022-05-02 16:47:48 +08:00
gVisor bot
855df99b04 refactor: Unified active health detection, supported by load balancing policy group 2022-05-02 13:50:10 +08:00
gVisor bot
5bdd18552f chore: adjust pass to reject.go 2022-05-02 09:16:47 +08:00
gVisor bot
12170b0395 fix trojan and snell's normal udp 2022-05-02 06:28:27 +08:00
gVisor bot
453fa9732e fix trojan and snell's udp over tcp 2022-04-30 22:26:38 +08:00
gVisor bot
e2c75161b1 support udp in relay if last proxy could udp-over-tcp 2022-04-30 11:36:42 +08:00
gVisor bot
8e04fcd711 refactor: del useless file 2022-04-28 23:49:24 +08:00
gVisor bot
336d3482d6 fix: replace with sync.map for GroupBase 2022-04-28 23:43:10 +08:00
gVisor bot
265fb0dabd refactor: field name 2022-04-28 23:10:08 +08:00
gVisor bot
e86ab75bb0 refactor: optimize the performance of filter in proxy-group 2022-04-28 19:01:13 +08:00
gVisor bot
dd1e19730d fix: handle metadata when dst is ip:port 2022-04-28 12:44:27 +08:00
gVisor bot
4090c0f3ef fix: inner request error 2022-04-28 09:24:40 +08:00
gVisor bot
78c766d08f feat: support uuid with custom string 2022-04-27 18:02:29 +08:00
gVisor bot
ad67a1c34c Chore: use generics as possible 2022-04-25 13:18:30 +08:00
gVisor bot
931d5dd5b3 fix: relay conn error when addr is domain 2022-04-23 10:26:22 +08:00
gVisor bot
fbcf9b6801 fix: ipv6 enable logic 2022-04-23 02:03:10 +08:00
gVisor bot
a317531428 Revert: "fix: proxy-groups filter logic"
This reverts commit 8a85c63b08.
2022-04-22 18:56:35 +08:00
gVisor bot
5386a5f00e fix: proxy-groups filter logic 2022-04-22 17:27:55 +08:00
gVisor bot
4ea3422e5f [fix] logic 2022-04-21 18:56:33 +08:00
gVisor bot
e2dbbb7cfe Refactor: metadata use netip.Addr 2022-04-20 22:52:05 +08:00
gVisor bot
f59183bf08 Chore: add none alias to dummy on ShadowsocksR (#2056) 2022-04-19 22:49:22 +08:00
gVisor bot
e76e0f5e03 fix: PASS policy inconsistent names 2022-04-17 14:11:58 +08:00
gVisor bot
351182d8f3 feat: support http headers 2022-04-14 13:07:39 +08:00
gVisor bot
c75b4e045a Chore: add none alias to dummy on ShadowsocksR (#2056) 2022-04-13 10:06:06 +08:00
gVisor bot
06b780f5cc Refactor: queue use generics 2022-04-12 18:44:13 +08:00
gVisor bot
5cd593f31c fix: npe panic 2022-04-04 22:28:47 +08:00
gVisor bot
40ee33f062 refactor: Some adjustments 2022-04-03 19:15:16 +08:00
gVisor bot
f5c0e759a6 fix: dns over proxy may due to cancel request, but proxy live status is fine 2022-04-02 18:24:11 +08:00
gVisor bot
16b78b89d7 [Fix] VLESS http conn with tls false
[Chore] Upgrade Dependencies
2022-03-31 00:08:43 +08:00
gVisor bot
b523e9e927 Merge remote-tracking branch 'Meta/Alpha' into Alpha 2022-03-30 13:19:05 +08:00
gVisor bot
05125430dd Merge remote-tracking branch 'Pro-Plus/with-tun' into Alpha
# Conflicts:
#	README.md
#	adapter/outbound/trojan.go
#	adapter/outbound/vless.go
#	transport/trojan/trojan.go
2022-03-30 13:15:45 +08:00
gVisor bot
2580e12fb2 docs: warning 2022-03-30 13:05:46 +08:00
gVisor bot
58e51e8f21 Feature: Trojan XTLS 2022-03-30 00:15:39 +08:00
gVisor bot
5911d62fba Chore: adjust VLESS 2022-03-29 23:50:41 +08:00
gVisor bot
e0c7b12d41 Fix: Vless UDP 2022-03-29 07:24:11 +08:00
gVisor bot
d66febb1a6 [Fixed]尝试修复PASS空指针问题
[Chore]调整workflows测试
2022-03-28 16:36:34 +08:00
gVisor bot
7b4e06816f Merge remote-tracking branch 'tun/with-tun' into Alpha 2022-03-28 10:51:59 +08:00
gVisor bot
7737eb40a9 Chore: adjust HealthCheck at first check 2022-03-28 00:46:44 +08:00
gVisor bot
67d04485ca Refactor: MainResolver 2022-03-28 00:44:13 +08:00
gVisor bot
eea2e3def9 [commit]
[Feat] add Pass type for support temporary skip rule set
2022-03-27 23:44:51 +08:00
gVisor bot
0a82b140f3 [Fix] use direct to update http providers when proxy 寄 2022-03-24 12:34:45 +08:00
gVisor bot
b8996bac73 [skip ci] [Pre] avoid npe 2022-03-23 13:48:21 +08:00
gVisor bot
9b48fc9d8d Merge branch 'ogn-dev' into with-tun 2022-03-20 21:26:25 +08:00
gVisor bot
14a9087538 Merge remote-tracking branch 'clash/dev' into Alpha
# Conflicts:
#	Makefile
2022-03-19 14:53:47 +08:00
gVisor bot
87164f52af Fix: routing-mark option doesn't work on proxies (#2028) 2022-03-19 13:29:30 +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
f5401aa63a Migration: go 1.18 2022-03-17 01:51:28 +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
446fd99436 Chore: Merge branch 'ogn-dev' into with-tun 2022-03-16 20:16:30 +08:00
gVisor bot
907c68c9cb Migration: go 1.18 2022-03-16 12:10:13 +08:00
gVisor bot
187c3607af Fix the filter under proxy-group to filter other groups 2022-02-23 16:17:29 +08:00
gVisor bot
19613a4fad Chore: compatible with VMESS WS older version configurations 2022-02-23 14:21:53 +08:00
gVisor bot
7f0de1861a Merge from remote branch 2022-02-23 01:00:27 +08:00
gVisor bot
f3f047645d Replace the regular implementation of the filter for proxy-providers and proxy-groups with regex2 2022-02-16 22:18:05 +08:00
gVisor bot
c57d92d7c1 [Feat]
support trojan xtls
change geodataloader mode as memconservative
2022-02-04 23:33:36 +08:00
gVisor bot
cdc8baf44e Merge branch 'Dev' into Feature
# Conflicts:
#	Makefile
2022-02-04 18:44:35 +08:00
gVisor bot
a8dafd434e [Fixed] Fixed clash process name is Clash.Meta 2022-02-04 17:38:06 +08:00
gVisor bot
b79eb1cea9 [Fixed] Abnormal rule when host is ip addr 2022-02-04 17:38:06 +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
9afe58058d Merge branch 'clash-dev' into Dev 2022-01-25 15:05:24 +08:00
gVisor bot
b350055692 [Style] clear unless notes 2022-01-21 22:38:28 +08:00
gVisor bot
39c3ca2b75 [Fixed] select group crash 2022-01-21 22:38:02 +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
14a453b1b1 Improve: change provider file modify time when updated (#1918) 2022-01-18 13:32:47 +08:00
gVisor bot
70c8e6e1ba Feature: support snell v3 (#1884) 2022-01-10 20:24:20 +08:00
gVisor bot
ffe59c5fba [Style] Positive health check 2022-01-08 09:23:49 +08:00
gVisor bot
d96180dc60 [Fixed] Positive health check multithreading is not safe 2022-01-07 12:58:40 +08:00
gVisor bot
269a8560ce [test]Add name filter to proxy group 2022-01-05 12:19:49 +08:00
gVisor bot
4208d48a9d Merge remote-tracking branch 'clash/dev' into Meta
# Conflicts:
#	.github/workflows/docker.yml
#	dns/server.go
#	go.mod
#	go.sum
#	hub/executor/executor.go
#	test/go.mod
#	test/go.sum
2022-01-04 17:31:07 +08:00
gVisor bot
91c5381222 Fix: duplicate provider err typo 2022-01-03 17:21:27 +08:00
gVisor bot
85f1b22340 Fix: multiple port string parsing overflow (#1868)
Ports in TCP and UDP should be parsed as an unsigned integer,
otherwise ports > 32767 get truncated to 32767. As this is
the case with Metadata.UDPAddr(), this fundamentally breaks
UDP connections where demand for high port numbers is high.

This commit fixes all known cases where ParseInt is used for ports,
and has been verified to fix Discord voice connections on port
50001~50004.

Fixes: d40e5e4fe6

Co-authored-by: Hamster Tian <haotia@gmail.com>
2022-01-02 01:09:29 +08:00
gVisor bot
6fa3953335 Chore: remove forward compatible code 2022-01-02 00:48:57 +08:00
gVisor bot
e1a1f87dd4 [Style] Add User-Agent for provider request 2021-12-26 22:26:53 +08:00
gVisor bot
5317d6e3e6 [Feature] 添加unified-delay boolean 控制延迟测试,默认为false,当设置true时忽略握手延迟,将统一延迟结果,从而利于不同协议的url-test 2021-12-26 21:20:41 +08:00
gVisor bot
4b8a1cdb08 Chore: remove reduce regex compile (#1855) 2021-12-26 20:47:12 +08:00
gVisor bot
7a2769621b Update vless.go 2021-12-20 12:59:06 +08:00
gVisor bot
e1fe9c6157 Fix: when both providers and proxies are present, use the health check configuration for proxies (#1821)
Co-authored-by: Ho <ho@fluidex.com>
2021-12-12 20:37:30 +08:00
gVisor bot
2cd16ea478 [Fix] 修正因xray服务端alpn参数为http/1.1而导致无法连接的问题 2021-12-06 00:19:03 +08:00
gVisor bot
bcf5a8d10c [Fix] 修正因xray服务端alpn参数为http/1.1而导致无法连接的问题 2021-12-05 03:51:26 +08:00
gVisor bot
885ea9f7bf [Fix] 修正因xray服务端alpn参数为http/1.1而导致无法连接的问题 2021-12-05 02:18:58 +08:00
gVisor bot
a3ec549dbf Fixed: Modify the trigger condition, only if it fails successively 2021-12-04 00:16:39 +08:00
gVisor bot
1c440d8d54 Experimental: Positive health testing 2021-12-03 14:35:21 +08:00