aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/shared_cmd_options.py2
-rw-r--r--modules/sysinfo.py18
-rw-r--r--webui.py2
3 files changed, 19 insertions, 3 deletions
diff --git a/modules/shared_cmd_options.py b/modules/shared_cmd_options.py
index af24938b..dd93f520 100644
--- a/modules/shared_cmd_options.py
+++ b/modules/shared_cmd_options.py
@@ -15,4 +15,4 @@ else:
cmd_opts, _ = parser.parse_known_args()
-cmd_opts.disable_extension_access = (cmd_opts.share or cmd_opts.listen or cmd_opts.server_name) and not cmd_opts.enable_insecure_extension_access
+cmd_opts.disable_extension_access = any([cmd_opts.share, cmd_opts.listen, cmd_opts.ngrok, cmd_opts.server_name]) and not cmd_opts.enable_insecure_extension_access
diff --git a/modules/sysinfo.py b/modules/sysinfo.py
index 058e66ce..2db7551d 100644
--- a/modules/sysinfo.py
+++ b/modules/sysinfo.py
@@ -82,7 +82,7 @@ def get_dict():
"Data path": paths_internal.data_path,
"Extensions dir": paths_internal.extensions_dir,
"Checksum": checksum_token,
- "Commandline": sys.argv,
+ "Commandline": get_argv(),
"Torch env info": get_torch_sysinfo(),
"Exceptions": get_exceptions(),
"CPU": {
@@ -123,6 +123,22 @@ def get_environment():
return {k: os.environ[k] for k in sorted(os.environ) if k in environment_whitelist}
+def get_argv():
+ res = []
+
+ for v in sys.argv:
+ if shared.cmd_opts.gradio_auth and shared.cmd_opts.gradio_auth == v:
+ res.append("<hidden>")
+ continue
+
+ if shared.cmd_opts.api_auth and shared.cmd_opts.api_auth == v:
+ res.append("<hidden>")
+ continue
+
+ res.append(v)
+
+ return res
+
re_newline = re.compile(r"\r*\n")
diff --git a/webui.py b/webui.py
index 5c827dae..12328423 100644
--- a/webui.py
+++ b/webui.py
@@ -74,7 +74,7 @@ def webui():
if shared.opts.auto_launch_browser == "Remote" or cmd_opts.autolaunch:
auto_launch_browser = True
elif shared.opts.auto_launch_browser == "Local":
- auto_launch_browser = not any([cmd_opts.listen, cmd_opts.share, cmd_opts.ngrok])
+ auto_launch_browser = not any([cmd_opts.listen, cmd_opts.share, cmd_opts.ngrok, cmd_opts.server_name])
app, local_url, share_url = shared.demo.launch(
share=cmd_opts.share,