cmdbox 0.5.0.6__tar.gz → 0.5.0.8__tar.gz

{cmdbox-0.5.0.6/cmdbox.egg-info → cmdbox-0.5.0.8}/PKG-INFO

@@ -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 → cmdbox-0.5.0.8}/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-0.5.0.6 → cmdbox-0.5.0.8}/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-0.5.0.6 → cmdbox-0.5.0.8}/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-0.5.0.6 → cmdbox-0.5.0.8}/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-0.5.0.6 → cmdbox-0.5.0.8}/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-0.5.0.6 → cmdbox-0.5.0.8}/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-0.5.0.6 → cmdbox-0.5.0.8}/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-0.5.0.6 → cmdbox-0.5.0.8}/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 → cmdbox-0.5.0.8/cmdbox.egg-info}/PKG-INFO

@@ -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