cmdbox 0.5.0.6__py3-none-any.whl → 0.5.0.8__py3-none-any.whl

cmdbox/app/commons/loghandler.py

@@ -60,7 +60,8 @@ class Colors:
     BackgroundWhite        = 107
 
     _colorize_suffix = S + str(ResetAll) + E
-    
+
+    product_word = re.compile(r"CMDBOX|IINFER|USOUND|GAIAN|GAIC|WITSHAPE", re.IGNORECASE)
     success_word = re.compile(r"SUCCESS|OK|PASSED|DONE|COMPLETE|START|FINISH|OPEN|CONNECTED|ALLOW|EXEC", re.IGNORECASE)
     warning_word = re.compile(r"WARNING|WARN|CAUTION|NOTICE|STOP|DISCONNECTED|DENY", re.IGNORECASE)
     error_word = re.compile(r"ERROR|ALERT|CRITICAL|FATAL|ABORT|FAILED", re.IGNORECASE)
@@ -72,6 +73,7 @@ def colorize_msg(msg) -> str:
     msg = Colors.success_word.sub(colorize(r"\g<0>", Colors.Green), msg)
     msg = Colors.warning_word.sub(colorize(r"\g<0>", Colors.Yellow), msg)
     msg = Colors.error_word.sub(colorize(r"\g<0>", Colors.Red), msg)
