fcdns 0.3.14 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +21 -0
- package/README.md +10 -58
- package/lib/cli.js +3 -6
- package/lib/cli.js.map +1 -1
- package/lib/router.js +37 -32
- package/lib/router.js.map +1 -1
- package/lib/server.js +4 -4
- package/lib/server.js.map +1 -1
- package/lib/utils/map-file.js.map +1 -1
- package/package.json +16 -16
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,27 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
## [0.4.0](https://github.com/BlackGlory/fcdns/compare/v0.3.16...v0.4.0) (2022-07-25)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### ⚠ BREAKING CHANGES
|
|
9
|
+
|
|
10
|
+
* - Remove loose mode, because it doesn't work very well
|
|
11
|
+
- Remove microcaching, as caching is best implemented as a relay server
|
|
12
|
+
|
|
13
|
+
### Features
|
|
14
|
+
|
|
15
|
+
* remove loose mode and microcaching ([986e58f](https://github.com/BlackGlory/fcdns/commit/986e58f4cc88ab3c77f3149e7a5dc644ee370d79))
|
|
16
|
+
|
|
17
|
+
### [0.3.16](https://github.com/BlackGlory/fcdns/compare/v0.3.15...v0.3.16) (2022-07-25)
|
|
18
|
+
|
|
19
|
+
### [0.3.15](https://github.com/BlackGlory/fcdns/compare/v0.3.14...v0.3.15) (2022-04-16)
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
### Bug Fixes
|
|
23
|
+
|
|
24
|
+
* hostname blacklist ([0e21a21](https://github.com/BlackGlory/fcdns/commit/0e21a214c13633ee4a3b2fe6353ae97d72f3fa65))
|
|
25
|
+
|
|
5
26
|
### [0.3.14](https://github.com/BlackGlory/fcdns/compare/v0.3.13...v0.3.14) (2022-04-16)
|
|
6
27
|
|
|
7
28
|
|
package/README.md
CHANGED
|
@@ -26,7 +26,6 @@ Options:
|
|
|
26
26
|
--test-cache <filename> (default: "test.txt")
|
|
27
27
|
--test-timeout <ms> (default: "200")
|
|
28
28
|
--log <level> (default: "info")
|
|
29
|
-
--loose-mode
|
|
30
29
|
-h, --help display help for command
|
|
31
30
|
```
|
|
32
31
|
|
|
@@ -39,7 +38,7 @@ fcdns \
|
|
|
39
38
|
```
|
|
40
39
|
|
|
41
40
|
## 原理
|
|
42
|
-
|
|
43
42
|
|
|
44
43
|
## 必要条件
|
|
45
44
|
使用fcdns需要指定3个服务器地址, 1份IP地址白名单, 1份主机名白名单.
|
|
@@ -62,7 +61,7 @@ fcdns会持久化缓存投毒测试的结果, 同一个主机名只在第一次
|
|
|
62
61
|
|
|
63
62
|
之所以需要依赖不可信DNS服务器, 是因为不可信DNS服务器通常比可信DNS服务器更快响应, 且返回的结果更准确.
|
|
64
63
|
|
|
65
|
-
|
|
64
|
+
由于fcdns只提供DNS转发功能, 建议使用CoreDNS等程序建立本地DNS服务器作为背后的代理.
|
|
66
65
|
|
|
67
66
|
### 可信DNS服务器(trusted server)
|
|
68
67
|
可信DNS服务器是一台DNS服务器, 客户端与该服务器的连接是不被污染的, 且该服务器不会返回被污染的结果.
|
|
@@ -70,7 +69,7 @@ fcdns会持久化缓存投毒测试的结果, 同一个主机名只在第一次
|
|
|
70
69
|
之所以需要可信DNS服务器, 是为了能够查询那些被投毒的主机名的正确记录.
|
|
71
70
|
可信DNS服务器返回的结果可能并不总是最准确, 但至少是具备可用性的.
|
|
72
71
|
|
|
73
|
-
|
|
72
|
+
由于fcdns只提供DNS转发功能, 建议使用CoreDNS等程序建立本地DNS服务器作为背后的代理.
|
|
74
73
|
|
|
75
74
|
### IP地址白名单(ip whitelist)
|
|
76
75
|
IP地址白名单用于指定允许用"不可信DNS服务器"返回的IP地址或IP地址范围,
|
|
@@ -80,7 +79,7 @@ IP地址白名单用于指定允许用"不可信DNS服务器"返回的IP地址
|
|
|
80
79
|
|
|
81
80
|
fcdns会持久化缓存查询最终选择的服务器, 同一个主机名只在第一次查询时会被IP地址白名单影响.
|
|
82
81
|
|
|
83
|
-
|
|
82
|
+
之所以使用白名单而不是黑名单, 是因为通常情况下白名单所需记录的内容条数较少.
|
|
84
83
|
|
|
85
84
|
#### 文件格式
|
|
86
85
|
白名单是一个文本文件, 以行为分隔符储存地址或地址范围.
|
|
@@ -129,62 +128,15 @@ wikipedia.org
|
|
|
129
128
|
*.wikipedia.org
|
|
130
129
|
```
|
|
131
130
|
|
|
132
|
-
## 宽松模式
|
|
133
|
-
在宽松模式下, 当相关主机名不存在路由缓存时(即第一次查询该主机名), 会立即查询不可信服务器并返回记录, 然后在后台执行投毒测试和路由缓存.
|
|
134
|
-
|
|
135
|
-
宽松模式通过降低fcdns的准确性, 提升了在可信信道不稳定情况下的用户体验, 这适用于只有少数主机名被投毒的环境.
|
|
136
|
-
|
|
137
|
-
## 性能
|
|
138
|
-
fcdns不是作为高性能DNS服务器开发的, 选择Node.js栈完全是出于开发方面的便利性.
|
|
139
|
-
fcdns的性能经过测试足以应付日常使用.
|
|
140
|
-
|
|
141
|
-
如果阅读fcdns的源代码, 则会发现一些可能进一步优化的部分,
|
|
142
|
-
不实施这些优化的主要原因是为了避免降低代码的可读性.
|
|
143
|
-
|
|
144
|
-
### 延迟
|
|
145
|
-
fcdns存在一些可以被注意到的延迟:
|
|
146
|
-
- 投毒测试
|
|
147
|
-
- 可信DNS服务器在无缓存的情况下被查询
|
|
148
|
-
- 不可信DNS服务器在无缓存的情况下被查询
|
|
149
|
-
- IP地址范围白名单
|
|
150
|
-
|
|
151
|
-
其中"可信DNS服务器"和"不可信DNS服务器"的延迟可以通过使用设置带有缓存的本地DNS服务器降至最低.
|
|
152
|
-
|
|
153
|
-
投毒测试的最大延迟由超时时间决定,
|
|
154
|
-
由于超时时间不应该设定为一个过低的值(建议至少为200ms), 因此首次投毒测试的延迟无法被消除.
|
|
155
|
-
随着fcdns的运行, 投毒测试的延迟将由于缓存的存在变得可以被忽略.
|
|
156
|
-
|
|
157
|
-
检查一个IP地址是否处于IP地址范围白名单内目前是通过遍历实现的,
|
|
158
|
-
在有5000条地址范围的情况下, 根据硬件的不同, 有可能会出现个位数毫秒的计算时间.
|
|
159
|
-
理论上可以通过将地址范围排序后做二分查找来加速此过程, 但暂未实现.
|
|
160
|
-
|
|
161
|
-
## 资源占用
|
|
162
|
-
### 硬盘占用
|
|
163
|
-
fcdns的缓存文件会在启动时自动压缩, 但在运行时是仅追加(append)的,
|
|
164
|
-
出现相同域名的并行查询时, 会重复写入相同的记录.
|
|
165
|
-
如果有非常大量完全不同域名的查询, 则缓存文件可能导致硬盘占用增加, 但在大部分场景下应该无需担心.
|
|
166
|
-
|
|
167
|
-
fcdns有两个缓存文件, 分别缓存投毒测试结果和路由结果.
|
|
168
|
-
由于路由缓存的优先级更高, 因此投毒测试缓存对于路由缓存来说是冗余的.
|
|
169
|
-
fcdns保留投毒测试缓存是考虑到了收集投毒测试结果的需要, 以及清空路由缓存的场景.
|
|
170
|
-
|
|
171
|
-
### 内存占用
|
|
172
|
-
fcdns的内存缓存受V8引擎的实现限制, 且缓存是只增不减的.
|
|
173
|
-
根据经验, Node.js程序的内存占用量通常会是使用类似数据类型的本地程序的两倍以上.
|
|
174
|
-
如果有非常大量完全不同域名的查询, 则内存缓存可能导致内存占用增加, 但在大部分场景下应该无需担心.
|
|
175
|
-
|
|
176
131
|
## 针对fcdns的攻击
|
|
177
|
-
### DNS
|
|
132
|
+
### 以黑名单/白名单形式污染DNS服务器
|
|
178
133
|
禁止向非DNS服务器发送DNS数据包将会破坏fcdns的投毒测试功能.
|
|
179
134
|
|
|
180
|
-
###
|
|
181
|
-
禁止发送ping(echo request)或丢弃reply(echo reply)将会破坏fcdns的投毒测试功能.
|
|
182
|
-
|
|
183
|
-
### 无差别污染
|
|
135
|
+
### 无差别污染主机名
|
|
184
136
|
劫持所有DNS响应将会破坏fcdns的投毒测试功能.
|
|
185
137
|
|
|
186
|
-
###
|
|
187
|
-
|
|
138
|
+
### 随机投毒
|
|
139
|
+
随机投毒将会使fcdns生成错误的缓存记录.
|
|
188
140
|
|
|
189
|
-
|
|
190
|
-
|
|
141
|
+
### 禁止ping
|
|
142
|
+
禁止发送ping(echo request)或丢弃reply(echo reply)将会破坏fcdns的投毒测试功能.
|
package/lib/cli.js
CHANGED
|
@@ -21,11 +21,11 @@ commander_1.program
|
|
|
21
21
|
.option('--port <port>', '', '53')
|
|
22
22
|
.option('--ip-whitelist <filename>', '', 'ip-whitelist.txt')
|
|
23
23
|
.option('--hostname-whitelist <filename>', '', 'hostname-whitelist.txt')
|
|
24
|
+
.option('--hostname-blacklist <filename>', '', 'hostname-blacklist.txt')
|
|
24
25
|
.option('--route-cache <filename>', '', 'route.txt')
|
|
25
26
|
.option('--test-cache <filename>', '', 'test.txt')
|
|
26
27
|
.option('--test-timeout <ms>', '', '200')
|
|
27
28
|
.option('--log <level>', '', 'info')
|
|
28
|
-
.option('--loose-mode')
|
|
29
29
|
.action(async () => {
|
|
30
30
|
const options = getOptions();
|
|
31
31
|
const tester = await tester_1.Tester.create({
|
|
@@ -43,8 +43,7 @@ commander_1.program
|
|
|
43
43
|
ipWhitelist,
|
|
44
44
|
hostnameWhitelist,
|
|
45
45
|
hostnameBlacklist,
|
|
46
|
-
cacheFilename: options.routeCacheFilename
|
|
47
|
-
looseMode: options.looseMode
|
|
46
|
+
cacheFilename: options.routeCacheFilename
|
|
48
47
|
});
|
|
49
48
|
const logger = new extra_logger_1.Logger({
|
|
50
49
|
level: options.logLevel,
|
|
@@ -76,7 +75,6 @@ function getOptions() {
|
|
|
76
75
|
(0, errors_1.assert)(/^\d+$/.test(opts.testTimeout), 'The parameter test timeout must be integer');
|
|
77
76
|
const testTimeout = Number.parseInt(opts.testTimeout, 10);
|
|
78
77
|
const logLevel = (0, extra_logger_1.stringToLevel)(opts.log, extra_logger_1.Level.Info);
|
|
79
|
-
const looseMode = opts.looseMode;
|
|
80
78
|
return {
|
|
81
79
|
testServer,
|
|
82
80
|
untrustedServer,
|
|
@@ -88,8 +86,7 @@ function getOptions() {
|
|
|
88
86
|
routeCacheFilename,
|
|
89
87
|
testCacheFilename,
|
|
90
88
|
testTimeout,
|
|
91
|
-
logLevel
|
|
92
|
-
looseMode
|
|
89
|
+
logLevel
|
|
93
90
|
};
|
|
94
91
|
}
|
|
95
92
|
//# sourceMappingURL=cli.js.map
|
package/lib/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;AACA,yCAAmC;AACnC,qCAAsC;AACtC,qCAAiC;AACjC,iDAA4C;AAC5C,mDAA8C;AAC9C,qCAAiC;AACjC,oEAA8D;AAC9D,+CAA2C;AAC3C,+CAA8E;AAC9E,gEAA0D;AAE1D,mBAAO;KACJ,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC;KACrC,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC;KAC3C,WAAW,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,WAAW,CAAC;KACnD,MAAM,CAAC,wBAAwB,EAAE,EAAE,CAAC;KACpC,MAAM,CAAC,6BAA6B,EAAE,EAAE,CAAC;KACzC,MAAM,CAAC,2BAA2B,EAAE,EAAE,CAAC;KACvC,MAAM,CAAC,eAAe,EAAE,EAAE,EAAE,IAAI,CAAC;KACjC,MAAM,CAAC,2BAA2B,EAAE,EAAE,EAAE,kBAAkB,CAAC;KAC3D,MAAM,CAAC,iCAAiC,EAAE,EAAE,EAAE,wBAAwB,CAAC;KACvE,MAAM,CAAC,0BAA0B,EAAE,EAAE,EAAE,WAAW,CAAC;KACnD,MAAM,CAAC,yBAAyB,EAAE,EAAE,EAAE,UAAU,CAAC;KACjD,MAAM,CAAC,qBAAqB,EAAE,EAAE,EAAE,KAAK,CAAC;KACxC,MAAM,CAAC,eAAe,EAAE,EAAE,EAAE,MAAM,CAAC;KACnC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/lib/router.js
CHANGED
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Router = exports.
|
|
3
|
+
exports.Router = exports.RouteResult = void 0;
|
|
4
4
|
const map_file_1 = require("./utils/map-file");
|
|
5
5
|
const resolve_a_1 = require("./utils/resolve-a");
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
6
|
+
const prelude_1 = require("@blackglory/prelude");
|
|
7
|
+
var RouteResult;
|
|
8
|
+
(function (RouteResult) {
|
|
9
|
+
RouteResult[RouteResult["UntrustedServer"] = 0] = "UntrustedServer";
|
|
10
|
+
RouteResult[RouteResult["TrustedServer"] = 1] = "TrustedServer";
|
|
11
|
+
RouteResult[RouteResult["Unresolved"] = 2] = "Unresolved";
|
|
12
|
+
})(RouteResult = exports.RouteResult || (exports.RouteResult = {}));
|
|
11
13
|
class Router {
|
|
12
|
-
constructor(cacheFilename, cache,
|
|
14
|
+
constructor(cacheFilename, cache, tester, untrustedResolver, ipWhitelist, hostnameWhitelist, hostnameBlacklist) {
|
|
13
15
|
this.cacheFilename = cacheFilename;
|
|
14
16
|
this.cache = cache;
|
|
15
|
-
this.looseMode = looseMode;
|
|
16
17
|
this.tester = tester;
|
|
17
18
|
this.untrustedResolver = untrustedResolver;
|
|
18
19
|
this.ipWhitelist = ipWhitelist;
|
|
@@ -26,48 +27,52 @@ class Router {
|
|
|
26
27
|
const hostnameWhitelist = options.hostnameWhitelist;
|
|
27
28
|
const hostnameBlacklist = options.hostnameBlacklist;
|
|
28
29
|
const cacheFilename = options.cacheFilename;
|
|
29
|
-
const looseMode = options.looseMode;
|
|
30
30
|
const cache = await (0, map_file_1.readMapFile)(cacheFilename);
|
|
31
31
|
await (0, map_file_1.writeMapFile)(cacheFilename, cache);
|
|
32
|
-
return new Router(cacheFilename, cache,
|
|
32
|
+
return new Router(cacheFilename, cache, tester, untrustedResolver, ipWhitelist, hostnameWhitelist, hostnameBlacklist);
|
|
33
33
|
}
|
|
34
|
-
async
|
|
34
|
+
async route(hostname) {
|
|
35
|
+
const result = await this.routeByLocal(hostname);
|
|
36
|
+
switch (result) {
|
|
37
|
+
case RouteResult.UntrustedServer:
|
|
38
|
+
case RouteResult.TrustedServer:
|
|
39
|
+
return result;
|
|
40
|
+
default: return await (0, prelude_1.go)(async () => {
|
|
41
|
+
const result = await this.routeByNetwork(hostname);
|
|
42
|
+
switch (result) {
|
|
43
|
+
case RouteResult.UntrustedServer:
|
|
44
|
+
case RouteResult.TrustedServer:
|
|
45
|
+
this.setCache(hostname, result);
|
|
46
|
+
default: return result;
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
async routeByLocal(hostname) {
|
|
35
52
|
if (this.inHostnameWhitelist(hostname))
|
|
36
|
-
return
|
|
53
|
+
return RouteResult.UntrustedServer;
|
|
37
54
|
if (this.inHostnameBlacklist(hostname))
|
|
38
|
-
return
|
|
39
|
-
if (this.cache.has(hostname))
|
|
55
|
+
return RouteResult.TrustedServer;
|
|
56
|
+
if (this.cache.has(hostname))
|
|
40
57
|
return this.cache.get(hostname);
|
|
41
|
-
|
|
42
|
-
else {
|
|
43
|
-
if (this.looseMode) {
|
|
44
|
-
queueMicrotask(() => this.getTargetWithoutCache(hostname));
|
|
45
|
-
return Target.Untrusted;
|
|
46
|
-
}
|
|
47
|
-
else {
|
|
48
|
-
return await this.getTargetWithoutCache(hostname);
|
|
49
|
-
}
|
|
50
|
-
}
|
|
58
|
+
return RouteResult.Unresolved;
|
|
51
59
|
}
|
|
52
|
-
async
|
|
60
|
+
async routeByNetwork(hostname) {
|
|
53
61
|
if (await this.tester.isPoisoned(hostname)) {
|
|
54
|
-
|
|
55
|
-
return Target.Trusted;
|
|
62
|
+
return RouteResult.TrustedServer;
|
|
56
63
|
}
|
|
57
64
|
else {
|
|
58
65
|
const addresses = await (0, resolve_a_1.resolveA)(this.untrustedResolver, hostname);
|
|
59
66
|
if (addresses.length > 0) {
|
|
60
67
|
if (this.inIPWhitelist(addresses)) {
|
|
61
|
-
|
|
62
|
-
return Target.Untrusted;
|
|
68
|
+
return RouteResult.UntrustedServer;
|
|
63
69
|
}
|
|
64
70
|
else {
|
|
65
|
-
|
|
66
|
-
return Target.Trusted;
|
|
71
|
+
return RouteResult.TrustedServer;
|
|
67
72
|
}
|
|
68
73
|
}
|
|
69
74
|
else {
|
|
70
|
-
return
|
|
75
|
+
return RouteResult.Unresolved;
|
|
71
76
|
}
|
|
72
77
|
}
|
|
73
78
|
}
|
package/lib/router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":";;;AAIA,8CAA0E;AAC1E,gDAA2C;
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}
|
package/lib/server.js
CHANGED
|
@@ -42,14 +42,14 @@ function startServer({ logger, port, router, trustedServer, untrustedServer }) {
|
|
|
42
42
|
res.header.rcode = dns.consts.NAME_TO_RCODE.SERVFAIL;
|
|
43
43
|
const startTime = Date.now();
|
|
44
44
|
const question = req.question[0];
|
|
45
|
-
var [err,
|
|
45
|
+
var [err, result] = await (0, return_style_1.getErrorResultAsync)(() => router.route(question.name));
|
|
46
46
|
if (err) {
|
|
47
47
|
logger.error(`${formatHostname(question.name)} ${err}`, getElapsed(startTime));
|
|
48
48
|
logger.trace(`response: ${JSON.stringify(res)}`);
|
|
49
49
|
return res.send();
|
|
50
50
|
}
|
|
51
|
-
logger.debug(`${formatHostname(question.name)} ${router_1.
|
|
52
|
-
const server =
|
|
51
|
+
logger.debug(`${formatHostname(question.name)} ${router_1.RouteResult[result]}`, getElapsed(startTime));
|
|
52
|
+
const server = result === router_1.RouteResult.TrustedServer ? trustedServer : untrustedServer;
|
|
53
53
|
var [err, response] = await (0, return_style_1.getErrorResultAsync)(() => resolve(server, question));
|
|
54
54
|
if (err) {
|
|
55
55
|
logger.error(`${formatHostname(question.name)} ${err}`, getElapsed(startTime));
|
|
@@ -63,7 +63,7 @@ function startServer({ logger, port, router, trustedServer, untrustedServer }) {
|
|
|
63
63
|
logger.trace(`response: ${JSON.stringify(res)}`);
|
|
64
64
|
res.send();
|
|
65
65
|
});
|
|
66
|
-
|
|
66
|
+
server.serve(port);
|
|
67
67
|
}
|
|
68
68
|
exports.startServer = startServer;
|
|
69
69
|
function resolve(server, question) {
|
package/lib/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map-file.js","sourceRoot":"","sources":["../../src/utils/map-file.ts"],"names":[],"mappings":";;;AAAA,0EAA8E;AAC9E,2BAAmC;AACnC,uDAA6C;AAEtC,KAAK,UAAU,WAAW,CAC/B,QAAgB;IAEhB,MAAM,IAAA,6BAAU,EAAC,QAAQ,CAAC,CAAA;IAC1B,MAAM,IAAI,GAAG,MAAM,aAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACjD,MAAM,OAAO,GAA8B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;SACxD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SAChB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IAE1B,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,CAAA;AACzB,CAAC;AAVD,kCAUC;AAEM,KAAK,UAAU,YAAY,
|
|
1
|
+
{"version":3,"file":"map-file.js","sourceRoot":"","sources":["../../src/utils/map-file.ts"],"names":[],"mappings":";;;AAAA,0EAA8E;AAC9E,2BAAmC;AACnC,uDAA6C;AAEtC,KAAK,UAAU,WAAW,CAC/B,QAAgB;IAEhB,MAAM,IAAA,6BAAU,EAAC,QAAQ,CAAC,CAAA;IAC1B,MAAM,IAAI,GAAG,MAAM,aAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACjD,MAAM,OAAO,GAA8B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;SACxD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SAChB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IAE1B,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,CAAA;AACzB,CAAC;AAVD,kCAUC;AAEM,KAAK,UAAU,YAAY,CAChC,QAAgB,EAChB,GAAc;IAEd,MAAM,IAAI,GAAG,IAAI,2BAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SAC7C,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SAC3B,OAAO,EAAE;SACT,IAAI,CAAC,IAAI,CAAC,CAAA;IAEb,MAAM,aAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC,CAAA;AAC3C,CAAC;AAVD,oCAUC;AAEM,KAAK,UAAU,aAAa,CACjC,QAAgB,EAChB,GAAM,EACN,KAAQ;IAER,MAAM,aAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;AACpE,CAAC;AAND,sCAMC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "fcdns",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0",
|
|
4
4
|
"description": "DNS relay server with fact-checking.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"dns"
|
|
@@ -32,42 +32,42 @@
|
|
|
32
32
|
}
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
|
-
"@commitlint/cli": "^
|
|
36
|
-
"@commitlint/config-conventional": "^
|
|
35
|
+
"@commitlint/cli": "^17.0.3",
|
|
36
|
+
"@commitlint/config-conventional": "^17.0.3",
|
|
37
37
|
"@types/jest": "^27.4.1",
|
|
38
38
|
"@types/ms": "^0.7.31",
|
|
39
39
|
"@types/node": "14",
|
|
40
40
|
"@types/ping": "^0.4.1",
|
|
41
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
42
|
-
"@typescript-eslint/parser": "^5.
|
|
43
|
-
"eslint": "^8.
|
|
41
|
+
"@typescript-eslint/eslint-plugin": "^5.30.7",
|
|
42
|
+
"@typescript-eslint/parser": "^5.30.7",
|
|
43
|
+
"eslint": "^8.20.0",
|
|
44
44
|
"husky": "4",
|
|
45
|
-
"internet-number": "^3.0.
|
|
45
|
+
"internet-number": "^3.0.2",
|
|
46
46
|
"jest": "^27.5.1",
|
|
47
47
|
"npm-run-all": "^4.1.5",
|
|
48
48
|
"rimraf": "^3.0.2",
|
|
49
|
-
"standard-version": "^9.
|
|
49
|
+
"standard-version": "^9.5.0",
|
|
50
50
|
"ts-jest": "^27.1.4",
|
|
51
51
|
"tsconfig-paths": "^3.14.1",
|
|
52
52
|
"tscpaths": "^0.0.9",
|
|
53
|
-
"typescript": "^4.
|
|
53
|
+
"typescript": "^4.7.4"
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
56
|
"@blackglory/errors": "^2.2.1",
|
|
57
|
-
"@blackglory/go": "^1.
|
|
58
|
-
"@blackglory/types": "^1.1
|
|
57
|
+
"@blackglory/go": "^1.1.1",
|
|
58
|
+
"@blackglory/types": "^1.2.1",
|
|
59
59
|
"address-range": "^0.2.9",
|
|
60
60
|
"chalk": "^4.1.2",
|
|
61
|
-
"commander": "^9.
|
|
62
|
-
"extra-filesystem": "^0.4.
|
|
63
|
-
"extra-logger": "^0.6.
|
|
64
|
-
"extra-promise": "^
|
|
61
|
+
"commander": "^9.4.0",
|
|
62
|
+
"extra-filesystem": "^0.4.4",
|
|
63
|
+
"extra-logger": "^0.6.8",
|
|
64
|
+
"extra-promise": "^2.3.0",
|
|
65
65
|
"iterable-operator": "^1.1.0",
|
|
66
66
|
"ms": "^2.1.3",
|
|
67
67
|
"native-node-dns": "0.7.6",
|
|
68
68
|
"native-node-dns-packet": "0.1.5",
|
|
69
69
|
"patch-package": "^6.4.7",
|
|
70
|
-
"ping": "^0.4.
|
|
70
|
+
"ping": "^0.4.2",
|
|
71
71
|
"return-style": "^1.0.0"
|
|
72
72
|
}
|
|
73
73
|
}
|