cmdbox 0.5.3__py3-none-any.whl → 0.5.4__py3-none-any.whl

cmdbox/web/assets/cmdbox/audit.js

@@ -1,20 +1,35 @@
 const audit = {};
 // 監査ログ一覧
 audit.rawlog = async () => {
-    const form = $('#filter_form');
+    const modal = $('#search_modal');
     const rawlog_area = $('#rawlog_area').html('');
-    const [title, opt] = cmdbox.get_param(form);
+    const [title, opt] = cmdbox.get_param(modal);
     cmdbox.show_loading();
     const data = await audit.query(opt);
     if (!data) {
         cmdbox.hide_loading();
+        modal.modal('hide');
         return;
     }
-    render_result_func(rawlog_area, data, 100);
-    audit.tracelog(data);
+    audit.tracelog(JSON.parse(JSON.stringify(data)));
+    data.forEach((row) => {
+        if (row['clmsg_id']) {
+            row['clmsg_id'] = `<a href="#" data-id="${row['clmsg_id']}" onclick="audit.clmsg_id_click_func(this);">${row['clmsg_id']}</a>`;
+        }
+    });
+    render_result_func(rawlog_area, data, 110);
     await audit.metrics();
+    modal.modal('hide');
     cmdbox.hide_loading();
 };
+// 監査ログのclmsg_idをクリックしたときの処理
+audit.clmsg_id_click_func = (elem) => {
+    const clmsg_id = $(elem).attr('data-id');
+    const area = $(`#trace_area`);
+    const trace_tab = document.querySelector('#main_tabs #trace-tab')
+    bootstrap.Tab.getOrCreateInstance(trace_tab).show()
+    area.animate({scrollTop: $(`#${clmsg_id}`).offset().top - area.offset().top + area.scrollTop()}, 500);
+};
 // 監査ログのトレース
 audit.tracelog = async (data) => {
     const rawlog_area = $('#trace_area').html('');
@@ -45,7 +60,7 @@ audit.tracelog = async (data) => {
     }).forEach((attr, i) => {
         const tr = $('<tr></tr>').appendTo(table_body);
         $(`<td>${attr['clmsg_user']}</td>`).appendTo(tr);
-        const div = $(`<td><span>clmsg_id : ${attr['clmsg_id']}</span><div/></td>`).appendTo(tr).find('div');
+        const div = $(`<td><span id="${attr['clmsg_id']}">clmsg_id : ${attr['clmsg_id']}</span><div/></td>`).appendTo(tr).find('div');
         render_result_func(div, attr['row'], 100);
     });
 };