+    msg = Colors.product_word.sub(colorize(r"\g<0>", Colors.LightBlue), msg)
     return msg
 
 level_mapping = {

cmdbox/app/features/web/cmdbox_web_exec_cmd.py

@@ -177,11 +177,11 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
                             output = [dict(warn=f'The captured stdout was discarded because its size was larger than {capture_maxsize} bytes.')]
                 else:
                     output = [dict(warn='capture_stdout is off.')]
-                old_stdout.write(loghandler.colorize_msg(f'EXEC:     {output}\n'[:logsize]))
+                old_stdout.write(loghandler.colorize_msg(f'EXEC:     {output}'[:logsize])+'\n')
             except Exception as e:
                 web.logger.disabled = False # ログ出力を有効にする
                 msg = f'exec_cmd error. {traceback.format_exc()}'
-                old_stdout.write(loghandler.colorize_msg(f'EXEC:     {msg}\n'[:logsize]))
+                old_stdout.write(loghandler.colorize_msg(f'EXEC:     {msg}'[:logsize])+'\n')
                 web.logger.warning(msg)
                 output = [dict(warn=f'<pre>{html.escape(traceback.format_exc())}</pre>')]
             sys.stdout = old_stdout

cmdbox/app/web.py

@@ -1189,11 +1189,17 @@ class Web:
             self.logger.debug(f"web start parameter: guvicorn_timeout={self.guvicorn_timeout}")
 
         app = FastAPI()
+        @app.middleware("http")
+        async def set_context_cookie(req:Request, call_next):
+            res:Response = await call_next(req)
+            res.set_cookie("context_path", self.session_path, path=self.session_path, domain=self.session_domain)
+            return res
+
         mwparam = dict(path=self.session_path, max_age=self.session_timeout, secret_key=common.random_string())
         if self.session_domain is not None:
             mwparam['domain'] = self.session_domain
         if self.session_secure:
-            mwparam['https_only'] = True
+            mwparam['https_only'] = True # セッションハイジャック対策
         app.add_middleware(SessionMiddleware, **mwparam)
         self.init_webfeatures(app)
 

cmdbox/version.py

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

cmdbox/web/assets/cmdbox/common.js

@@ -353,7 +353,7 @@ cmdbox.init_modal_button = () => {
   $('.btn_window').off('click').on('click', () => {
     $('.btn_window_stack').css('margin-left', 'auto').show();
     $('.btn_window').css('margin-left', '0px').hide();
-    $('.btn_window_stack').parents('.modal-dialog').addClass('modal-fullscreen');
+    $('.btn_window_stack').parents('.modal-dialog').css('top', '').css('left', '').addClass('modal-fullscreen');
   });
   $('.btn_window_stack').css('margin-left', '0px').hide();
   $('.btn_window').css('margin-left', 'auto').show();

cmdbox/web/assets/cmdbox/list_cmd.js

@@ -71,6 +71,7 @@ const list_cmd_func_then = () => {
                 const target_name = row.opt;
                 let input_elem, elem;
                 if(!row.choice) {
+                    // 選択肢がない場合
                     if(row.type=='text') {
                         elem = $(cmd_modal.find('.row_content_template_text').html());
                     } else if(row.type=='dict') {
@@ -85,11 +86,16 @@ const list_cmd_func_then = () => {
                     input_elem.val(row.default);
                 }
                 else {
-                    elem = $(cmd_modal.find('.row_content_template_choice').html());
+                    // 選択肢がある場合
+                    if(row.type=='dict') {
+                        elem = $(cmd_modal.find('.row_content_template_dict_choice').html());
+                    } else {
+                        elem = $(cmd_modal.find('.row_content_template_choice').html());
+                    }
                     if (next_elem) next_elem.after(elem);
                     else row_content.append(elem);
-                    input_elem = elem.find('.row_content_template_select');
-                    input_elem.removeClass('row_content_template_select');
+                    input_elem = elem.find('.row_content_template_select,.row_content_template_input');
+                    input_elem.removeClass('row_content_template_select').removeClass('row_content_template_input');
                     if (row.choice_show) {
                         input_elem.addClass('choice_show');
                         input_elem.change(() => {
@@ -109,7 +115,7 @@ const list_cmd_func_then = () => {
                         });
                     }
                     input_elem.html(mkopt(row.choice));
-                    input_elem.val(`${row.default}`);
+                    input_elem.val(`${row.default!=null?row.default:''}`);
                 }
                 let index = 0;
                 if (cmd_modal.find(`[name="${target_name}"]`).length > 0) {
@@ -478,6 +484,7 @@ const get_param = (modal_elem) => {
                 $(elem).addClass('is-valid');
             }
         } else if (data_type=='dict') {
+            data_val = data_val ? data_val : '';
             if(data_val.indexOf(' ')>=0) $(elem).addClass('is-invalid');
             else {
                 $(elem).removeClass('is-invalid');

cmdbox/web/assets/cmdbox/view_raw.js

@@ -25,16 +25,15 @@ const view_raw_func = (title, result) => {
                     try {
                         if (found) {
                             const url = URL.parse(val.replace(/curl.+[^(http)](https?:\/\/[\w/:%#\$&\?\(\)~\.=\+\-]+)/, '$1'));
-                            url.host = window.location.host;
                             const curl = val.replace(/^(curl.+[^(http)])(https?:\/\/[\w/:%#\$&\?\(\)~\.=\+\-]+)/, '$1');
                             const td = $(`<td>${curl}</td>`).appendTo(tr);
-                            const ctx_Path_mt = document.cookie.match(/Path=([^;]+)/);
+                            const ctx_Path_mt = document.cookie.match(/context_path="?([^;"]+)"?/);
                             const ctx_Path = ctx_Path_mt && ctx_Path_mt.length>0 ? ctx_Path_mt[1] : '/';
-                            const href = `${url.protocol}//${url.host}${ctx_Path}${url.pathname.replace(new RegExp(`^${ctx_Path}`), '')}`;
+                            const href = `${window.location.protocol}//${window.location.host}${ctx_Path}${url.pathname.replace(new RegExp(`^${ctx_Path}`), '')}`;
                             const anc = $(`<a href="#">${href}</a>`).appendTo(td);
                             anc.off('click').on('click', (e) => {
                                 if (!window.confirm(`May I execute '${title}' ?`)) return;
-                                window.open(url.href, '_blank');
+                                window.open(href, '_blank');
                             });
                             found = false;
                             continue;

cmdbox/web/gui.html

@@ -251,6 +251,17 @@
                             </div>
                         </div>
                     </div>
+                    <div class="row d-none row_content_template_dict_choice">
+                        <div class="col-12 mb-3">
+                            <div class="input-group">
+                                <label class="input-group-text row_content_template_title">title</label>
+                                <input type="text" class="form-control row_content_key row_content_template_input">
+                                <label class="input-group-text">=</label>
+                                <select class="form-select row_content_template_select">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
                     <div class="row d-none row_content_template_choice">
                         <div class="col-6 mb-3">
                             <div class="input-group">

{cmdbox-0.5.0.6.dist-info → cmdbox-0.5.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.5.0.6
+Version: 0.5.0.8
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Home-page: https://github.com/hamacom2004jp/cmdbox
 Author: hamacom2004jp

{cmdbox-0.5.0.6.dist-info → cmdbox-0.5.0.8.dist-info}/RECORD

@@ -6,7 +6,7 @@ cmdbox/logconf_edge.yml,sha256=RkbUebCJV2z5dLnpgvf4GSFkd-Blzu4vUUDP9CQFwdM,686
 cmdbox/logconf_gui.yml,sha256=T3yhWoiyp0DW06RjiFG6kS7jScqXYs-KLfC5EYKUImk,686
 cmdbox/logconf_server.yml,sha256=tpDpKQXgTWzUnHKGU-Vvsha7n1hyIyFdLnSeCgnOgyk,701
 cmdbox/logconf_web.yml,sha256=lzr3ytjqRbQutbhEOJdHJT0hrrR_h9sPkaEQkzX02lo,686
-cmdbox/version.py,sha256=ETvn5dzLvu--SWMntVWrUIFEeMHtYBODU_ljwNHZ3EI,1963
+cmdbox/version.py,sha256=NhSu1Nz84OuNSy4YY1fAowqPGPE0AMF6fGb8MCM1UHw,1963
 cmdbox/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cmdbox/app/app.py,sha256=2rQpTbezCLuy36df89EhKsAfcPjtGepGHSTQZXimcqA,8949
 cmdbox/app/client.py,sha256=SNM4xxDh5ARxV6I7cDrmbzGc7sXUUwB3tSyIksdT1RY,19562
@@ -17,9 +17,9 @@ cmdbox/app/filer.py,sha256=L_DSMTvnbN_ffr3JIt0obbOmVoTHEfVm2cAVz3rLH-Q,16059
 cmdbox/app/options.py,sha256=A4q4dAFAsTaV_k4z7n7hT2Dl6Ei6DrQ7X0xKoVDK6sM,31092
 cmdbox/app/server.py,sha256=rrH_a6zzrx7glp_SqRrc_2gBgRoT9FX0F1bpGxVLX1I,9467
 cmdbox/app/signin.py,sha256=Ry4jxUuroOAIAfTYSolMm_izaF27-IS7914I4vhr6yU,2577
-cmdbox/app/web.py,sha256=6MXgl_lb4MZO8Lq1kZnGNiIZw6d0eO4c9T-izD_XzZY,80017
+cmdbox/app/web.py,sha256=d_lrJi6UWVRbsUGzW_LYdW2VYND1FYSTrh_1bejgrh4,80345
 cmdbox/app/commons/convert.py,sha256=etWeutkPyE8FMz11jw4KJ5uip7qu_CoD1yIqF5iypgg,6754
-cmdbox/app/commons/loghandler.py,sha256=TQXXg8KdAzHMPwSQGq7RP0qTHxb35PhUTqqDFWkimgk,3306
+cmdbox/app/commons/loghandler.py,sha256=HFTlsQEshFaIubCH-AjvXOE0swbYtv77kSy2pwRz_8c,3469
 cmdbox/app/commons/module.py,sha256=RsEyqP9Qty4v0qIEE6VuY4pgMlkhJKNTUhsN5p-sSoM,4880
 cmdbox/app/commons/redis_client.py,sha256=HuCsh3FtoeuRqU--qVy3KmO5sAVkGGrfYpeOf1vlMtw,14203
 cmdbox/app/features/cli/cmdbox_client_file_copy.py,sha256=WqxhkYhoL9uxlvqorkJTTOGaDF3Fl0aEdp0qQu2Efeg,12875
@@ -59,7 +59,7 @@ cmdbox/app/features/web/cmdbox_web_del_cmd.py,sha256=GSFXglQza8OOnVJvL53Jr6KEAjT
 cmdbox/app/features/web/cmdbox_web_del_pipe.py,sha256=rTG4kRQJ6c9x5uScPp3ZwHAQz9p_gyQ1wv0M8geBqBw,1136
 cmdbox/app/features/web/cmdbox_web_do_signin.py,sha256=uVWXDO8OCAMDkJbAKt8b1AMOoH1EKnjV9svEHUSW1II,17147
 cmdbox/app/features/web/cmdbox_web_do_signout.py,sha256=jROCSIDZ2frn3N8EEZkvjS1_IvBXrWVio-Ee1kV0_yw,910
-cmdbox/app/features/web/cmdbox_web_exec_cmd.py,sha256=KiN3L7OrG93notiptmt8B90MgvHcL5pj510iUGv6i4Q,11083
+cmdbox/app/features/web/cmdbox_web_exec_cmd.py,sha256=BwRVD9qYOpEBIj6NvtBH_-Kw9oLB7ZE9qTlfVnVlHE4,11089
 cmdbox/app/features/web/cmdbox_web_exec_pipe.py,sha256=uKWQodWO2Pr3dAJf8t5AmDH91vQZ_urp2y2da382hqA,10537
 cmdbox/app/features/web/cmdbox_web_filer download.py,sha256=7QaOnN9EGPQsyybWmiKH-uVsibbcPOkVGU8ya2Txszs,2283
 cmdbox/app/features/web/cmdbox_web_filer.py,sha256=LtEF0-MupyjysZklsvbBgHEAJaVRRRkP0yW-fWa7tFo,1814
@@ -186,17 +186,17 @@ cmdbox/licenses/LICENSE.zope.interface.7.1.1(Zope Public License).txt,sha256=bHk
 cmdbox/licenses/files.txt,sha256=E_C-9JE8iJeOs-ZY_Lg1B3Brcdqr8G-kJeFnWeSHXUk,14179
 cmdbox/web/assets_license_list.txt,sha256=TcyF-U5C8O-J3Nxfp3pxralGdazTj8BgLwwEBRn59_w,853
 cmdbox/web/filer.html,sha256=NQzwJc1k4IDpK1F99vumLC3BO7x_frO6HJcEzI9c0kw,15254
-cmdbox/web/gui.html,sha256=6qINDpZmTxeJ8uc2AhCc4Vq2lcXjaiOEMNziehrINdM,33923
+cmdbox/web/gui.html,sha256=5RB9iSpiCLEpFIOJZQ52JRpOYEV5OdAjFxT1UcQOEmQ,34635
 cmdbox/web/result.html,sha256=dZcQCLSrhTr7gY50WYCfG2wEWngnV7x9xnYOVl73WSQ,14835
 cmdbox/web/signin.html,sha256=blFKNzpmJane-sUF2Xev5F1645oLoq_fuDMYd0_iziU,10556
 cmdbox/web/users.html,sha256=RHslVrj8FJgV1RI6oMTRuZTu3g7YyXMKKYGeoOzgwG4,19194
 cmdbox/web/assets/bootstrap/bootstrap.bundle.min.5.3.0.js,sha256=qlPVgvl-tZTCpcxYJFdHB_m6mDe84wRr-l81VoYPTgQ,80421
 cmdbox/web/assets/bootstrap/bootstrap.min.5.3.0.css,sha256=fx038NkLY4U1TCrBDiu5FWPEa9eiZu01EiLryshJbCo,232914
-cmdbox/web/assets/cmdbox/common.js,sha256=WuzMCSe4NrVdJP-mXTj2th7kyn_ZWtl3DOxCRoD8Pz8,39418
+cmdbox/web/assets/cmdbox/common.js,sha256=rsegebcs7QtBNi-WEy5-sev-EDIEHV9P-0HZojoAzME,39449
 cmdbox/web/assets/cmdbox/favicon.ico,sha256=2U4MhqzJklRksOQwnK-MZigZCubxCHqKG_AuNJnvYtA,34494
 cmdbox/web/assets/cmdbox/filer_modal.js,sha256=hCEk0UR_bjJp9X9blWfmrbZVxKkmO3GGQ44ukSDuHbg,8522
 cmdbox/web/assets/cmdbox/icon.png,sha256=xdEwDdCS8CoPQk7brW-1mV8FIGYtUeSMBRlY9Oh-3nE,296172
-cmdbox/web/assets/cmdbox/list_cmd.js,sha256=k9vSO046ohr1gTkNfjtv5S6YvcjbFcPQ5DB6BAx_ANg,30154
+cmdbox/web/assets/cmdbox/list_cmd.js,sha256=a_v1ZOzXzAOaVMZKJmAE8s02oo6ccWBvi8uN2cD6EMw,30589
 cmdbox/web/assets/cmdbox/list_pipe.js,sha256=mlzISyZUG90GbE0gxMzWpwZhzhojxqvft2gne6Vajco,11218
 cmdbox/web/assets/cmdbox/main.js,sha256=K-tBnZlCpy__juT_HHKfvHzhNJykAjva7LUBJX45XzM,4997
 cmdbox/web/assets/cmdbox/open_capture.js,sha256=W4IQlOYLN4Y8OaS8Xc5yp-BRlm82TVjujChr3hJKS0M,709
@@ -204,7 +204,7 @@ cmdbox/web/assets/cmdbox/open_output_json.js,sha256=4q7mCdVmSzFudlTlW9MuIJ1-f-kD
 cmdbox/web/assets/cmdbox/result.js,sha256=DHCYMXmuN9UQjwCGJfHE6rmHD0rSwRIxDqPQWHcdl24,3210
 cmdbox/web/assets/cmdbox/signin.js,sha256=x2QOTRVdTwy9bAbOD86ZYBB0yIRAjJZ32vNVQCCyWAA,3680
 cmdbox/web/assets/cmdbox/users.js,sha256=RsmMzLZohbU0u3GsXv7W64691se4TKUrhZxISAocc1I,29215
-cmdbox/web/assets/cmdbox/view_raw.js,sha256=n0jfz_NjfHEt0In3Z3eT9iNMorkoZcdpfnKHz93U2Io,2686
+cmdbox/web/assets/cmdbox/view_raw.js,sha256=pEPGZD10T3vrjnb-uZupPIhUNMJZu8o6DUucjjdDFQk,2657
 cmdbox/web/assets/cmdbox/view_result.js,sha256=FCT7uIxFp6TKXmGldjdQo2-SNkhyRtAAMBQ2qF54HVQ,6954
 cmdbox/web/assets/encodingjs/LICENSE.txt,sha256=mBdECJD6rOMBa4VSrrJFzs67vFDvGuMPVtxvvDbgi9o,1070
 cmdbox/web/assets/encodingjs/encoding.js,sha256=pMUL__JEPZ0hHv1iH1kt-zwfDwJcDzzrD1JpdhEKBy8,297288
@@ -248,9 +248,9 @@ cmdbox/web/assets/tree-menu/image/file.png,sha256=Uw4zYkHyuoZ_kSVkesHAeSeA_g9_LP
 cmdbox/web/assets/tree-menu/image/folder-close.png,sha256=TcgsKTBBF2ejgzekOEDBFBxsJf-Z5u0x9IZVi4GBR-I,284
 cmdbox/web/assets/tree-menu/image/folder-open.png,sha256=DT7y1GRK4oXJkFvqTN_oSGM5ZYARzPvjoCGL6wqkoo0,301
 cmdbox/web/assets/tree-menu/js/tree-menu.js,sha256=-GkZxI7xzHuXXHYQBHAVTcuKX4TtoiMuyIms6Xc3pxk,1029
-cmdbox-0.5.0.6.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
-cmdbox-0.5.0.6.dist-info/METADATA,sha256=EAA5qNNWYw5jC_1PbXoJIivIo07qDq4kvHBq4hUwch4,24050
-cmdbox-0.5.0.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cmdbox-0.5.0.6.dist-info/entry_points.txt,sha256=PIoRz-tr503YwdMmd6nxuSn2dDltf4cUMVs98E9WgaA,48
-cmdbox-0.5.0.6.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
-cmdbox-0.5.0.6.dist-info/RECORD,,
+cmdbox-0.5.0.8.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
+cmdbox-0.5.0.8.dist-info/METADATA,sha256=mNEz-XXmfFzRSjdGTKCEcImtwsBdcd3-Yjln1FdXyzo,24050
+cmdbox-0.5.0.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cmdbox-0.5.0.8.dist-info/entry_points.txt,sha256=PIoRz-tr503YwdMmd6nxuSn2dDltf4cUMVs98E9WgaA,48
+cmdbox-0.5.0.8.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
+cmdbox-0.5.0.8.dist-info/RECORD,,