bugfix: 修复 matchUtil.domainMapRegexply() 方法BUG导致部分配置丢失有问题

Author: wangliang181230

packages/mitmproxy/src/utils/util.match.js

@@ -32,12 +32,11 @@ function domainMapRegexply (hostMap) {
   const regexpMap = {}
   const origin = {} // 用于快速匹配，见matchHostname、matchHostnameAll方法
   lodash.each(hostMap, (value, domain) => {
-    if (lodash.isEmpty(value)) {
-      return
-    }
-
     // 将域名匹配串格式如 `.xxx.com` 转换为 `*.xxx.com`
-    if (domain[0] === '.' && lodash.isEmpty(hostMap[`*${domain}`])) {
+    if (domain[0] === '.') {
+      if (hostMap[`*${domain}`] != null) {
+        return // 如果已经有匹配串 `*.xxx.com`，则忽略 `.xxx.com`
+      }
       domain = `*${domain}`
     }
 

packages/mitmproxy/test/lodashTest.js

@@ -1,5 +1,28 @@
+const assert = require('node:assert')
 const lodash = require('lodash')
 
+// test lodash.isEqual
 const arr1 = [1, 2, 3]
-const arr2 = [3, 2, 1]
-console.log(lodash.isEqual(arr1.sort(), arr2.sort()))
+const arr2 = [1, 2, 3]
+const arr3 = [3, 2, 1]
+assert.strictEqual(lodash.isEqual(arr1, arr2), true)
+assert.strictEqual(lodash.isEqual(arr1.sort(), arr3.sort()), true)
+
+// test lodash.isEmpty
+
+function isEmpty (obj) {
+  return obj == null || (lodash.isObject(obj) && lodash.isEmpty(obj))
+}
+
+// true
+assert.strictEqual(isEmpty(null), true)
+assert.strictEqual(isEmpty({}), true)
+assert.strictEqual(isEmpty([]), true)
+// false
+assert.strictEqual(isEmpty(true), false)
+assert.strictEqual(isEmpty(false), false)
+assert.strictEqual(isEmpty(1), false)
+assert.strictEqual(isEmpty(0), false)
+assert.strictEqual(isEmpty(-1), false)
+assert.strictEqual(isEmpty(''), false)
+assert.strictEqual(isEmpty('1'), false)

packages/mitmproxy/test/matchUtilTest.js

@@ -1,3 +1,4 @@
+const assert = require('node:assert')
 const matchUtil = require('../src/utils/util.match')
 
 const hostMap = matchUtil.domainMapRegexply({
@@ -6,48 +7,77 @@ const hostMap = matchUtil.domainMapRegexply({
   '*.ccc.com': true,
   '^.{1,3}ddd.com$': true,
   '*.cn': true,
+  '.github.com': true,
+
+  '*.eee.com': true,
+  '.eee.com': false, // 此配置将被忽略，因为有 '*.eee.com' 了，优先级更高
 })
 
 console.log(hostMap)
+assert.strictEqual(hostMap['^.*bbb\\.com$'], true)
+assert.strictEqual(hostMap['^.*\\.ccc\\.com$'], true)
+assert.strictEqual(hostMap['^.{1,3}ddd.com$'], true)
+assert.strictEqual(hostMap['^.*\\.cn$'], true)
+assert.strictEqual(hostMap['^.*\\.github\\.com$'], true)
+assert.strictEqual(hostMap['^.*\\.github\\.com$'], true)
+assert.strictEqual(hostMap['^.*\\.eee\\.com$'], true)
+
+const origin = hostMap.origin
+assert.strictEqual(origin['aaa.com'], true)
+assert.strictEqual(origin['*bbb.com'], true)
+assert.strictEqual(origin['*.ccc.com'], true)
+assert.strictEqual(origin['*.cn'], true)
+assert.strictEqual(origin['*.github.com'], true)
+assert.strictEqual(origin['.eee.com'], undefined)
 
-console.log('test1: aaa.com')
 const value11 = matchUtil.matchHostname(hostMap, 'aaa.com', 'test1.1')
 const value12 = matchUtil.matchHostname(hostMap, 'aaaa.com', 'test1.2')
 const value13 = matchUtil.matchHostname(hostMap, 'aaaa.comx', 'test1.3')
-console.log(value11) // true
-console.log(value12) // undefined
-console.log(value13) // undefined
+console.log('test1: aaa.com')
+assert.strictEqual(value11, true)
+assert.strictEqual(value12, undefined)
+assert.strictEqual(value13, undefined)
 
-console.log('test2: *bbb.com')
 const value21 = matchUtil.matchHostname(hostMap, 'bbb.com', 'test2.1')
 const value22 = matchUtil.matchHostname(hostMap, 'xbbb.com', 'test2.2')
 const value23 = matchUtil.matchHostname(hostMap, 'bbb.comx', 'test2.3')
 const value24 = matchUtil.matchHostname(hostMap, 'x.bbb.com', 'test2.4')
-console.log(value21) // true
-console.log(value22) // true
-console.log(value23) // undefined
-console.log(value24) // true
+console.log('test2: *bbb.com')
+assert.strictEqual(value21, true)
+assert.strictEqual(value22, true)
+assert.strictEqual(value23, undefined)
+assert.strictEqual(value24, true)
 
-console.log('test3: *.ccc.com')
 const value31 = matchUtil.matchHostname(hostMap, 'ccc.com', 'test3.1')
 const value32 = matchUtil.matchHostname(hostMap, 'x.ccc.com', 'test3.2')
 const value33 = matchUtil.matchHostname(hostMap, 'xccc.com', 'test3.3')
-console.log(value31) // true
-console.log(value32) // true
-console.log(value33) // undefined
+console.log('test3: *.ccc.com')
+assert.strictEqual(value31, true)
+assert.strictEqual(value32, true)
+assert.strictEqual(value33, undefined)
 
-console.log('test4: ^.{1,3}ddd.com$')
 const value41 = matchUtil.matchHostname(hostMap, 'ddd.com', 'test4.1')
 const value42 = matchUtil.matchHostname(hostMap, 'x.ddd.com', 'test4.2')
 const value43 = matchUtil.matchHostname(hostMap, 'xddd.com', 'test4.3')
-console.log(value41) // undefined
-console.log(value42) // true
-console.log(value43) // true
+console.log('test4: ^.{1,3}ddd.com$')
+assert.strictEqual(value41, undefined)
+assert.strictEqual(value42, true)
+assert.strictEqual(value43, true)
 
-console.log('test5: *.cn')
 const value51 = matchUtil.matchHostname(hostMap, 'eee.cn', 'test5.1')
 const value52 = matchUtil.matchHostname(hostMap, 'x.eee.cn', 'test5.2')
 const value53 = matchUtil.matchHostname(hostMap, 'aaaa.cnet.com', 'test5.3')
-console.log(value51) // true
-console.log(value52) // true
-console.log(value53) // undefined
+console.log('test5: *.cn')
+assert.strictEqual(value51, true)
+assert.strictEqual(value52, true)
+assert.strictEqual(value53, undefined)
+
+const value61 = matchUtil.matchHostname(hostMap, 'github.com', 'test6.1')
+const value62 = matchUtil.matchHostname(hostMap, 'api.github.com', 'test6.2')
+const value63 = matchUtil.matchHostname(hostMap, 'aa.bb.github.com', 'test6.3')
+const value64 = matchUtil.matchHostname(hostMap, 'aaagithub.com', 'test6.4')
+console.log('test6: .github.com')
+assert.strictEqual(value61, true)
+assert.strictEqual(value62, true)
+assert.strictEqual(value63, true)
+assert.strictEqual(value64, undefined)