aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Ramage <ramage.lucas@protonmail.com>2020-04-05 10:36:09 -0400
committerLucas Ramage <ramage.lucas@protonmail.com>2020-04-05 10:36:09 -0400
commitcea443f21c40b522a8fe619355ca5a8d618730e9 (patch)
treef418559ff601fa55593c0dd28b0418f2d74e0489
parent481970d9b880bbbeea906c07fc5ce925a8aa5b17 (diff)
downloadmitmproxy-cea443f21c40b522a8fe619355ca5a8d618730e9.tar.gz
mitmproxy-cea443f21c40b522a8fe619355ca5a8d618730e9.tar.bz2
mitmproxy-cea443f21c40b522a8fe619355ca5a8d618730e9.zip
Rename web-iface to web-host
Bug: https://github.com/mitmproxy/mitmproxy/issues/3891
-rw-r--r--mitmproxy/tools/cmdline.py2
-rw-r--r--mitmproxy/tools/web/master.py4
-rw-r--r--mitmproxy/tools/web/webaddons.py6
-rw-r--r--release/docker/README.md2
4 files changed, 7 insertions, 7 deletions
diff --git a/mitmproxy/tools/cmdline.py b/mitmproxy/tools/cmdline.py
index e9ff973f..9c8eae8a 100644
--- a/mitmproxy/tools/cmdline.py
+++ b/mitmproxy/tools/cmdline.py
@@ -127,7 +127,7 @@ def mitmweb(opts):
group = parser.add_argument_group("Mitmweb")
opts.make_parser(group, "web_open_browser")
opts.make_parser(group, "web_port", metavar="PORT")
- opts.make_parser(group, "web_iface", metavar="INTERFACE")
+ opts.make_parser(group, "web_host", metavar="HOST")
common_options(parser, opts)
group = parser.add_argument_group(
diff --git a/mitmproxy/tools/web/master.py b/mitmproxy/tools/web/master.py
index 17845106..d127bdec 100644
--- a/mitmproxy/tools/web/master.py
+++ b/mitmproxy/tools/web/master.py
@@ -105,8 +105,8 @@ class WebMaster(master.Master):
AsyncIOMainLoop().install()
iol = tornado.ioloop.IOLoop.instance()
http_server = tornado.httpserver.HTTPServer(self.app)
- http_server.listen(self.options.web_port, self.options.web_iface)
- web_url = "http://{}:{}/".format(self.options.web_iface, self.options.web_port)
+ http_server.listen(self.options.web_port, self.options.web_host)
+ web_url = "http://{}:{}/".format(self.options.web_host, self.options.web_port)
self.log.info(
"Web server listening at {}".format(web_url),
)
diff --git a/mitmproxy/tools/web/webaddons.py b/mitmproxy/tools/web/webaddons.py
index ba3bdead..bd85651a 100644
--- a/mitmproxy/tools/web/webaddons.py
+++ b/mitmproxy/tools/web/webaddons.py
@@ -18,13 +18,13 @@ class WebAddon:
"Web UI port."
)
loader.add_option(
- "web_iface", str, "127.0.0.1",
- "Web UI interface."
+ "web_host", str, "127.0.0.1",
+ "Web UI host."
)
def running(self):
if hasattr(ctx.options, "web_open_browser") and ctx.options.web_open_browser:
- web_url = "http://{}:{}/".format(ctx.options.web_iface, ctx.options.web_port)
+ web_url = "http://{}:{}/".format(ctx.options.web_host, ctx.options.web_port)
success = open_browser(web_url)
if not success:
ctx.log.info(
diff --git a/release/docker/README.md b/release/docker/README.md
index b676d3ae..2fa93949 100644
--- a/release/docker/README.md
+++ b/release/docker/README.md
@@ -23,7 +23,7 @@ $ docker run --rm -it -p 8080:8080 mitmproxy/mitmproxy mitmdump
For `mitmweb`, you also need to expose port 8081:
```sh
# this makes :8081 accessible to the local machine only
-$ docker run --rm -it -p 8080:8080 -p 127.0.0.1:8081:8081 mitmproxy/mitmproxy mitmweb --web-iface 0.0.0.0
+$ docker run --rm -it -p 8080:8080 -p 127.0.0.1:8081:8081 mitmproxy/mitmproxy mitmweb --web-host 0.0.0.0
```
You can also pass options directly via the CLI: