bugfix: 修复拦截器匹配请求path时，部分地址匹配串在匹配时出现异常的问题，同时添加匹配串有问题的error日志。

docmirror · Sep 13, 2024 · 24de95f · 24de95f
1 parent 2375a30
commit 24de95f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/packages/mitmproxy/src/options.js b/packages/mitmproxy/src/options.js
@@ -127,7 +127,7 @@ module.exports = (serverConfig) => {
             // 如果存在同名拦截器，则order值越大，优先级越高
             const matchedInterceptOpt = matchInterceptsOpts[impl.name]
             if (matchedInterceptOpt) {
-              if (matchedInterceptOpt.order >= interceptOpt.order) {
+              if (matchedInterceptOpt.order >= (interceptOpt.order || 0)) {
                 log.warn(`duplicate interceptor: ${impl.name}, hostname: ${rOptions.hostname}`)
                 continue
               }

diff --git a/packages/mitmproxy/src/utils/util.match.js b/packages/mitmproxy/src/utils/util.match.js
@@ -2,10 +2,16 @@ const lodash = require('lodash')
 const log = require('./util.log')
 
 function isMatched (url, regexp) {
-  if (regexp === '*') {
-    regexp = '.*'
+  try {
+    let urlRegexp = regexp
+    if (regexp[0] === '*' || regexp[0] === '?' || regexp[0] === '+') {
+      urlRegexp = '.' + regexp
+    }
+    return url.match(urlRegexp)
+  } catch (e) {
+    log.error('匹配串有问题:', regexp)
+    return false
   }
-  return url.match(regexp)
 }
 
 function domainRegexply (target) {