增加 Fake IP / Fake DNS 功能 by EqCScO9nTa · Pull Request #2237 · v2ray/v2ray-core

EqCScO9nTa · 2020-02-11T20:03:16Z

Fake IP / Fake DNS 的详情见 issue #2233

语法

  "dns": {
    "fake": {
      "fakeRules": ["regexp:.*"],
      "fakeNet": "255.255.255.255/24",
      "regeneration": "lru",
      "path": "/tmp/fake"
    }
  }

其中，

fakeRules 指明了需要启用 Fake IP 功能的域名。
fakeNet 指明了返回的 Fake IP 所在的生成域。
regeneration 指明了生成域用尽时 Fake IP 的生成方式，共三种，分别为：
- lru: 默认值，替换最近最少使用的 IP。
- oldest: 替换最早被生成的 IP。
- none: 在 IP 用尽后停止使用 Fake IP 功能。
path 指明了 Fake IP 映射储存的文件位置，不指定则不储存 Fake IP 映射，将导致重启 V2Ray 之后丢失 Fake IP 于域名的映射数据。

关于对规则匹配系统的重构的 commit 6c7d324

原因

为了对规则指定的域名启用 Fake IP 功能，需要用到规则匹配系统。V2Ray 现有两处可以使用匹配规则：DnsObject 和 RoutingObject 。

在原先的代码中， DnsObject 的规则匹配采用了映射 RoutingObject 的匹配规则的方式。这对于 Fake IP 的规则匹配功能开发极不友好，需要添加重复代码堆在 RoutingObject 上，因此我才重构了规则系统。

特性

规则的类型不再依赖枚举量，而是由字符串的第一个字符决定。JSON 中的配置方式保持不变，在读取配置时会自动转换前缀。

这样就不需要在各处引用来自 router 的枚举类型并做映射，同时也为更复杂的匹配规则提供了可能性（如与，或类二元规则

将外部文件处理为一条规则而不是在 V2Ctl 中展开，并将外部文件储存到额外的区域待 V2Ray 构建匹配规则时调用。

主要是为更复杂的匹配规则提供方便，减少因为复杂规则的大量提前展开而增加的传输数据量

后续工作

commit 66b42ab 开始对匹配规则重构的后续工作。

~~目前只有 Fake IP，重构后的 DnsObject 使用这种规则匹配方式。~~

commit 5501729 完成了对所有规则匹配代码的重构。

之后可以便捷地添加新的匹配规则 / 为其他地方启用匹配规则功能。

A new item "useFake" in DnsObject for controlling fake IP function. After the fake IP function enabled, the local DNS server of v2ray will response with a unique fake IP for every unique domain name. Once v2ray received a request to one of the fake IP, it will replace the domain name of its destination with the previously saved one.

Move the rules parser to the V2Ray. Considering we parse the rules in the strmatcher package, programers only need to care about the rules themselves now. In the previous version, we prase the configure file in the V2Ctl and only send the base rules to the V2Ray. It works, but is hard to add complex rules and to reuse code.

Add a class implementing strmatcher.Matcher, which is used to check whether a domain is in the fake IP list or not. Using rules from dns.useFake, which is an array, to generate domain matching rules.

Testing is necessary!

Move useFake to fake.fakeRules, and add fake.fakeNet. Fake IP will be generated in the fakeNet domain.

We don't need StaticHosts anymore.

To be compatible with a old version of V2Ctl, StaticHosts are still processed on the V2Ray.

Update the matching rules handler of the DNS server. Revert the name dns.Config_HostMapping.Pattern back to Domain for compatibility. Add a new matching type DomainMatchingType_New for compatibility.

Seperating means sharing. Also remove redundant code in DNS host.

WOW, what a mess. Add a argument for compressPattern method to specify the default matching method. Add external rules data to router's protobuf structure.

Merge ParsePattern method of MatcherGroup and OrMatcher. Remove Type.New method, it's not needed anymore. Change OrMatcher.New() to NewOrMatcher() for convenience.

It should not query for domain if the income is already domain.

Add LookupRealIP methods in the features.dns interface, so that others can always get the real IP no matter the fake IP is enabled or not.

Add LookupRealIP support for test cases.

Now, there are three regeneration methods when fake IP pool runs out: None: Stop generating fake IP. Oldest: Reuse the earliest generated IP. LRU: Reuse the least recently used IP.

Save generated fake IP to file to keep fake IP mapping from losing.

kambrynocortez · 2020-04-25T09:00:29Z

app/dns/fake.go

+type lruMapper struct {
+	domainMapper  map[string]*addressNode
+	addressMapper map[uint32]*domainNode
+	lru           *list.List
+	next          uint32
+}


domainMapper和addressMapper有线程安全问题，会发生并发读写错误，建议加锁。

kambrynocortez · 2020-04-25T09:04:03Z

infra/conf/dns.go

