From 8765aaa907cbc35b0f4350c863a8db6076a7a428 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Mon, 7 Mar 2022 11:57:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0host=20=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/src/config/index.js | 1 + packages/gui/src/view/pages/server.vue | 4 ++++ packages/mitmproxy/src/index.js | 2 +- packages/mitmproxy/src/lib/proxy/common/config.js | 2 ++ packages/mitmproxy/src/lib/proxy/mitmproxy/index.js | 4 ++-- packages/mitmproxy/src/options.js | 1 + 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/core/src/config/index.js b/packages/core/src/config/index.js index dc98b56c..41ffdf92 100644 --- a/packages/core/src/config/index.js +++ b/packages/core/src/config/index.js @@ -27,6 +27,7 @@ module.exports = { }, server: { enabled: true, + host: '127.0.0.1', port: 31181, setting: { NODE_TLS_REJECT_UNAUTHORIZED: true, diff --git a/packages/gui/src/view/pages/server.vue b/packages/gui/src/view/pages/server.vue index 4db72064..2d2623c9 100644 --- a/packages/gui/src/view/pages/server.vue +++ b/packages/gui/src/view/pages/server.vue @@ -28,6 +28,10 @@ 日志 + + +
修改后需要重启应用
+
修改后需要重启应用
diff --git a/packages/mitmproxy/src/index.js b/packages/mitmproxy/src/index.js index 08b3e2ce..a20447fd 100644 --- a/packages/mitmproxy/src/index.js +++ b/packages/mitmproxy/src/index.js @@ -65,7 +65,7 @@ const api = { } const newServer = mitmproxy.createProxy(proxyOptions, () => { fireStatus(true) - log.info('代理服务已启动:127.0.0.1:' + proxyOptions.port) + log.info(`代理服务已启动:${proxyOptions.host}:${proxyOptions.port}`) }) newServer.on('close', () => { log.info('server will closed ') diff --git a/packages/mitmproxy/src/lib/proxy/common/config.js b/packages/mitmproxy/src/lib/proxy/common/config.js index 5feccd45..e1014241 100644 --- a/packages/mitmproxy/src/lib/proxy/common/config.js +++ b/packages/mitmproxy/src/lib/proxy/common/config.js @@ -5,6 +5,8 @@ config.caCertFileName = 'dev-sidecar.ca.crt' config.caKeyFileName = 'dev-sidecar.ca.key.pem' +config.defaultHost = '127.0.0.1' + config.defaultPort = 1181 config.caName = 'DevSidecar - This certificate is generated locally' diff --git a/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js b/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js index f8972c53..c3e1882e 100644 --- a/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js +++ b/packages/mitmproxy/src/lib/proxy/mitmproxy/index.js @@ -12,6 +12,7 @@ const defaultDns = require('dns') const speedTest = require('../../speed/index.js') module.exports = { createProxy ({ + host = config.defaultHost, port = config.defaultPort, caCertPath, caKeyPath, @@ -41,7 +42,6 @@ module.exports = { } port = ~~port - const speedTestConfig = dnsConfig.speedTest const dnsMap = dnsConfig.providers if (speedTestConfig) { @@ -82,7 +82,7 @@ module.exports = { ) const server = new http.Server() - server.listen(port, '127.0.0.1', () => { + server.listen(port, host, () => { log.info(`dev-sidecar启动端口: ${port}`) server.on('error', (e) => { log.error('server error', e) diff --git a/packages/mitmproxy/src/options.js b/packages/mitmproxy/src/options.js index 59e8ceba..fbf70f21 100644 --- a/packages/mitmproxy/src/options.js +++ b/packages/mitmproxy/src/options.js @@ -27,6 +27,7 @@ module.exports = (config) => { middlewares.push(overwallMiddleware) } const options = { + host: serverConfig.host, port: serverConfig.port, dnsConfig: { providers: dnsUtil.initDNS(serverConfig.dns.providers),