Commit Graph

170 Commits

Author SHA1 Message Date
gVisor bot 8054749b40 feat: support uid rule
eg. UID,1000/5000-6000,Proxy
2022-04-22 16:27:51 +08:00
gVisor bot f8a9c272f3 feat: dnsHijack support "any"
chore: adjust process debug display logic
2022-04-22 13:30:04 +08:00
gVisor bot e2dbbb7cfe Refactor: metadata use netip.Addr 2022-04-20 22:52:05 +08:00
gVisor bot a4654d30d5 chore: upgrade dependencies 2022-04-20 01:31:33 +08:00
gVisor bot 6c56a3b80e feat: add domain list for sniffer, reverse force logic
when force is false, if domain in the list, will force replace
when force is true, if sniff domain in the list, will skip it
2022-04-16 08:21:31 +08:00
gVisor bot 895d93b10b chore:merge & adjust code 2022-04-12 20:20:04 +08:00
gVisor bot 950e638222 Chore: fix typos 2022-04-12 19:08:13 +08:00
gVisor bot b2becaffe3 feat: sniffer support
sniffer:
  enable: true
  force: false # Overwrite domain
  sniffing:
    - tls
2022-04-09 22:30:36 +08:00
gVisor bot d66febb1a6 [Fixed]尝试修复PASS空指针问题
[Chore]调整workflows测试
2022-03-28 16:36:34 +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 0ec5a6e133 [Fix] redir-host use host not ip 2022-03-22 23:31:23 +08:00
gVisor bot 652759a9ae [skip ci][内容]
1.调整部分代码
2022-03-20 02:39:48 +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 a57355aae3 [build test]1.18 2022-03-16 17:54:44 +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 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 14b581cd8d Chore: move find connection process to tunnel (#2016) 2022-03-12 19:07:53 +08:00
gVisor bot f8e9902530 Chore: code style 2022-03-09 00:32:21 +08:00
gVisor bot 13db80b23a Feature: process condition for rules 2022-02-23 14:01:53 +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 3fe8a4777d make tun config compatible with premium 2022-01-05 11:24:00 +08:00
gVisor bot f507672d4b make tun config compatible with premium 2022-01-05 00:33:42 +08:00
gVisor bot 0256d0e387 Revert: Revert Redir-Host, please add fallback dns and append proxy adapter
DNS pass proxy use:
- protocol://ip:port#AdapterName
- protocol://ip:port/query#AdapterName

sure as:
- tls://1.1.1.1:853#DNS
2021-12-06 22:45:59 +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 e69c54cfcd [test] 2021-11-17 16:03:47 +08:00
gVisor bot f7d136f56c Merge from remote branch 2021-10-28 11:36:11 +08:00
gVisor bot 0387c93c56 Style: format code 2021-10-28 00:06:55 +08:00
gVisor bot c964c4901c Chore: use uber max procs 2021-10-27 21:27:19 +08:00
gVisor bot 285ac79771 Fix: set dnsmode behavior 2021-10-18 23:03:25 +08:00
gVisor bot a40706ba21 Fix: unexpected proxy dial behavior on mapping mode 2021-10-18 21:08:27 +08:00
gVisor bot 50a2222cd2 Chore: contexify ProxyAdapter ListenPacket 2021-10-15 21:44:53 +08:00
gVisor bot 66d9aab6cc Feature: add source ipcidr condition for all rules 2021-08-31 21:46:04 +08:00
gVisor bot 2e762b39b7 Merge from remote branch 2021-07-28 22:13:21 +08:00
gVisor bot 7fa486ea4c Chore: logging remote port on request (#1494) 2021-07-19 15:31:38 +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 225c875ed4 Refactor: plain http proxy (#1443) 2021-06-15 17:13:40 +08:00
gVisor bot 894e2843d5 Style: code style 2021-06-13 17:23:10 +08:00
gVisor bot 542325aae4 Style: code style 2021-06-10 14:05:56 +08:00
gVisor bot 709287e74b Chore: some chores 2021-04-05 13:31:10 +08:00
gVisor bot b1d7346175 Fix: set metadata.AddrType if host is ip string after remove host (#1291) 2021-03-12 17:41:37 +08:00
gVisor bot 9b229b15e7 Fix: remove host if host is ip string 2021-03-10 12:49:30 +08:00
gVisor bot be5a2a9adf Refactor: make inbound request contextual 2021-01-23 14:58:09 +08:00
gVisor bot 0649a919f4 Fix: should not log rule when rule = nil 2020-11-22 23:38:12 +08:00
gVisor bot 212a3de654 Chore: log rule msg on dial error 2020-11-22 19:12:36 +08:00
gVisor bot f0ecf5b8d4 Chore: more detailed error when dial failed 2020-11-20 00:27:37 +08:00
gVisor bot a794f38317 Improve: #1038 and #1041 2020-10-29 00:32:31 +08:00
gVisor bot f066687f93 Fix: tunnel UDP race condition (#1043) 2020-10-28 21:26:50 +08:00
gVisor bot 4d68d20b7b Chore: deprecated eapache/channels 2020-10-20 17:44:39 +08:00
gVisor bot 76bab33d01 Fix: missing fake-ip record should return error 2020-10-17 12:52:43 +08:00
gVisor bot 1cd2b8d8fb Chore: split enhanced mode instance (#936)
Co-authored-by: Dreamacro <305009791@qq.com>
2020-09-17 10:48:42 +08:00
gVisor bot 0078ac2fc8 Fix: invert should resolve ip (#836) 2020-07-27 13:47:00 +08:00
gVisor bot 17a0dc479a Chore: rename NoResolveIP to ShouldResolveIP 2020-07-27 11:57:55 +08:00
gVisor bot b93708d929 Chore: add rule payload in log 2020-07-18 19:22:09 +08:00
gVisor bot f7aa21c0e5 Chore: move experimental features to stable 2020-06-27 14:19:31 +08:00
gVisor bot 40832885c4 Fix: redir-host should lookup hosts 2020-04-27 21:28:24 +08:00
gVisor bot ad551c1e30 Fix: TPROXY fakeip (#572) 2020-03-10 20:36:24 +08:00
gVisor bot 05d45cbedc Fix: vmess udp crash 2020-02-17 17:34:19 +08:00
gVisor bot 38e0b9da50 Feature: add default-nameserver and outbound interface 2020-02-15 21:42:46 +08:00
gVisor bot 584305897c Fix: should prehandle metadata before resolve 2020-02-07 20:53:43 +08:00
gVisor bot ea8ec7993f Chore: udp resolve ip on local 2020-01-31 19:26:33 +08:00
gVisor bot 9cbe2b8ed2 Fix: match log display 2020-01-31 14:58:54 +08:00
gVisor bot adfe73b48e Improve: udp NAT type 2020-01-31 14:43:54 +08:00
gVisor bot 830febd5f8 Fix: udp crash 2019-12-31 14:47:00 +08:00
gVisor bot 95f06ab9b9 Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com>
2019-12-28 18:44:01 +08:00
gVisor bot 77b38b3285 Chore: distinguish udp request in log (#449) 2019-12-27 20:11:51 +08:00
gVisor bot ecc943997d Feature: add experimental provider 2019-12-08 12:17:24 +08:00
gVisor bot f046ad73d2 Feature: add no-resolve for ip rules (#375) 2019-10-28 00:02:23 +08:00
gVisor bot 93f13c627c Feature: add experimental connections API 2019-10-27 21:44:07 +08:00
gVisor bot 2adb586a78 Fix: some UDP issues (#265) 2019-10-11 20:11:18 +08:00
gVisor bot 4994510c87 Feature: move hosts to the top 2019-09-14 20:01:08 +08:00
gVisor bot 5431e51554 Optimization: socks UDP & fix typo (#261) 2019-08-12 14:01:32 +08:00
gVisor bot b6532b1f0f Fix: crash in handleConn 2019-08-10 20:14:24 +08:00
gVisor bot 69980e4ca3 Feature: trace adapters when dialing (#170) 2019-08-09 01:28:37 +08:00
gVisor bot 592c3c160f Fix(socks5): fully udp associate support (#233) 2019-07-25 17:47:39 +08:00
gVisor bot 83f3bec20c Feature: custom dns ipv4/ipv6 dual stack 2019-06-29 00:58:59 +08:00
gVisor bot 7528b012c4 Fix: udp crash in tunnel 2019-05-16 18:40:20 +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 b9b8632362 Fix: add missing error check 2019-04-24 10:29:29 +08:00
gVisor bot c02b16b446 Feature: socks5 udp associate 2019-04-23 23:30:13 +08:00
gVisor bot e3614e0605 Style: rename `Generator` with `Dial` 2019-03-03 11:59:07 +08:00
gVisor bot 5f26c49641 Fix: crash when directly request proxy server 2019-02-18 20:14:18 +08:00
gVisor bot 3ea1046c4f Fix: `redir-host` mode crash 2019-02-11 17:20:42 +08:00
gVisor bot 09f6cd2ec4 Fix: tun2socks not lookup IP 2019-02-11 15:44:42 +08:00
gVisor bot d292743981 Feature: SOURCE-IP-CIDR rule type (#96) 2019-02-02 21:03:13 +08:00
gVisor bot 4ae154494c Improve: lazy resolve ip 2019-02-02 20:47:38 +08:00
gVisor bot b71bd07424 Chore: improve programming style (#109) 2019-01-29 23:46:18 +08:00
gVisor bot 4e33035730 Fix: dns crash & remove unused debug log 2018-12-10 11:00:52 +08:00
gVisor bot 81ade5cfca Feature: add custom DNS support (#56) 2018-12-05 21:13:29 +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 f73013006a Chore: make the code more semantic 2018-09-30 12:25:52 +08:00
gVisor bot 8d91482f7b Improve: HTTP proxy server handler 2018-08-27 00:06:40 +08:00