+	if c.Fake != nil {
+		config.Fake = new(dns.Config_Fake)
+		if c.Fake.FakeNet == "" {
+			config.Fake.FakeNet = "224.0.0.0/22"


建议避免使用D类广播地址。

198.18.0.0/15 如何，C类地址，被保留作网络组件测试。

Loyalsoldier · 2020-09-22T14:38:21Z

Please move to https://github.com/v2fly/v2ray-core/pulls

RPRX · 2020-10-31T11:35:31Z

麻烦及时提交到 https://github.com/v2fly/v2ray-core/pulls

（如果无回应，我们有可能会使用您的 commits）

github-actions · 2021-03-01T02:06:08Z

It has been open 120 days with no activity. Remove stale label or comment or this will be closed in 5 days

EqCScO9nTa added 7 commits February 10, 2020 23:49

Implemented fake IP rules

19782f5

Add a class implementing strmatcher.Matcher, which is used to check whether a domain is in the fake IP list or not. Using rules from dns.useFake, which is an array, to generate domain matching rules.

Tweak coding style, add comments

fc20df4

Tweak & Add test cases for new code

9cf4f8c

Testing is necessary!

Add subnet conctrol for fake IP

b1f777e

Move useFake to fake.fakeRules, and add fake.fakeNet. Fake IP will be generated in the fakeNet domain.

Merge branch 'master' of https://github.com/v2ray/v2ray-core

08a159b

EqCScO9nTa force-pushed the master branch 2 times, most recently from dc948c8 to 5e06a29 Compare February 11, 2020 20:39

EqCScO9nTa requested a review from DarienRaymond February 11, 2020 20:41

Improve code style

124c2db

EqCScO9nTa force-pushed the master branch from 5e06a29 to 124c2db Compare February 11, 2020 20:42

EqCScO9nTa added 3 commits February 13, 2020 13:32

Delete redundant code on the V2Ctl

8bf664a

We don't need StaticHosts anymore.

Maintain compatibility for StaticHosts

551776a

To be compatible with a old version of V2Ctl, StaticHosts are still processed on the V2Ray.

Refactor code

66b42ab

Update the matching rules handler of the DNS server. Revert the name dns.Config_HostMapping.Pattern back to Domain for compatibility. Add a new matching type DomainMatchingType_New for compatibility.

EqCScO9nTa requested a review from kslr February 13, 2020 08:50

Seperating rules parser with DNS conf builder

4dce78b

Seperating means sharing. Also remove redundant code in DNS host.

EqCScO9nTa force-pushed the master branch from fe92860 to 4dce78b Compare February 13, 2020 12:17

EqCScO9nTa added 3 commits February 13, 2020 20:25

Refactor router rules matching code

5501729

WOW, what a mess. Add a argument for compressPattern method to specify the default matching method. Add external rules data to router's protobuf structure.

Report error if there is no rule for fake IP

5de5b9b

Delete redundant code in strmatcher

67c94ad

Merge ParsePattern method of MatcherGroup and OrMatcher. Remove Type.New method, it's not needed anymore. Change OrMatcher.New() to NewOrMatcher() for convenience.

EqCScO9nTa mentioned this pull request Feb 13, 2020

添加更多的匹配规则 #2247

Closed

EqCScO9nTa added 6 commits February 15, 2020 13:59

Fix fake dns

3907343

It should not query for domain if the income is already domain.

Stop using fake IP for freedom outbound

7b3d995

Add LookupRealIP methods in the features.dns interface, so that others can always get the real IP no matter the fake IP is enabled or not.

Fix test cases for DNS

26af3ff

Add LookupRealIP support for test cases.

Add regeneration method for fake IP

8e93b24

Now, there are three regeneration methods when fake IP pool runs out: None: Stop generating fake IP. Oldest: Reuse the earliest generated IP. LRU: Reuse the least recently used IP.

Fix code style and test case

645af22

Add fake IP file saver

3fdbd02

Save generated fake IP to file to keep fake IP mapping from losing.

EqCScO9nTa force-pushed the master branch from 60fa493 to 3fdbd02 Compare March 3, 2020 08:28

kambrynocortez reviewed Apr 25, 2020

View reviewed changes

ghost mentioned this pull request Aug 14, 2020

请求增加fake dns功能 zfl9/ipt2socks#31

Closed

yuhan6665 mentioned this pull request Oct 3, 2020

请问，设置里的流量探测有什么用，打开或者关闭有什么影响？ 2dust/v2rayNG#414

Closed

RPRX mentioned this pull request Oct 31, 2020

v2ray 应加入 Fake IP、代理组等实用性功能 v2fly/v2ray-core#377

Closed

yuhan6665 mentioned this pull request Nov 8, 2020

Add fake dns v2fly/v2ray-core#395

Closed

github-actions bot added the Stale label Mar 1, 2021

github-actions bot closed this Mar 7, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

增加 Fake IP / Fake DNS 功能#2237

增加 Fake IP / Fake DNS 功能#2237
EqCScO9nTa wants to merge 21 commits intov2ray:masterfrom
EqCScO9nTa:master

EqCScO9nTa commented Feb 11, 2020 •

edited

Loading

Uh oh!

kambrynocortez Apr 25, 2020

Uh oh!

kambrynocortez Apr 25, 2020

Uh oh!

ghost May 2, 2020

Uh oh!

Loyalsoldier commented Sep 22, 2020

Uh oh!

RPRX commented Oct 31, 2020

Uh oh!

github-actions bot commented Mar 1, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

EqCScO9nTa commented Feb 11, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

语法

原因

特性

后续工作

Uh oh!

kambrynocortez Apr 25, 2020

Choose a reason for hiding this comment

Uh oh!

kambrynocortez Apr 25, 2020

Choose a reason for hiding this comment

Uh oh!

ghost May 2, 2020

Choose a reason for hiding this comment

Uh oh!

Loyalsoldier commented Sep 22, 2020

Uh oh!

RPRX commented Oct 31, 2020

Uh oh!

github-actions bot commented Mar 1, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

EqCScO9nTa commented Feb 11, 2020 •

edited

Loading