diff options
author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-02-19 13:02:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-19 13:02:05 +0300 |
commit | c3d5a6ed37c164c626d938ead9c7f12dc1233804 (patch) | |
tree | 45ca92c95aa7f6e072710ae597dcecea5fd88d7b | |
parent | 11183b4d905d14c6a0164a4d13675b89b1bf4ceb (diff) | |
parent | dc25a31d1a3816a7fb0cd5ef186559b3c085db43 (diff) |
Merge pull request #7300 from Ju1-js/master
Gradio Auth - Read from External File
-rw-r--r-- | modules/shared.py | 1 | ||||
-rw-r--r-- | webui.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/shared.py b/modules/shared.py index e324a48a..2c2edfbd 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -81,6 +81,7 @@ parser.add_argument("--freeze-settings", action='store_true', help="disable edit parser.add_argument("--ui-settings-file", type=str, help="filename to use for ui settings", default=os.path.join(data_path, 'config.json'))
parser.add_argument("--gradio-debug", action='store_true', help="launch gradio with --debug option")
parser.add_argument("--gradio-auth", type=str, help='set gradio authentication like "username:password"; or comma-delimit multiple like "u1:p1,u2:p2,u3:p3"', default=None)
+parser.add_argument("--gradio-auth-path", type=str, help='set gradio authentication file path ex. "/path/to/auth/file" same auth format as --gradio-auth', default=None)
parser.add_argument("--gradio-img2img-tool", type=str, help='does not do anything')
parser.add_argument("--gradio-inpaint-tool", type=str, help="does not do anything")
parser.add_argument("--opt-channelslast", action='store_true', help="change memory type for stable diffusion to channels last")
@@ -214,7 +214,7 @@ def webui(): ssl_keyfile=cmd_opts.tls_keyfile,
ssl_certfile=cmd_opts.tls_certfile,
debug=cmd_opts.gradio_debug,
- auth=[tuple(cred.split(':')) for cred in cmd_opts.gradio_auth.strip('"').split(',')] if cmd_opts.gradio_auth else None,
+ auth=[tuple(cred.split(':')) for cred in (cmd_opts.gradio_auth.strip('"').replace('\n','').split(',') + (open(cmd_opts.gradio_auth_path, 'r').read().strip().replace('\n','').split(',') if cmd_opts.gradio_auth_path and os.path.exists(cmd_opts.gradio_auth_path) else None))] if cmd_opts.gradio_auth or (cmd_opts.gradio_auth_path and os.path.exists(cmd_opts.gradio_auth_path)) else None,
inbrowser=cmd_opts.autolaunch,
prevent_thread_lock=True
)
|