cmdbox 0.6.1.1__py3-none-any.whl → 0.6.2__py3-none-any.whl

cmdbox/extensions/sample_project/sample/app/features/cli/sample_server_time.py

@@ -36,33 +36,33 @@ class ServerTime(feature.Feature):
         """
         return dict(
             type=Options.T_STR, default=None, required=False, multi=False, hide=False, use_redis=self.USE_REDIS_FALSE,
-            discription_ja="サーバー側の現在時刻を表示します。",
-            discription_en="Displays the current time at the server side.",
+            description_ja="サーバー側の現在時刻を表示します。",
+            description_en="Displays the current time at the server side.",
             choice=[
                 dict(opt="host", type=Options.T_STR, default=self.default_host, required=True, multi=False, hide=True, choice=None,
-                        discription_ja="Redisサーバーのサービスホストを指定します。",
-                        discription_en="Specify the service host of the Redis server."),
+                        description_ja="Redisサーバーのサービスホストを指定します。",
+                        description_en="Specify the service host of the Redis server."),
                 dict(opt="port", type=Options.T_INT, default=self.default_port, required=True, multi=False, hide=True, choice=None,
-                        discription_ja="Redisサーバーのサービスポートを指定します。",
-                        discription_en="Specify the service port of the Redis server."),
+                        description_ja="Redisサーバーのサービスポートを指定します。",
+                        description_en="Specify the service port of the Redis server."),
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None,
-                        discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
-                        discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
+                        description_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
+                        description_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
                 dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None,
-                        discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
-                        discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
+                        description_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
+                        description_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="timedelta", type=Options.T_INT, default=9, required=False, multi=False, hide=False, choice=None,
-                        discription_ja="時差の時間数を指定します。",
-                        discription_en="Specify the number of hours of time difference."),
+                        description_ja="時差の時間数を指定します。",
+                        description_en="Specify the number of hours of time difference."),
                 dict(opt="retry_count", type=Options.T_INT, default=3, required=False, multi=False, hide=True, choice=None,
-                        discription_ja="Redisサーバーへの再接続回数を指定します。0以下を指定すると永遠に再接続を行います。",
-                        discription_en="Specifies the number of reconnections to the Redis server.If less than 0 is specified, reconnection is forever."),
+                        description_ja="Redisサーバーへの再接続回数を指定します。0以下を指定すると永遠に再接続を行います。",
+                        description_en="Specifies the number of reconnections to the Redis server.If less than 0 is specified, reconnection is forever."),
                 dict(opt="retry_interval", type=Options.T_INT, default=5, required=False, multi=False, hide=True, choice=None,
-                        discription_ja="Redisサーバーに再接続までの秒数を指定します。",
-                        discription_en="Specifies the number of seconds before reconnecting to the Redis server."),
+                        description_ja="Redisサーバーに再接続までの秒数を指定します。",
+                        description_en="Specifies the number of seconds before reconnecting to the Redis server."),
                 dict(opt="timeout", type=Options.T_INT, default="15", required=False, multi=False, hide=True, choice=None,
-                        discription_ja="サーバーの応答が返ってくるまでの最大待ち時間を指定。",
-                        discription_en="Specify the maximum waiting time until the server responds."),
+                        description_ja="サーバーの応答が返ってくるまでの最大待ち時間を指定。",
+                        description_en="Specify the maximum waiting time until the server responds."),
             ])
 
     def get_svcmd(self):

cmdbox/extensions/sample_project/sample/extensions/user_list.yml

@@ -49,6 +49,10 @@ cmdrule:                       # A list of command rules, Specify a rule that de
     mode: server
     cmds: [list]
     rule: allow
+  - groups: [user]
+    mode: cmd
+    cmds: [list, load]
+    rule: allow
   - groups: [user, guest]
     mode: audit
     cmds: [write]

cmdbox/extensions/user_list.yml

@@ -49,6 +49,10 @@ cmdrule:                       # A list of command rules, Specify a rule that de
     mode: server
     cmds: [list]
     rule: allow
+  - groups: [user]
+    mode: cmd
+    cmds: [list, load]
+    rule: allow
   - groups: [user, guest]
     mode: audit
     cmds: [write]

cmdbox/licenses/LICENSE_dnspython_2_7_0_ISC_License-ISCL.txt

@@ -0,0 +1,35 @@
+ISC License
+
+Copyright (C) Dnspython Contributors
+
+Permission to use, copy, modify, and/or distribute this software for
+any purpose with or without fee is hereby granted, provided that the
+above copyright notice and this permission notice appear in all
+copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+
+Copyright (C) 2001-2017 Nominum, Inc.
+Copyright (C) Google Inc.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose with or without fee is hereby granted,
+provided that the above copyright notice and this permission notice
+appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

cmdbox/licenses/LICENSE_email_validator_2_2_0_The_Unlicense-Unlicense.txt

@@ -0,0 +1,27 @@
+This is free and unencumbered software released into the public
+domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a
+compiled binary, for any purpose, commercial or non-commercial,
+and by any means.
+
+In jurisdictions that recognize copyright laws, the author or
+authors of this software dedicate any and all copyright
+interest in the software to the public domain. We make this
+dedication for the benefit of the public at large and to the
+detriment of our heirs and successors. We intend this
+dedication to be an overt act of relinquishment in perpetuity
+of all present and future rights to this software under
+copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+For more information, please refer to <https://unlicense.org/>

cmdbox/licenses/files.txt

@@ -27,11 +27,13 @@ The cloudpickle developer team	BSD License	cloudpickle	https://github.com/cloudp
 Jonathan Hartley <tartley@tartley.com>	BSD License	colorama	https://github.com/tartley/colorama	0.4.6	cmdbox\licenses\LICENSE_colorama_0_4_6_BSD_License.txt
 The cryptography developers <cryptography-dev@python.org>	Apache-2.0 OR BSD-3-Clause	cryptography	https://github.com/pyca/cryptography	45.0.4	cmdbox\licenses\LICENSE_cryptography_45_0_4_Apache-2_0_OR_BSD-3-Clause.txt
 Nir Cohen	Apache Software License	distro	https://github.com/python-distro/distro	1.9.0	cmdbox\licenses\LICENSE_distro_1_9_0_Apache_Software_License.txt
+Bob Halley <halley@dnspython.org>	ISC License (ISCL)	dnspython	https://www.dnspython.org	2.7.0	cmdbox\licenses\LICENSE_dnspython_2_7_0_ISC_License-ISCL.txt
 Marcin Kurczewski	MIT License	docstring_parser	https://github.com/rr-/docstring_parser	0.16	cmdbox\licenses\LICENSE_docstring_parser_0_16_MIT_License.txt
 David Goodger <goodger@python.org>	BSD License; GNU General Public License (GPL); Public Domain; Python Software Foundation License	docutils	https://docutils.sourceforge.io	0.21.2	cmdbox\licenses\LICENSE_docutils_0_21_2_BSD_License-GNU_General_Public_License-GPL-Public_Domain-Python_Software_Foundation_License.txt
+Joshua Tauberer	The Unlicense (Unlicense)	email_validator	https://github.com/JoshData/python-email-validator	2.2.0	cmdbox\licenses\LICENSE_email_validator_2_2_0_The_Unlicense-Unlicense.txt
 Alex Grönholm <alex.gronholm@nextday.fi>	MIT License	exceptiongroup	https://github.com/agronholm/exceptiongroup/blob/main/CHANGES.rst	1.3.0	cmdbox\licenses\LICENSE_exceptiongroup_1_3_0_MIT_License.txt
 =?utf-8?q?Sebasti=C3=A1n_Ram=C3=ADrez?= <tiangolo@gmail.com>	MIT License	fastapi	https://github.com/fastapi/fastapi	0.115.14	cmdbox\licenses\LICENSE_fastapi_0_115_14_MIT_License.txt
-Jeremiah Lowin	Apache Software License	fastmcp	https://gofastmcp.com	2.9.2	cmdbox\licenses\LICENSE_fastmcp_2_9_2_Apache_Software_License.txt
+Jeremiah Lowin	Apache Software License	fastmcp	https://gofastmcp.com	2.10.1	cmdbox\licenses\LICENSE_fastmcp_2_10_1_Apache_Software_License.txt
 UNKNOWN	The Unlicense (Unlicense)	filelock	https://github.com/tox-dev/py-filelock	3.18.0	cmdbox\licenses\LICENSE_filelock_3_18_0_The_Unlicense-Unlicense.txt
 UNKNOWN	Apache-2.0	frozenlist	https://github.com/aio-libs/frozenlist	1.7.0	cmdbox\licenses\LICENSE_frozenlist_1_7_0_Apache-2_0.txt
 UNKNOWN	BSD License	fsspec	https://github.com/fsspec/filesystem_spec	2025.5.1	cmdbox\licenses\LICENSE_fsspec_2025_5_1_BSD_License.txt
@@ -83,7 +85,7 @@ Julian Berman <Julian+jsonschema-specifications@GrayVines.com>	UNKNOWN	jsonschem
 Kang Zhang <jobo.zh@gmail.com>	MIT License	keyring	https://github.com/jaraco/keyring	25.6.0	cmdbox\licenses\LICENSE_keyring_25_6_0_MIT_License.txt
 BerriAI	MIT License	litellm	https://litellm.ai	1.73.6	cmdbox\licenses\LICENSE_litellm_1_73_6_MIT_License.txt
 Chris Sewell <chrisj_sewell@hotmail.com>	MIT License	markdown-it-py	https://github.com/executablebooks/markdown-it-py	3.0.0	cmdbox\licenses\LICENSE_markdown-it-py_3_0_0_MIT_License.txt
-Anthropic, PBC.	MIT License	mcp	https://modelcontextprotocol.io	1.9.4	cmdbox\licenses\LICENSE_mcp_1_9_4_MIT_License.txt
+Anthropic, PBC.	MIT License	mcp	https://modelcontextprotocol.io	1.10.1	cmdbox\licenses\LICENSE_mcp_1_10_1_MIT_License.txt
 Taneli Hukkinen <hukkin@users.noreply.github.com>	MIT License	mdurl	https://github.com/executablebooks/mdurl	0.1.2	cmdbox\licenses\LICENSE_mdurl_0_1_2_MIT_License.txt
 Erik Rose <erikrose@grinchcentral.com>	MIT License	more-itertools	https://github.com/more-itertools/more-itertools	10.7.0	cmdbox\licenses\LICENSE_more-itertools_10_7_0_MIT_License.txt
 Andrew Svetlov	Apache License 2.0	multidict	https://github.com/aio-libs/multidict	6.6.2	cmdbox\licenses\LICENSE_multidict_6_6_2_Apache_License_2_0.txt

cmdbox/version.py

@@ -1,9 +1,9 @@
 import datetime
 
-dt_now = datetime.datetime(2025, 7, 4)
+dt_now = datetime.datetime(2025, 7, 8)
 __appid__ = 'cmdbox'
 __title__ = 'cmdbox (Command Development Application)'
-__version__ = '0.6.1.1'
+__version__ = '0.6.2'
 __copyright__ = f'Copyright © 2023-{dt_now.strftime("%Y")} hamacom2004jp'
 __pypiurl__ = 'https://pypi.org/project/cmdbox/'
 __srcurl__ = 'https://github.com/hamacom2004jp/cmdbox'

cmdbox/web/agent.html

@@ -168,12 +168,12 @@
                     </h5>
                     <button type="button" class="btn btn_window_stack">
                         <svg width="16" height="16" fill="currentColor" class="bi bi-window-stack">
-                            <use href="#svg_window_stack"></use>
+                            <use href="#btn_window_stack"></use>
                         </svg>
                     </button>
                     <button type="button" class="btn btn_window">
                         <svg width="16" height="16" fill="currentColor" class="bi bi-window">
-                            <use href="#svg_window"></use>
+                            <use href="#btn_window"></use>
                         </svg>
                     </button>
                     <button type="button" class="btn btn_close p-0 m-0" data-bs-dismiss="modal" aria-label="Close" style="margin-left: 0px;">

cmdbox/web/assets/cmdbox/audit.js

@@ -168,34 +168,34 @@ audit.metrics_modal_func = (title) => {
         const rows = [
             {opt:'title', type:'str', default:title?title:'', required:true, multi:false, hide:false, choice:null},
             {opt:'chart_type', type:'str', default:data['chart_type']?data['chart_type']:'line', required:true, multi:false, hide:false, choice:chart_type,
-                discription_en: 'Specifies the type of graph.',
-                discription_ja: 'グラフのタイプを指定します。',
+                description_en: 'Specifies the type of graph.',
+                description_ja: 'グラフのタイプを指定します。',
                 choice_show: {
                     'line':['stroke_curve','stroke_width'],
                     'area':['stroke_curve','chart_stacked','stroke_width'],
                     'bar':['chart_stacked']}},
             {opt:'stroke_curve', type:'str', default:data['stroke_curve']?data['stroke_curve']:'straight', required:false, multi:false, hide:false, choice:stroke_curve,
-                discription_en: 'Specifies the type of line.',
-                discription_ja: '線のタイプを指定します。'},
+                description_en: 'Specifies the type of line.',
+                description_ja: '線のタイプを指定します。'},
             {opt:'chart_stacked', type:'bool', default:data['chart_stacked']?data['chart_stacked']:false, required:false, multi:false, hide:false, choice:[false, true],
-                discription_en: 'Specifies whether to stack the graph.',
-                discription_ja: 'グラフを積み上げるかどうかを指定します。'},
+                description_en: 'Specifies whether to stack the graph.',
+                description_ja: 'グラフを積み上げるかどうかを指定します。'},
             {opt:'stroke_width', type:'int', default:data['stroke_width']?data['stroke_width']:2, required:false, multi:false, hide:false, choice:[...Array(5).keys()].map(i => i+1),
-                discription_en: 'Specifies the width of the line.',
-                discription_ja: '線の幅を指定します。'},
+                description_en: 'Specifies the width of the line.',
+                description_ja: '線の幅を指定します。'},
             {opt:'col_size', type:'int', default:data['col_size']?data['col_size']:6, required:true, multi:false, hide:false, choice:[...Array(12).keys()].map(i => i+1),
-                discription_en: 'Specifies the size of the graph display width.',
-                discription_ja: 'グラフの表示幅のサイズを指定します。'},
+                description_en: 'Specifies the size of the graph display width.',
+                description_ja: 'グラフの表示幅のサイズを指定します。'},
             {opt:'horizontal', type:'str', default:data['horizontal']?data['horizontal']:'clmsg_date', required:true, multi:false, hide:false, choice:axis,
-                discription_en: 'Specify the items to be displayed on the horizontal axis.',
-                discription_ja: '横軸の表示項目を指定します。',
+                description_en: 'Specify the items to be displayed on the horizontal axis.',
+                description_ja: '横軸の表示項目を指定します。',
                 choice_show: {
                     'clmsg_date':['horizontal_date_format'],
                     'svmsg_date':['horizontal_date_format']}},
             {opt:'horizontal_date_format', type:'str', default:data['horizontal_date_format']?data['horizontal_date_format']:'%Y/%m/%d',
                 required:false, multi:false, hide:false, choice:['','%Y/%m/%d %H:%M', '%Y/%m/%d %H', '%Y/%m/%d', '%Y/%m', '%Y', '%m', '%w'],
-                discription_en: 'Specify the date format to be displayed on the horizontal axis.',
-                discription_ja: '横軸の表示日付フォーマットを指定します。'},
+                description_en: 'Specify the date format to be displayed on the horizontal axis.',
+                description_ja: '横軸の表示日付フォーマットを指定します。'},
         ];
         data['vertical'] = data['vertical'] || {'clmsg_id':'count'};
         Object.keys(data['vertical']).forEach((key) => {

cmdbox/web/assets/cmdbox/common.js

@@ -92,6 +92,20 @@ cmdbox.message = (res) => {
     alert(msg.replace(/\\n/g, '\n'));
     cmdbox.hide_loading();
 };
+/**
+ * コンテキストパスを取得
+ * @returns {string} - コンテキストパス
+ */
+cmdbox.ctx_path = () => {
+    const cur_path = window.location.pathname;
+    if (cur_path.indexOf('dosignin') >= 0) {
+        return cur_path.slice(0, cur_path.indexOf('dosignin'));
+    }
+    else if (cur_path.indexOf('signin') >= 0) {
+        return cur_path.slice(0, cur_path.indexOf('signin'));
+    }
+    return '';
+}
 /**
  * コピーライト表示
  */
@@ -105,7 +119,7 @@ cmdbox.copyright = async () => {
  * @param {string} sel - セレクタ
  */
 cmdbox.appid = async (sel) => {
-    const res = await fetch('gui/appid', {method: 'GET'});
+    const res = await fetch(`${cmdbox.ctx_path()}gui/appid`, {method: 'GET'});
     if (res.status != 200) cmdbox.message({'error':`${res.status}: ${res.statusText}`});
     const appid = await res.text()
     $(sel).text(appid);
@@ -136,7 +150,7 @@ cmdbox.set_logoicon = async (sel) => {
 cmdbox.singout = (sitepath) => {
     if (confirm('Sign out ok ?')) {
         const rand = cmdbox.random_string(8);
-        location.href = `../dosignout/${sitepath}?r=${rand}`;
+        location.href = `dosignout/${sitepath}?r=${rand}`;
     }
 };
 cmdbox.editapikey = async () => {
@@ -414,7 +428,7 @@ $(()=>{
     if (window.location.search) {
         const params = new URLSearchParams(window.location.search);
         if (params.has('error') || params.has('warn')) {
-            const elem = $(`<div class="alert alert-warning alert-dismissible d-block" role="alert">`).css('z-index', '10000');
+            const elem = $(`<div class="alert alert-warning alert-dismissible d-block position-absolute start-50 translate-middle-x" role="alert">`).css('z-index', '10000');
             const msgelem = $('<div>Sign in faild: The ID or PW is incorrect or the user is not authorized.</div>').appendTo(elem);
             if (params.get('error') == 'noauth') msgelem.text('Sign in faild: No credentials are available. Please sign in.');
             if (params.get('error') == 'expirationofpassword') msgelem.text('Sign in faild: The password has expired.');
@@ -1320,10 +1334,10 @@ cmdbox.add_form_func = (i, cmd_modal, row_content, row, next_elem, lcolsize=12,
             const opt = arr.map(row => {
                 if (row && typeof row === 'object') {
                     key = Object.keys(row)[0];
-                    d = window.navigator.language=='ja'?row[key].discription_ja:row[key].discription_en;
-                    return `<option value="${key}" discription="${d}">${key}</option>`;
+                    d = window.navigator.language=='ja'?row[key].description_ja:row[key].description_en;
+                    return `<option value="${key}" description="${d}">${key}</option>`;
                 }
-                return `<option value="${row}" discription="">${row}</option>`;
+                return `<option value="${row}" description="">${row}</option>`;
             }).join('');
             return opt;
         }
@@ -1426,7 +1440,7 @@ cmdbox.add_form_func = (i, cmd_modal, row_content, row, next_elem, lcolsize=12,
     }
     const title = elem.find('.row_content_template_title');
     title.html('');
-    title.attr('title', window.navigator.language=='ja'?row.discription_ja:row.discription_en)
+    title.attr('title', window.navigator.language=='ja'?row.description_ja:row.description_en)
     if (row.required) {
         title.append('<span class="text-danger" title="required">*</span>');
     }

cmdbox/web/assets/cmdbox/list_cmd.js

@@ -124,10 +124,10 @@ const list_cmd_func_then = () => {
         const opt = arr.map(row => {
             if (typeof row === 'object') {
                 key = Object.keys(row)[0];
-                d = window.navigator.language=='ja'?row[key].discription_ja:row[key].discription_en;
-                return `<option value="${key}" discription="${d}">${key}</option>`;
+                d = window.navigator.language=='ja'?row[key].description_ja:row[key].description_en;
+                return `<option value="${key}" description="${d}">${key}</option>`;
             }
-            return `<option value="${row}" discription="">${row}</option>`;
+            return `<option value="${row}" description="">${row}</option>`;
         }).join('');
         return opt;
     }
@@ -143,7 +143,7 @@ const list_cmd_func_then = () => {
             const py_get_cmds = await get_cmds(mode);
             cmd_modal.find('[name="cmd"]').html(mkopt(py_get_cmds));
             const selected_mode = cmd_modal.find('[name="mode"] option:selected');
-            cmd_modal.find('.mode_label').attr('title', selected_mode.attr('discription'));
+            cmd_modal.find('.mode_label').attr('title', selected_mode.attr('description'));
             const row_content = cmd_modal.find('.row_content');
             row_content.html('');
         }
@@ -158,7 +158,7 @@ const list_cmd_func_then = () => {
             const mode = cmd_modal.find('[name="mode"]').val();
             const cmd = cmd_modal.find('[name="cmd"]').val();
             const selected_cmd = cmd_modal.find('[name="cmd"] option:selected');
-            cmd_modal.find('.cmd_label').attr('title', selected_cmd.attr('discription'));
+            cmd_modal.find('.cmd_label').attr('title', selected_cmd.attr('description'));
             const py_get_cmd_choices = await cmdbox.get_cmd_choices(mode, cmd);
             row_content.html('');
             // 表示オプションを追加

cmdbox/web/assets/cmdbox/signin.js

@@ -20,7 +20,7 @@ $(() => {
     const selecter_password = '.form-signin .form-signin-password';
     const selecter_remember = '.form-signin .form-signin-remember';
     const form_signin = $('.form-signin');
-    form_signin.attr('action', location.pathname.replace('/signin', '/dosignin'));
+    form_signin.attr('action', location.pathname.replace('/signin', '/dosignin').replace('/dosignin/dosignin', '/dosignin'));
     form_signin.off('submit').on('submit', (event) => {
         const remember = $(selecter_remember).prop('checked');
         if (remember) {
@@ -62,19 +62,19 @@ $(() => {
     const btn_saml_azure = $('.btn-saml-azure');
     btn_google.off('click').on('click', async (event) => {
         const path = window.location.pathname.replace('/signin', '');
-        window.location.href = `../oauth2/google${path}?n=${cmdbox.random_string(8)}`;
+        window.location.href = `${ctx_path()}oauth2/google${path}?n=${cmdbox.random_string(8)}`;
     });
     btn_github.off('click').on('click', async (event) => {
         const path = window.location.pathname.replace('/signin', '');
-        window.location.href = `../oauth2/github${path}?n=${cmdbox.random_string(8)}`;
+        window.location.href = `${ctx_path()}oauth2/github${path}?n=${cmdbox.random_string(8)}`;
     });
     btn_azure.off('click').on('click', async (event) => {
         const path = window.location.pathname.replace('/signin', '');
-        window.location.href = `../oauth2/azure${path}?n=${cmdbox.random_string(8)}`;
+        window.location.href = `${ctx_path()}oauth2/azure${path}?n=${cmdbox.random_string(8)}`;
     });
     btn_saml_azure.off('click').on('click', async (event) => {
         const path = window.location.pathname.replace('/signin', '');
-        window.location.href = `../saml/azure${path}?n=${cmdbox.random_string(8)}`;
+        window.location.href = `${ctx_path()}saml/azure${path}?n=${cmdbox.random_string(8)}`;
     });
     oauth2_enabled().then((res) => {
         if (res.google) btn_google.show();
@@ -98,10 +98,20 @@ const bbforce_cmd = async () => {
     return await res.json();
 }
 const oauth2_enabled = async () => {
-    const res = await fetch('../oauth2/enabled', {method: 'GET'});
+    const res = await fetch(`${ctx_path()}oauth2/enabled`, {method: 'GET'});
     return await res.json();
 }
 const saml_enabled = async () => {
-    const res = await fetch('../saml/enabled', {method: 'GET'});
+    const res = await fetch(`${ctx_path()}saml/enabled`, {method: 'GET'});
     return await res.json();
+}
+const ctx_path = () => {
+    const cur_path = window.location.pathname;
+    if (cur_path.indexOf('dosignin') >= 0) {
+        return cur_path.slice(0, cur_path.indexOf('dosignin'));
+    }
+    else if (cur_path.indexOf('signin') >= 0) {
+        return cur_path.slice(0, cur_path.indexOf('signin'));
+    }
+    return '';
 }

cmdbox/web/assets/cmdbox/svgicon.js

@@ -1,4 +1,4 @@
-const init_svgicons = () => {
+init_svgicons = () => {
     const body = document.querySelector('body');
     body.insertAdjacentHTML('afterbegin', `<svg id="svgicons" xmlns="http://www.w3.org/2000/svg" style="display: none;"></svg>`);
     const svgicons = document.getElementById('svgicons');
@@ -9,12 +9,12 @@ const init_svgicons = () => {
             +`<path fill-rule="evenodd" d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm8-7a7 7 0 0 0-5.468 11.37C3.242 11.226 4.805 10 8 10s4.757 1.225 5.468 2.37A7 7 0 0 0 8 1z"/>`
         +`</symbol>`);
     svgicons.insertAdjacentHTML('beforeend',
-        `<symbol id="svg_window_stack" viewBox="0 0 16 16">`
+        `<symbol id="btn_window_stack" viewBox="0 0 16 16">`
             +`<path d="M4.5 6a.5.5 0 1 0 0-1 .5.5 0 0 0 0 1ZM6 6a.5.5 0 1 0 0-1 .5.5 0 0 0 0 1Zm2-.5a.5.5 0 1 1-1 0 .5.5 0 0 1 1 0Z"/>`
             +`<path d="M12 1a2 2 0 0 1 2 2 2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2 2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h10ZM2 12V5a2 2 0 0 1 2-2h9a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1Zm1-4v5a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V8H3Zm12-1V5a1 1 0 0 0-1-1H4a1 1 0 0 0-1 1v2h12Z"/>`
         +`</symbol>`);
     svgicons.insertAdjacentHTML('beforeend',
-        `<symbol id="svg_window" viewBox="0 0 16 16">`
+        `<symbol id="btn_window" viewBox="0 0 16 16">`
             +`<path d="M2.5 4a.5.5 0 1 0 0-1 .5.5 0 0 0 0 1zm2-.5a.5.5 0 1 1-1 0 .5.5 0 0 1 1 0zm1 .5a.5.5 0 1 0 0-1 .5.5 0 0 0 0 1z"/>`
             +`<path d="M2 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H2zm13 2v2H1V3a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1zM2 14a1 1 0 0 1-1-1V6h14v7a1 1 0 0 1-1 1H2z"/>`
         +`</symbol>`);

cmdbox/web/assets/cmdbox/users.js

@@ -94,14 +94,23 @@ users.users_list = async () => {
                 continue;
             }
             if (col == 'apikeys') {
-                const apikeys = user && user[col] && Object.keys(user[col]).length>0 ? user[col] : {'':''};
-                const apikeys_add_func = (apikey,) => {
+                const apikeys = user && user[col] && Object.keys(user[col]).length>0 ? user[col] : {};
+                const apikeys_add_func = (apikeys, apikey,) => {
                     const row = $(modal.find('.row_content_template_str').html()).appendTo(row_content);
-                    row_content.find('.row_content_template_title').removeClass('row_content_template_title').text(col);
+                    row_content.find('.row_content_template_title').removeClass('row_content_template_title').text(`${col}:${apikey}`);
                     const input = row_content.find('.row_content_template_input').removeClass('row_content_template_input');
-                    input.attr('disabled', 'disabled').val(apikey);
+                    input.attr('disabled', 'disabled').val(apikeys[apikey][1]);
+                    const btn_m = $('<button class="btn btn-secondary copy_buton" type="button"></button>').appendTo(input.parent());
+                    btn_m.append('<svg width="16" height="16" fill="currentColor" class="bi bi-copy" viewBox="0 0 16 16"><use href="#btn_copy"></use></svg>');
+                    btn_m.off('click').on('click', (event) => {
+                        navigator.clipboard.writeText(apikeys[apikey][0]).then(() => {
+                            cmdbox.message({'success': 'Key copied to clipboard.'});
+                        }).catch((err) => {
+                            cmdbox.message({'error': `Failed to copy key: ${err}`});
+                        });
+                    });
                 };
-                for (const apikey in apikeys) apikeys_add_func(apikey);
+                for (const apikey in apikeys) apikeys_add_func(apikeys, apikey);
                 continue;
             }
             const row = $(modal.find('.row_content_template_str').html()).appendTo(row_content);

cmdbox/web/audit.html

@@ -108,12 +108,12 @@
                     <h5 class="modal-title">Search Condition</h5>
                     <button type="button" class="btn btn_window_stack">
                         <svg width="16" height="16" fill="currentColor" class="bi bi-window-stack" viewBox="0 0 16 16">
-                            <use href="#svg_window_stack"></use>
+                            <use href="#btn_window_stack"></use>
                         </svg>
                     </button>
                     <button type="button" class="btn btn_window">
                         <svg width="16" height="16" fill="currentColor" class="bi bi-window" viewBox="0 0 16 16">
-                            <use href="#svg_window"></use>
+                            <use href="#btn_window"></use>
                         </svg>
                     </button>
                     <button type="button" class="btn btn_close p-0 m-0" data-bs-dismiss="modal" aria-label="Close" style="margin-left: 0px;">
@@ -146,12 +146,12 @@
                     <h5 class="modal-title"></h5>
                     <button type="button" class="btn btn_window_stack">
                         <svg width="16" height="16" fill="currentColor" class="bi bi-window-stack" viewBox="0 0 16 16">
-                            <use href="#svg_window_stack"></use>
+                            <use href="#btn_window_stack"></use>
                         </svg>
                     </button>
                     <button type="button" class="btn btn_window">
                         <svg width="16" height="16" fill="currentColor" class="bi bi-window" viewBox="0 0 16 16">
-                            <use href="#svg_window"></use>
+                            <use href="#btn_window"></use>
                         </svg>
                     </button>
                     <button type="button" class="btn btn_close p-0 m-0" data-bs-dismiss="modal" aria-label="Close" style="margin-left: 0px;">
@@ -179,12 +179,12 @@
                     </h5>
                     <button type="button" class="btn btn_window_stack">
                         <svg width="16" height="16" fill="currentColor" class="bi bi-window-stack">
-                            <use href="#svg_window_stack"></use>
+                            <use href="#btn_window_stack"></use>
                         </svg>
                     </button>
                     <button type="button" class="btn btn_window">
                         <svg width="16" height="16" fill="currentColor" class="bi bi-window">
-                            <use href="#svg_window"></use>
+                            <use href="#btn_window"></use>
                         </svg>
                     </button>
                     <button type="button" class="btn btn_close p-0 m-0" data-bs-dismiss="modal" aria-label="Close" style="margin-left: 0px;">

cmdbox/web/signin.html

@@ -11,9 +11,12 @@
     <script type="text/javascript">
         const self_name = 'signin';
         var write_script_Tag = (src, type) => {
-            const ctx_path = window.location.pathname;
-            if (ctx_path.indexOf('dosignin') >= 0) {
-                src = `../${ctx_path}`;
+            const cur_path = window.location.pathname;
+            if (cur_path.indexOf('dosignin') >= 0) {
+                src = `${cur_path.slice(0, cur_path.indexOf('dosignin'))}${src}`;
+            }
+            else if (cur_path.indexOf('signin') >= 0) {
+                src = `${cur_path.slice(0, cur_path.indexOf('signin'))}${src}`;
             }
             if (type === 'css') {
                 const link = document.createElement('link');
@@ -31,7 +34,7 @@
     </script>
 </head>
 <body lang="ja" class="overflow-hidden p-2" style="background-color:rgb(33, 37, 41)">
-    <script type="text/javascript">write_script_Tag("../assets/cmdbox/svgicon.js")</script>
+    <script type="text/javascript">write_script_Tag("assets/cmdbox/svgicon.js")</script>
     <div class="dropdown position-fixed bottom-0 end-0 mb-3 me-3 bd-mode-toggle">
         <button class="btn btn-primary py-2 dropdown-toggle d-flex align-items-center" id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" aria-label="Toggle theme (auto)">
             <svg class="bi my-1 theme-icon-active" width="1em" height="1em"><use href="#circle-half"></use></svg>
@@ -144,11 +147,11 @@
     });
 </script>
 <script type="text/javascript">
-    write_script_Tag("../assets/bootstrap/bootstrap.min.5.3.0.css", "css");
-    write_script_Tag("../assets/cmdbox/color_mode.css", "css");
-    write_script_Tag("../assets/bootstrap/bootstrap.bundle.min.5.3.0.js");
-    write_script_Tag("../assets/jquery/jquery.min.3.2.0.js");
-    write_script_Tag("../assets/cmdbox/common.js");
-    write_script_Tag("../assets/cmdbox/signin.js");
+    write_script_Tag("assets/bootstrap/bootstrap.min.5.3.0.css", "css");
+    write_script_Tag("assets/cmdbox/color_mode.css", "css");
+    write_script_Tag("assets/bootstrap/bootstrap.bundle.min.5.3.0.js");
+    write_script_Tag("assets/jquery/jquery.min.3.2.0.js");
+    write_script_Tag("assets/cmdbox/common.js");
+    write_script_Tag("assets/cmdbox/signin.js");
 </script>
 </html>

cmdbox/web/users.html

@@ -118,12 +118,12 @@
                     <h5 class="modal-title"></h5>
                     <button type="button" class="btn btn_window_stack">
                         <svg width="16" height="16" fill="currentColor" class="bi bi-window-stack" viewBox="0 0 16 16">
-                            <use href="#svg_window_stack"></use>
+                            <use href="#btn_window_stack"></use>
                         </svg>
                     </button>
                     <button type="button" class="btn btn_window">
                         <svg width="16" height="16" fill="currentColor" class="bi bi-window" viewBox="0 0 16 16">
-                            <use href="#svg_window"></use>
+                            <use href="#btn_window"></use>
                         </svg>
                     </button>
                     <button type="button" class="btn btn_close p-0 m-0" data-bs-dismiss="modal" aria-label="Close" style="margin-left: 0px;">
@@ -188,12 +188,12 @@
                     </h5>
                     <button type="button" class="btn btn_window_stack">
                         <svg width="16" height="16" fill="currentColor" class="bi bi-window-stack">
-                            <use href="#svg_window_stack"></use>
+                            <use href="#btn_window_stack"></use>
                         </svg>
                     </button>
                     <button type="button" class="btn btn_window">
                         <svg width="16" height="16" fill="currentColor" class="bi bi-window">
-                            <use href="#svg_window"></use>
+                            <use href="#btn_window"></use>
                         </svg>
                     </button>
                     <button type="button" class="btn btn_close p-0 m-0" data-bs-dismiss="modal" aria-label="Close" style="margin-left: 0px;">