@@ -54,13 +69,13 @@ audit.query = async (opt) => {
     const res = await fetch(`audit/rawlog`,
         {method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(opt)});
     if (res.status != 200) {
-        cmdbox.message({'error':`${res.status}: ${res.statusText}`});
+        cmdbox.message(`${res.status}: ${res.statusText}`);
         return;
     }
     try {
         const content = JSON.parse(await res.text());
         if (!content['success']) {
-            cmdbox.message({'error': content});
+            cmdbox.message(content);
             return;
         }
         return content['success']['data'];
@@ -76,16 +91,20 @@ audit.metrics = async () => {
     audit.list_audit_metrics().then((res) => {
         if (!res['success']) return;
         res['success'].forEach(async (row) => {
-            const form = $('#filter_form');
-            const [_, opt] = cmdbox.get_param(form);
+            const modal = $('#search_modal');
+            const [_, opt] = cmdbox.get_param(modal);
             opt['select'] = row['vertical'];
             opt['select'][row['horizontal']] = '-';
             opt['select_date_format'] = row['horizontal_date_format'];
             opt['groupby'] = [row['horizontal']];
             opt['groupby_date_format'] = row['horizontal_date_format'];
             opt['sort'][row['horizontal']] = 'DESC';
+            Object.keys(row).forEach((key) => {
+                if (!key.startsWith('filter_')) return;
+                opt[key] = row[key];
+            });
             let data = await audit.query(opt);
-            if (!data) return;
+            if (!data) data = [];
             data = data.reverse();
             // 時系列グラフの追加
             const card = $(`<div class="col-${row['col_size']} p-1"><div class="card card-hover"><div class="card-body"></div></div></div>`).appendTo(metrics_area);
@@ -141,7 +160,7 @@ audit.metrics_modal_func = (title) => {
     modal.find('.modal-title').text(title ? `Edit Metrics : ${title}` : 'New Metrics');
     const row_content = modal.find('.row_content');
     row_content.empty();
-    audit.load_audit_metrics(title?title:null).then((res) => {
+    audit.load_audit_metrics(title?title:null).then(async (res) => {
         const axis = ['','audit_type', 'clmsg_id', 'clmsg_date', 'clmsg_src', 'clmsg_title', 'clmsg_user', 'clmsg_body', 'clmsg_tag', 'svmsg_id', 'svmsg_date'];
         const chart_type = ['','line', 'area', 'bar'];
         const stroke_curve = ['','smooth', 'straight', 'stepline'];
@@ -149,27 +168,69 @@ 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: 'グラフのタイプを指定します。',
                 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},
-            {opt:'chart_stacked', type:'bool', default:data['chart_stacked']?data['chart_stacked']:false, required:false, multi:false, hide:false, choice:[false, true]},
-            {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)},
-            {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)},
-            {opt:'horizontal', type:'str', default:data['horizontal']?data['horizontal']:'svmsg_date', required:true, multi:false, hide:false, choice:axis,
+            {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: '線のタイプを指定します。'},
+            {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: 'グラフを積み上げるかどうかを指定します。'},
+            {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: '線の幅を指定します。'},
+            {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: 'グラフの表示幅のサイズを指定します。'},
+            {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: '横軸の表示項目を指定します。',
                 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']},
+                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: '横軸の表示日付フォーマットを指定します。'},
         ];
         data['vertical'] = data['vertical'] || {'clmsg_id':'count'};
         Object.keys(data['vertical']).forEach((key) => {
             const def = {};
             def[key] = data['vertical'][key];
             rows.push({opt:'vertical', type:'dict', default:def, required:true, multi:true, hide:false,
-                choice:{'key':axis,'val':['-','count','sum','avg','min','max']}});
+                choice:{key:axis, val:['-','count','sum','avg','min','max']}});
+        });
+        const base_rows = await cmdbox.get_cmd_choices('audit', 'search');
+        base_rows.filter(row => row['opt'].startsWith('filter')).forEach((row) => {
+            row['hide'] = true;
+            if (data[row['opt']]) {
+                const val = data[row['opt']];
+                if (Array.isArray(val) && val.length > 0) {
+                    val.forEach((v) => {
+                        if (!v || v=='') return;
+                        r = {...row};
+                        r['default'] = v;
+                        rows.push(r);
+                    });
+                }
+                else if (typeof val=='object') {
+                    Object.keys(val).forEach((k) => {
+                        if (!k || k=='') return;
+                        if (!val[k] || val[k]=='') return;
+                        r = {...row};
+                        r['default'][k] = val[k];
+                        rows.push(r);
+                    });
+                }
+                else {
+                    row['default'] = val;
+                }
+            }
+            rows.push(row);
         });
         rows.forEach((row, i) => cmdbox.add_form_func(i, modal, row_content, row, null, 12, 6));
         title && modal.find('[name="title"]').prop('readonly', true);
@@ -179,23 +240,23 @@ audit.metrics_modal_func = (title) => {
     modal.find('#metrics_save').off('click').on('click', async () => {
         const [title, opt] = cmdbox.get_param(modal);
         if (!title || title == '') {
-            cmdbox.message({'error': 'Title is required'});
+            cmdbox.message({'warn': 'Title is required'});
             return;
         }
         if (!opt['chart_type'] || opt['chart_type'] == '') {
-            cmdbox.message({'error': 'chart_type is required'});
+            cmdbox.message({'warn': 'chart_type is required'});
             return;
         }
         if (!opt['col_size'] || opt['col_size'] == '') {
-            cmdbox.message({'error': 'col_size is required'});
+            cmdbox.message({'warn': 'col_size is required'});
             return;
         }
         if (!opt['horizontal'] || opt['horizontal'] == '') {
-            cmdbox.message({'error': 'horizontal is required'});
+            cmdbox.message({'warn': 'horizontal is required'});
             return;
         }
         if (!opt['vertical'] || opt['vertical'] == '') {
-            cmdbox.message({'error': 'vertical is required'});
+            cmdbox.message({'warn': 'vertical is required'});
             return;
         }
         if (!window.confirm('Do you want to save?')) return;
@@ -217,22 +278,21 @@ audit.metrics_modal_func = (title) => {
 // 監査ログのフィルターフォームの初期化
 audit.init_form = async () => {
     // フォームの初期化
-    const form = $('#filter_form');
-    const row_content = form.find('.row_content');
+    const modal = $('#search_modal');
+    const row_content = modal.find('.row_content');
     const res = await fetch('audit/mode_cmd', {method: 'GET'});
-    if (res.status != 200) cmdbox.message({'error':`${res.status}: ${res.statusText}`});
+    if (res.status != 200) cmdbox.message(`${res.status}: ${res.statusText}`);
     const msg = await res.json();
     if (!msg['success']) {
-        cmdbox.message({'error': msg['message']});
+        cmdbox.message(msg);
         return;
     }
     const args = msg['success'];
     const py_get_cmd_choices = await cmdbox.get_cmd_choices(args['mode'], args['cmd']);
     row_content.html('');
     // 検索ボタンを表示
-    const search_btn = $('<button type="button" class="btn btn-primary col-11 m-3">Search</button>').appendTo(row_content);
-    search_btn.off('click').on('click', (e) => {
-        audit.rawlog();
+    $('#do_search').off('click').on('click', async (e) => {
+        await audit.rawlog();
         const condition = {};
         row_content.find(':input').each((i, el) => {
             const elem = $(el);
@@ -250,14 +310,14 @@ audit.init_form = async () => {
     // 主なフィルター条件のフォームを表示
     const nml_conditions = ['filter_audit_type', 'filter_clmsg_id', 'filter_clmsg_src', 'filter_clmsg_title', 'filter_clmsg_title', 'filter_clmsg_user',
                         'filter_clmsg_tag', 'filter_svmsg_sdate', 'filter_svmsg_edate']
-    py_get_cmd_choices.filter(row => nml_conditions.includes(row.opt)).forEach((row, i) => cmdbox.add_form_func(i, form, row_content, row, null, 12, 12));
+    py_get_cmd_choices.filter(row => nml_conditions.includes(row.opt)).forEach((row, i) => cmdbox.add_form_func(i, modal, row_content, row, null, 12, 6));
     const adv_link = $('<div class="text-center card-hover col-12 mb-3"><a href="#">[ advanced options ]</a></div>').appendTo(row_content);
     adv_link.off('click').on('click', (e) => {row_content.find('.adv').toggle();});
     // 高度なフィルター条件のフォームを表示
     const adv_conditions = ['filter_clmsg_body', 'filter_clmsg_sdate', 'filter_svmsg_edate',
                             'filter_svmsg_id', 'sort', 'offset', 'limit'];
     const adv_row_content = $('<div class="row_content"></div>').appendTo(row_content);
-    py_get_cmd_choices.filter(row => adv_conditions.includes(row.opt)).forEach((row, i) => cmdbox.add_form_func(i, form, adv_row_content, row, null, 12, 12));
+    py_get_cmd_choices.filter(row => adv_conditions.includes(row.opt)).forEach((row, i) => cmdbox.add_form_func(i, modal, adv_row_content, row, null, 12, 12));
     adv_row_content.children().each((i, elem) => {$(elem).addClass('adv').hide();}).appendTo(row_content);
     adv_row_content.remove();
     let condition = await cmdbox.load_user_data('audit', 'condition');
@@ -284,6 +344,12 @@ audit.init_form = async () => {
         if (!val || val == '') return
         $(elem).val(val);
     });
+    $('#search_rawlog').off('click').on('click', (e) => {
+        modal.modal('show');
+    });
+    $('#search_trace').off('click').on('click', (e) => {
+        modal.modal('show');
+    });
 };
 audit.list_audit_metrics = async () => {
     const formData = new FormData();
@@ -335,6 +401,4 @@ $(() => {
             audit.metrics_modal_func();
         });
     });
-    // スプリッター初期化
-    $('.split-pane').splitPane();
 });

cmdbox/web/assets/cmdbox/signin.js

@@ -59,6 +59,7 @@ $(() => {
     const btn_google = $('.btn-google');
     const btn_github = $('.btn-github');
     const btn_azure = $('.btn-azure');
+    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.randam_string(8)}`;
@@ -71,6 +72,10 @@ $(() => {
         const path = window.location.pathname.replace('/signin', '');
         window.location.href = `../oauth2/azure${path}?n=${cmdbox.randam_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.randam_string(8)}`;
+    });
     oauth2_enabled().then((res) => {
         if (res.google) btn_google.show();
         else btn_google.hide();
@@ -79,6 +84,10 @@ $(() => {
         if (res.azure) btn_azure.show();
         else btn_azure.hide();
     });
+    saml_enabled().then((res) => {
+        if (res.azure) btn_saml_azure.show();
+        else btn_saml_azure.hide();
+    });
 });
 const get_client_data = async () => {
     const res = await fetch('gui/get_client_data', {method: 'GET'});
@@ -91,4 +100,8 @@ const bbforce_cmd = async () => {
 const oauth2_enabled = async () => {
     const res = await fetch('../oauth2/enabled', {method: 'GET'});
     return await res.json();
+}
+const saml_enabled = async () => {
+    const res = await fetch('../saml/enabled', {method: 'GET'});
+    return await res.json();
 }

cmdbox/web/assets/cmdbox/users.js

@@ -63,7 +63,7 @@ users.users_list = async () => {
                 const row = $(modal.find('.row_content_template_choice').html()).appendTo(row_content);
                 row_content.find('.row_content_template_title').removeClass('row_content_template_title').text(col);
                 const select = row_content.find('.row_content_template_select').removeClass('row_content_template_select');
-                for (const h of ['', 'oauth2', 'plain', 'md5', 'sha1', 'sha256']) {
+                for (const h of ['', 'oauth2', 'saml', 'plain', 'md5', 'sha1', 'sha256']) {
                     $('<option>').text(h).val(h).appendTo(select);
                 }
                 select.attr('name', col).val(user && user[col] ? user[col] : '');

cmdbox/web/audit.html

@@ -6,10 +6,6 @@
     .card-hover:hover {
         box-shadow: 0 0 8px gray;
     }
-    .pane-divider {
-        border: 1px solid #C8C8C8 !important;
-        border-radius: 1px;
-    }
     </style>
 </head>
 <body lang="ja" class="overflow-hidden p-2" style="background-color:rgb(33, 37, 41)">
@@ -44,6 +40,9 @@
             <path d="M15.502 1.94a.5.5 0 0 1 0 .706L14.459 3.69l-2-2L13.502.646a.5.5 0 0 1 .707 0l1.293 1.293zm-1.75 2.456-2-2L4.939 9.21a.5.5 0 0 0-.121.196l-.805 2.414a.25.25 0 0 0 .316.316l2.414-.805a.5.5 0 0 0 .196-.12l6.813-6.814z"/>
             <path fill-rule="evenodd" d="M1 13.5A1.5 1.5 0 0 0 2.5 15h11a1.5 1.5 0 0 0 1.5-1.5v-6a.5.5 0 0 0-1 0v6a.5.5 0 0 1-.5.5h-11a.5.5 0 0 1-.5-.5v-11a.5.5 0 0 1 .5-.5H9a.5.5 0 0 0 0-1H2.5A1.5 1.5 0 0 0 1 2.5z"/>
         </symbol>
+        <symbol id="svg_search_btn" viewBox="0 0 16 16">
+            <path d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001q.044.06.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1 1 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0"/>
+        </symbol>
     </svg>
     <!-- ナビゲーションバー -->
     <nav class="navbar navbar-expand-sm fixed-top p-2">
@@ -100,50 +99,78 @@
         </div>
     </nav>
     <div id="main_container" class="container-fluid overflow-auto split-pane fixed-left" style="margin-top:66px;height:calc(100vh - 120px);">
-        <!-- 検索結果側ペイン -->
-        <div id="left_container" class="split-pane-component" style="width:80%;">
-            <ul class="nav nav-tabs" role="tablist">
-                <li class="nav-item" role="presentation">
-                    <a class="nav-link active" id="metrics-tab" data-bs-toggle="tab" href="#metrics" role="tab" aria-controls="metrics" aria-selected="true">Metrics</a>
-                </li>
-                <li class="nav-item" role="presentation">
-                    <a class="nav-link" id="trace-tab" data-bs-toggle="tab" href="#trace" role="tab" aria-controls="trace" aria-selected="false">Trace</a>
-                </li>
-                <li class="nav-item" role="presentation">
-                    <a class="nav-link" id="rawlog-tab" data-bs-toggle="tab" href="#rawlog" role="tab" aria-controls="rawlog" aria-selected="false">Raw Log</a>
-                </li>
-            </ul>
-            <div class="tab-content">
-                <div class="tab-pane fade show active" id="metrics" role="tabpanel" aria-labelledby="metrics-tab">
-                    <button id="add_metrics" type="button" class="btn">
-                        <svg width="32" height="32" fill="currentColor" class="bi bi-plus-lg"><use href="#svg_add_btn"></use></svg>
+        <ul id="main_tabs" class="nav nav-tabs" role="tablist">
+            <li class="nav-item" role="presentation">
+                <a class="nav-link active" id="metrics-tab" data-bs-toggle="tab" href="#metrics" role="tab" aria-controls="metrics" aria-selected="true">Metrics</a>
+            </li>
+            <li class="nav-item" role="presentation">
+                <a class="nav-link" id="trace-tab" data-bs-toggle="tab" href="#trace" role="tab" aria-controls="trace" aria-selected="false">Trace</a>
+            </li>
+            <li class="nav-item" role="presentation">
+                <a class="nav-link" id="rawlog-tab" data-bs-toggle="tab" href="#rawlog" role="tab" aria-controls="rawlog" aria-selected="false">Raw Log</a>
+            </li>
+        </ul>
+        <div class="tab-content">
+            <div class="tab-pane fade show active" id="metrics" role="tabpanel" aria-labelledby="metrics-tab">
+                <button id="add_metrics" type="button" class="btn">
+                    <svg width="32" height="32" fill="currentColor" class="bi bi-plus-lg"><use href="#svg_add_btn"></use></svg>
+                </button>
+                <!-- メトリクスグラフ -->
+                <div class="row g-2 m-0 overflow-auto" id="metrics_area" style="height:calc(100vh - 220px);"></div>
+            </div>
+            <div class="tab-pane fade" id="trace" role="tabpanel" aria-labelledby="trace-tab">
+                <button id="search_trace" type="button" class="btn">
+                    <svg width="32" height="32" fill="currentColor" class="bi bi-plus-lg"><use href="#svg_search_btn"></use></svg>
+                </button>
+                <!-- トレース一覧 -->
+                <div class="row g-2 mt-1 overflow-auto" id="trace_area" style="height:calc(100vh - 220px);"></div>
+            </div>
+            <div class="tab-pane fade" id="rawlog" role="tabpanel" aria-labelledby="rawlog-tab">
+                <button id="search_rawlog" type="button" class="btn">
+                    <svg width="32" height="32" fill="currentColor" class="bi bi-plus-lg"><use href="#svg_search_btn"></use></svg>
+                </button>
+                <!-- 監査ログ一覧 -->
+                <div class="row g-2 mt-1 overflow-auto" id="rawlog_area" style="height:calc(100vh - 220px);"></div>
+            </div>
+        </div>
+    </div>
+    <!-- searchモーダル -->
+    <div id="search_modal" class="modal" tabindex="-1">
+        <div class="modal-dialog modal-lg">
+            <div id="search_form" class="modal-content novalidate">
+                <div class="modal-header">
+                    <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>
+                        </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>
+                        </svg>
+                    </button>
+                    <button type="button" class="btn btn_close p-0 m-0" data-bs-dismiss="modal" aria-label="Close" style="margin-left: 0px;">
+                        <svg class="bi bi-x" width="24" height="24" fill="currentColor"><use href="#btn_x"></use></svg>
                     </button>
-                    <div class="row g-2 m-0" id="metrics_area"></div>
                 </div>
-                <div class="tab-pane fade" id="trace" role="tabpanel" aria-labelledby="trace-tab">
-                    <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-2 mt-2" id="trace_area"></div>
+                <div class="modal-body">
+                    <div class="row row_content"></div>
+                    <form id="filter_form" class="d-none filer_form">
+                        <input name="filer_host" type="hidden" class="filer_host">
+                        <input name="filer_port" type="hidden" class="filer_port">
+                        <input name="filer_password" type="hidden" class="filer_password">
+                        <input name="filer_svname" type="hidden" class="filer_svname">
+                        <input name="filer_scope" type="hidden" class="filer_scope">
+                        <input name="filer_client_data" type="hidden" class="filer_client_data">
+                    </form>
                 </div>
-                <div class="tab-pane fade" id="rawlog" role="tabpanel" aria-labelledby="rawlog-tab">
-                    <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-2 mt-2 modal-body" id="rawlog_area"></div>
+                <div class="modal-footer">
+                    <button id="do_search" type="button" class="btn btn-success">Search</button>
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
                 </div>
             </div>
         </div>
-        <!-- 左右のスプリッター -->
-        <div class="split-pane-divider pane-divider" style="left:80%;"></div>
-        <!-- フィルター側ペイン -->
-        <div id="right_container" class="split-pane-component" style="left:80%;">
-            <form class="d-none filer_form">
-                <input name="filer_host" type="hidden" class="filer_host">
-                <input name="filer_port" type="hidden" class="filer_port">
-                <input name="filer_password" type="hidden" class="filer_password">
-                <input name="filer_svname" type="hidden" class="filer_svname">
-                <input name="filer_scope" type="hidden" class="filer_scope">
-                <input name="filer_client_data" type="hidden" class="filer_client_data">
-            </form>
-            <div id="filter_form">
-                <div class="row row_content m-1"></div>
-            </div>
-        </div>
     </div>
     <!-- metricsモーダル -->
     <div id="metrics_modal" class="modal" tabindex="-1">
@@ -238,7 +265,6 @@
 <link rel="stylesheet" href="assets/bootstrap/bootstrap.min.5.3.0.css">
 <link rel="stylesheet" href="assets/cmdbox/color_mode.css">
 <link rel="stylesheet" href="assets/tree-menu/css/tree-menu.css">
-<link rel="stylesheet" href="assets/split-pane/split-pane.css">
 <link rel="stylesheet" href="assets/apexcharts/apexcharts.css">
 <style type="text/css">
 .apexcharts-tooltip {
@@ -260,7 +286,6 @@
 <script type="text/javascript" src="assets/jquery/jquery.min.3.2.0.js"></script>
 <script type="text/javascript" src="assets/jquery-ui/jquery-ui.min.js"></script>
 <script type="text/javascript" src="assets/jquery-resizable/jquery-resizable.min.js"></script>
-<script type="text/javascript" src="assets/split-pane/split-pane.js"></script>
 <script type="text/javascript" src="assets/apexcharts/apexcharts.min.js"></script>
 <script type="text/javascript" src="assets/cmdbox/common.js"></script>
 <script type="text/javascript" src="assets/cmdbox/view_result.js"></script>

cmdbox/web/signin.html

@@ -115,16 +115,20 @@
             <button class="btn btn-primary w-100 py-2" type="submit">Sign in</button>
             <div class="mt-3">
                 <button class="btn btn-outline-primary w-100 py-2 mb-3 btn-azure" type="button" style="display:none;">
-                    <svg class="bi my-1 theme-icon-active" fill="currentColor" width="16" height="16"><use href="#azure"></use></svg>
-                    Sign in with Microsoft
+                    <svg class="bi my-1 theme-icon-active me-2" fill="currentColor" width="16" height="16"><use href="#azure"></use></svg>
+                    Sign in with Microsoft OAuth2
                 </button>
                 <button class="btn btn-outline-primary w-100 py-2 mb-3 btn-google" type="button" style="display:none;">
-                    <svg class="bi my-1 theme-icon-active" fill="currentColor" width="16" height="16"><use href="#google"></use></svg>
-                    Sign in with Google
+                    <svg class="bi my-1 theme-icon-active me-2" fill="currentColor" width="16" height="16"><use href="#google"></use></svg>
+                    Sign in with Google OAuth2
                 </button>
                 <button class="btn btn-outline-primary w-100 py-2 mb-3 btn-github" type="button" style="display:none;">
-                    <svg class="bi my-1 theme-icon-active" fill="currentColor" width="16" height="16"><use href="#github"></use></svg>
-                    Sign in with Github
+                    <svg class="bi my-1 theme-icon-active me-2" fill="currentColor" width="16" height="16"><use href="#github"></use></svg>
+                    Sign in with Github OAuth2
+                </button>
+                <button class="btn btn-outline-primary w-100 py-2 mb-3 btn-saml-azure" type="button" style="display:none;">
+                    <svg class="bi my-1 theme-icon-active me-2" fill="currentColor" width="16" height="16"><use href="#azure"></use></svg>
+                    Sign in with Microsoft SAML
                 </button>
             </div>
         </form>