xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2241 commits 17 branches 83 tags 10 MiB
Commit graph

251 commits

Author SHA1 Message Date
gVisor bot
02dd19e311 chore: add force-dns-mapping in sniffer 2022-10-14 07:46:33 +08:00
gVisor bot
894b37b4f3 chore: add description 2022-10-04 22:16:03 +08:00
gVisor bot
dd2b4f9476 chore: pure udp metadata 2022-10-02 20:08:41 +08:00
gVisor bot
d6dc5ba19c feat: support sub-rule, eg. 
rules:
  - SUB-RULE,(AND,((NETWORK,TCP),(DOMAIN-KEYWORD,google))),TEST2
  - SUB-RULE,(GEOIP,!CN),TEST1
  - MATCH,DIRECT

sub-rules:
  TEST2:
    - MATCH,Proxy
  TEST1:
    - RULE-SET,Local,DIRECT,no-resolve
    - GEOSITE,CN,Domestic
    - GEOIP,CN,Domestic
    - MATCH,Proxy
 2022-09-06 17:30:35 +08:00
gVisor bot
2015905b02 Chore: show the source ip in log (#2284) 
Co-authored-by: Li Feng <fengli@smartx.com>
 2022-09-02 16:59:00 +08:00
gVisor bot
730f5b2d5f Feature: sync missing resolver logic from premium, but still net.IP on opensource 2022-08-13 13:07:35 +08:00
gVisor bot
65d543329e Fix: nil pointer 2022-08-12 12:49:35 +08:00
gVisor bot
2f09805ea6 Chore: clean code 2022-08-12 03:04:58 +08:00
gVisor bot
e5f7d9b934 Fix: fakeip udp should not replace with another ip 2022-07-24 00:02:45 +08:00
gVisor bot
0c913db308 chore: clean up code 2022-07-13 22:27:49 +08:00
gVisor bot
e6d496cc6e Fix: fakeip udp should not replace with another ip 2022-07-05 21:09:29 +08:00
gVisor bot
5b51b8f727 Change: remove AddrType on Metadata (#2199) 2022-07-05 20:26:43 +08:00
gVisor bot
bb9fac37ae fix: find process error 2022-06-14 23:14:43 +08:00
gVisor bot
14dafb2d5c feat: add param general.enable-process, it will always find process or uid, default value is false 2022-06-14 23:08:07 +08:00
gVisor bot
271be43a9d refactor: finding process and uid should to find with match process or uid rule, reduce memory allocation 2022-06-14 22:52:56 +08:00
gVisor bot
58e44ed27c fix: make CodeQL happy Dreamacro 2022-06-09 17:59:17 +08:00
gVisor bot
052a65e00c fix: 规则匹配默认策略组返回错误 2022-06-09 13:52:02 +08:00
gVisor bot
cc94b23d13 Chore: make CodeQL happy 2022-06-01 21:38:05 +08:00
gVisor bot
7a75f2b125 fix: 调整获取远程目的的位置 2022-05-28 20:01: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
09690122e4 feat: RESTful API support disable sniffer 2022-05-24 13:44:52 +08:00
gVisor bot
2a00f57fd9 feat: 安卓恢复进程规则，可通过enable-process开关，默认true 2022-05-19 20:44:09 +08:00
gVisor bot
c3e7173187 chore: remove Script mode residual code. 2022-05-14 13:00:33 +08:00
gVisor bot
449bc28ac0 fix: print process path logic 2022-05-12 18:57:30 +08:00
gVisor bot
d446e0f316 fix: use actual metadata 2022-05-04 20:13:12 +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
88346ccdcd Merge remote-tracking branch 'meta/Alpha' into Alpha 2022-04-28 08:56:00 +08:00
gVisor bot
c076d38ab1 refactor: adjust provider loading order, remove meaningless pointers 2022-04-28 08:55:45 +08:00
gVisor bot
4aaa9f8ca8 Fix: http proxy Upgrade behavior (#2097) 2022-04-27 12:38:31 +08:00
gVisor bot
eaca213ea7 Fix: http proxy Upgrade behavior (#2097) 2022-04-25 19:50:20 +08:00
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
e9a5be05a4 Merge remote-tracking branch 'yaling888/with-tun' into Alpha 2022-04-05 14:44:40 +08:00
gVisor bot
f37c8cadac feat: add SMTPS/POP3S/IMAPS port to sni detect 2022-04-05 03:26:23 +08:00
gVisor bot
0d1e4405da Merge remote-tracking branch 'Plus/with-tun' into Alpha 2022-04-02 20:48:11 +08:00
gVisor bot
f21be8d296 fix: log level ajust and lint fix 2022-03-31 21:27:25 +08:00
gVisor bot
ee3f94425e feat: 添加tls sni 嗅探 
# Conflicts:
#	tunnel/statistic/tracker.go
#	tunnel/tunnel.go
 2022-03-31 21:27:25 +08:00
gVisor bot
1c4e024030 Chore: revert "Feature: add tls SNI sniffing (#68)" 
This reverts commit 24ce6622a2.
 2022-03-31 21:20:46 +08:00
gVisor bot
016d88e5ea Feature: add tls SNI sniffing (#68) 2022-03-31 19:34:40 +08:00
gVisor bot
d66febb1a6 [Fixed]尝试修复PASS空指针问题 
[Chore]调整workflows测试
 2022-03-28 16:36:34 +08:00
gVisor bot
3d94eda02e Chore: code style 2022-03-28 03:18:51 +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
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
9e3260a172 Fix: should keep alive in tcp relay 2022-03-16 18:17:28 +08:00
gVisor bot
a57355aae3 [build test]1.18 2022-03-16 17:54:44 +08:00
gVisor bot
907c68c9cb Migration: go 1.18 2022-03-16 12:10:13 +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
7f0de1861a Merge from remote branch 2022-02-23 01:00:27 +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
cc9ff5ccd7 Chore: adjust all udp alloc size 2021-11-03 22:29:24 +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
653f2de2c0 Style: use gofumpt for fmt 2021-10-10 23:44:09 +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
d560c2c023 Fix: reuse http connection broken on previous commit 2021-05-07 11:08:46 +08:00
gVisor bot
6cc17af658 Fix: HTTP inbound leak 2021-05-06 22:34:37 +08:00
gVisor bot
709287e74b Chore: some chores 2021-04-05 13:31:10 +08:00
gVisor bot
c21bd48213 Fix: HTTP server should close when Connection is close 2021-03-30 16:33:49 +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
436dc91dd4 Fix: some HTTP proxy request broken 2021-03-10 16:23:55 +08:00
gVisor bot
9b229b15e7 Fix: remove host if host is ip string 2021-03-10 12:49:30 +08:00
gVisor bot
8f09aa0444 Chore: reset udp timeout after sending each packet (#1260) 2021-02-26 10:40:55 +08:00
gVisor bot
633de52aee Fix: wrap net.Conn to avoid using *net.TCPConn.(ReadFrom) (#1209) 2021-02-01 20:06:45 +08:00
gVisor bot
be5a2a9adf Refactor: make inbound request contextual 2021-01-23 14:58:09 +08:00