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

cmdbox/app/features/cli/cmdbox_server_stop.py

@@ -1,138 +1,138 @@
-from cmdbox.app import common, client, feature
-from cmdbox.app.commons import redis_client
-from cmdbox.app.options import Options
-from pathlib import Path
-from typing import Dict, Any, Tuple, List, Union
-import argparse
-import logging
-
-
-class ServerStop(feature.OneshotNotifyEdgeFeature):
-    def get_mode(self) -> Union[str, List[str]]:
-        """
-        この機能のモードを返します
-
-        Returns:
-            Union[str, List[str]]: モード
-        """
-        return 'server'
-
-    def get_cmd(self):
-        """
-        この機能のコマンドを返します
-
-        Returns:
-            str: コマンド
-        """
-        return 'stop'
-    
-    def get_option(self):
-        """
-        この機能のオプションを返します
-
-        Returns:
-            Dict[str, Any]: オプション
-        """
-        return dict(
-            use_redis=self.USE_REDIS_TRUE, nouse_webmode=True,
-            discription_ja="サーバーを停止します。installモードで `cmdbox -m install -c server` を実行している場合は、 `docker-compose down` を使用してください。",
-            discription_en="Stop the inference server. If you are running `cmdbox -m install -c server` in install mode, use `docker-compose down`.",
-            choice=[
-                dict(opt="host", type=Options.T_STR, default=self.default_host, required=True, multi=False, hide=True, choice=None, web="mask",
-                     discription_ja="Redisサーバーのサービスホストを指定します。",
-                     discription_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, web="mask",
-                     discription_ja="Redisサーバーのサービスポートを指定します。",
-                     discription_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, web="mask",
-                     discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
-                     discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
-                     discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
-                     discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
-                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."),
-                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."),
-                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."),
-                dict(opt="output_json", short="o", type=Options.T_FILE, default=None, required=False, multi=False, hide=True, choice=None, fileio="out",
-                     discription_ja="処理結果jsonの保存先ファイルを指定。",
-                     discription_en="Specify the destination file for saving the processing result json."),
-                dict(opt="output_json_append", short="a", type=Options.T_BOOL, default=False, required=False, multi=False, hide=True, choice=[True, False],
-                     discription_ja="処理結果jsonファイルを追記保存します。",
-                     discription_en="Save the processing result json file by appending."),
-                dict(opt="stdout_log", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],
-                     discription_ja="GUIモードでのみ使用可能です。コマンド実行時の標準出力をConsole logに出力します。",
-                     discription_en="Available only in GUI mode. Outputs standard output during command execution to Console log."),
-                dict(opt="capture_stdout", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],
-                     discription_ja="GUIモードでのみ使用可能です。コマンド実行時の標準出力をキャプチャーし、実行結果画面に表示します。",
-                     discription_en="Available only in GUI mode. Captures standard output during command execution and displays it on the execution result screen."),
-                dict(opt="capture_maxsize", type=Options.T_INT, default=self.DEFAULT_CAPTURE_MAXSIZE, required=False, multi=False, hide=True, choice=None,
-                     discription_ja="GUIモードでのみ使用可能です。コマンド実行時の標準出力の最大キャプチャーサイズを指定します。",
-                     discription_en="Available only in GUI mode. Specifies the maximum capture size of standard output when executing commands."),
-            ]
-        )
-
-    def get_svcmd(self):
-        """
-        この機能のサーバー側のコマンドを返します
-
-        Returns:
-            str: サーバー側のコマンド
-        """
-        return 'stop_server'
-
-    def apprun(self, logger:logging.Logger, args:argparse.Namespace, tm:float, pf:List[Dict[str, float]]=[]) -> Tuple[int, Dict[str, Any], Any]:
-        """
-        この機能の実行を行います
-
-        Args:
-            logger (logging.Logger): ロガー
-            args (argparse.Namespace): 引数
-            tm (float): 実行開始時間
-            pf (List[Dict[str, float]]): 呼出元のパフォーマンス情報
-
-        Returns:
-            Tuple[int, Dict[str, Any], Any]: 終了コード, 結果, オブジェクト
-        """
-        if args.svname is None:
-            msg = dict(warn=f"Please specify the --svname option.")
-            common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
-            return 1, msg
-        cl = client.Client(logger, redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname)
-        ret = cl.stop_server(retry_count=args.retry_count, retry_interval=args.retry_interval, timeout=args.timeout)
-        common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
-        if 'success' not in ret:
-                return 1, ret, cl
-        return 0, ret, cl
-
-    def is_cluster_redirect(self):
-        """
-        クラスター宛のメッセージの場合、メッセージを転送するかどうかを返します
-
-        Returns:
-            bool: メッセージを転送する場合はTrue
-        """
-        return True
-
-    def svrun(self, data_dir:Path, logger:logging.Logger, redis_cli:redis_client.RedisClient, msg:List[str],
-              sessions:Dict[str, Dict[str, Any]]) -> int:
-        """
-        この機能のサーバー側の実行を行います
-
-        Args:
-            data_dir (Path): データディレクトリ
-            logger (logging.Logger): ロガー
-            redis_cli (redis_client.RedisClient): Redisクライアント
-            msg (List[str]): 受信メッセージ
-            sessions (Dict[str, Dict[str, Any]]): セッション情報
-        
-        Returns:
-            int: 終了コード
-        """
-        redis_cli.rpush(msg[1], dict(success=f"Successful stop server. svname={redis_cli.svname}"))
-        return self.RESP_SCCESS
+from cmdbox.app import common, client, feature
+from cmdbox.app.commons import redis_client
+from cmdbox.app.options import Options
+from pathlib import Path
+from typing import Dict, Any, Tuple, List, Union
+import argparse
+import logging
+
+
+class ServerStop(feature.OneshotNotifyEdgeFeature):
+    def get_mode(self) -> Union[str, List[str]]:
+        """
+        この機能のモードを返します
+
+        Returns:
+            Union[str, List[str]]: モード
+        """
+        return 'server'
+
+    def get_cmd(self):
+        """
+        この機能のコマンドを返します
+
+        Returns:
+            str: コマンド
+        """
+        return 'stop'
+    
+    def get_option(self):
+        """
+        この機能のオプションを返します
+
+        Returns:
+            Dict[str, Any]: オプション
+        """
+        return dict(
+            use_redis=self.USE_REDIS_TRUE, nouse_webmode=True,
+            discription_ja="サーバーを停止します。installモードで `cmdbox -m install -c server` を実行している場合は、 `docker-compose down` を使用してください。",
+            discription_en="Stop the inference server. If you are running `cmdbox -m install -c server` in install mode, use `docker-compose down`.",
+            choice=[
+                dict(opt="host", type=Options.T_STR, default=self.default_host, required=True, multi=False, hide=True, choice=None, web="mask",
+                     discription_ja="Redisサーバーのサービスホストを指定します。",
+                     discription_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, web="mask",
+                     discription_ja="Redisサーバーのサービスポートを指定します。",
+                     discription_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, web="mask",
+                     discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
+                     discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
+                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                     discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
+                     discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
+                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."),
+                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."),
+                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."),
+                dict(opt="output_json", short="o", type=Options.T_FILE, default=None, required=False, multi=False, hide=True, choice=None, fileio="out",
+                     discription_ja="処理結果jsonの保存先ファイルを指定。",
+                     discription_en="Specify the destination file for saving the processing result json."),
+                dict(opt="output_json_append", short="a", type=Options.T_BOOL, default=False, required=False, multi=False, hide=True, choice=[True, False],
+                     discription_ja="処理結果jsonファイルを追記保存します。",
+                     discription_en="Save the processing result json file by appending."),
+                dict(opt="stdout_log", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],
+                     discription_ja="GUIモードでのみ使用可能です。コマンド実行時の標準出力をConsole logに出力します。",
+                     discription_en="Available only in GUI mode. Outputs standard output during command execution to Console log."),
+                dict(opt="capture_stdout", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],
+                     discription_ja="GUIモードでのみ使用可能です。コマンド実行時の標準出力をキャプチャーし、実行結果画面に表示します。",
+                     discription_en="Available only in GUI mode. Captures standard output during command execution and displays it on the execution result screen."),
+                dict(opt="capture_maxsize", type=Options.T_INT, default=self.DEFAULT_CAPTURE_MAXSIZE, required=False, multi=False, hide=True, choice=None,
+                     discription_ja="GUIモードでのみ使用可能です。コマンド実行時の標準出力の最大キャプチャーサイズを指定します。",
+                     discription_en="Available only in GUI mode. Specifies the maximum capture size of standard output when executing commands."),
+            ]
+        )
+
+    def get_svcmd(self):
+        """
+        この機能のサーバー側のコマンドを返します
+
+        Returns:
+            str: サーバー側のコマンド
+        """
+        return 'stop_server'
+
+    def apprun(self, logger:logging.Logger, args:argparse.Namespace, tm:float, pf:List[Dict[str, float]]=[]) -> Tuple[int, Dict[str, Any], Any]:
+        """
+        この機能の実行を行います
+
+        Args:
+            logger (logging.Logger): ロガー
+            args (argparse.Namespace): 引数
+            tm (float): 実行開始時間
+            pf (List[Dict[str, float]]): 呼出元のパフォーマンス情報
+
+        Returns:
+            Tuple[int, Dict[str, Any], Any]: 終了コード, 結果, オブジェクト
+        """
+        if args.svname is None:
+            msg = dict(warn=f"Please specify the --svname option.")
+            common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+            return 1, msg
+        cl = client.Client(logger, redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname)
+        ret = cl.stop_server(retry_count=args.retry_count, retry_interval=args.retry_interval, timeout=args.timeout)
+        common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+        if 'success' not in ret:
+                return 1, ret, cl
+        return 0, ret, cl
+
+    def is_cluster_redirect(self):
+        """
+        クラスター宛のメッセージの場合、メッセージを転送するかどうかを返します
+
+        Returns:
+            bool: メッセージを転送する場合はTrue
+        """
+        return True
+
+    def svrun(self, data_dir:Path, logger:logging.Logger, redis_cli:redis_client.RedisClient, msg:List[str],
+              sessions:Dict[str, Dict[str, Any]]) -> int:
+        """
+        この機能のサーバー側の実行を行います
+
+        Args:
+            data_dir (Path): データディレクトリ
+            logger (logging.Logger): ロガー
+            redis_cli (redis_client.RedisClient): Redisクライアント
+            msg (List[str]): 受信メッセージ
+            sessions (Dict[str, Dict[str, Any]]): セッション情報
+        
+        Returns:
+            int: 終了コード
+        """
+        redis_cli.rpush(msg[1], dict(success=f"Successful stop server. svname={redis_cli.svname}"))
+        return self.RESP_SCCESS

cmdbox/app/features/web/cmdbox_web_audit.py

@@ -0,0 +1,81 @@
+from cmdbox.app import common, feature
+from cmdbox.app.web import Web
+from fastapi import FastAPI, Request, Response
+from fastapi.responses import HTMLResponse
+from typing import Dict, Any
+import argparse
+import time
+
+
+class Audit(feature.WebFeature):
+
+    def route(self, web:Web, app:FastAPI) -> None:
+        """
+        webモードのルーティングを設定します
+
+        Args:
+            web (Web): Webオブジェクト
+            app (FastAPI): FastAPIオブジェクト
+        """
+        if web.audit_html is not None:
+            if not web.audit_html.is_file():
+                raise FileNotFoundError(f'audit_html is not found. ({web.audit_html})')
+            with open(web.audit_html, 'r', encoding='utf-8') as f:
+                web.audit_html_data = f.read()
+
+        @app.get('/audit', response_class=HTMLResponse)
+        @app.post('/audit', response_class=HTMLResponse)
+        async def audit(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                return signin
+            res.headers['Access-Control-Allow-Origin'] = '*'
+            web.options.audit_exec(req, res, web)
+            return web.audit_html_data
+
+        @app.post('/audit/rawlog')
+        async def audit_rawlog(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                return signin
+            if web.signin.get_data() is None:
+                return dict(error='signin_file_data is None.')
+            if not hasattr(web.options, 'audit_search') or web.options.audit_search is None:
+                raise dict(error='audit search feature is not found.')
+            opt = await req.json()
+            opt = {**opt, **web.options.audit_search_args.copy()}
+            args = argparse.Namespace(**{k:common.chopdq(v) for k,v in opt.items()})
+            status, ret_main, _ = web.options.audit_search.apprun(web.logger, args, time.perf_counter(), [])
+            if status != 0:
+                return dict(error=ret_main)
+            return ret_main
+
+        @app.get('/audit/mode_cmd')
+        async def audit_mode_cmd(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                return signin
+            return dict(success=web.options.audit_search_args)
+
+    def toolmenu(self, web:Web) -> Dict[str, Any]:
+        """
+        ツールメニューの情報を返します
+
+        Args:
+            web (Web): Webオブジェクト
+        
+        Returns:
+            Dict[str, Any]: ツールメニュー情報
+        
+        Sample:
+            {
+                'filer': {
+                    'html': 'Filer',
+                    'href': 'filer',
+                    'target': '_blank',
+                    'css_class': 'dropdown-item'
+                    'onclick': 'alert("filer")'
+                }
+            }
+        """
+        return dict(audit=dict(html='Audit', href='audit', target='_blank', css_class='dropdown-item'))

cmdbox/app/features/web/cmdbox_web_audit_metrics.py

@@ -0,0 +1,72 @@
+from cmdbox.app import common, feature
+from cmdbox.app.web import Web
+from fastapi import FastAPI, Request, Response, HTTPException
+from typing import Dict, Any
+import json
+
+
+class AuditMetrics(feature.WebFeature):
+    def route(self, web:Web, app:FastAPI) -> None:
+        """
+        webモードのルーティングを設定します
+
+        Args:
+            web (Web): Webオブジェクト
+            app (FastAPI): FastAPIオブジェクト
+        """
+        @app.post('/audit/metrics/save')
+        async def save_metrics(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
+            form = await req.form()
+            title = form.get('title')
+            opt = json.loads(form.get('opt'))
+            if common.check_fname(title):
+                return dict(warn=f'The title contains invalid characters."{title}"')
+            opt_path = web.audit_path / f"metrics-{title}.json"
+            web.logger.info(f"save_metrics: opt_path={opt_path}, opt={opt}")
+            common.saveopt(opt, opt_path, True)
+            ret = dict(success=f'Metrics "{title}" saved in "{opt_path}".')
+            web.options.audit_exec(req, res, web, title=title)
+            return ret
+
+        @app.post('/audit/metrics/load')
+        async def load_metrics(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
+            form = await req.form()
+            title = form.get('title')
+            opt_path = web.audit_path / f"metrics-{title}.json"
+            if not opt_path.is_file():
+                return dict(warn=f'The metrics file is not found."{opt_path}"')
+            with open(opt_path, 'r', encoding='utf-8') as f:
+                opt = json.load(f)
+            return dict(success=opt)
+
+        @app.post('/audit/metrics/delete')
+        async def delete_metrics(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
+            form = await req.form()
+            title = form.get('title')
+            opt_path = web.audit_path / f"metrics-{title}.json"
+            if not opt_path.is_file():
+                return dict(warn=f'The metrics file is not found."{opt_path}"')
+            opt_path.unlink()
+            return dict(success=f'Metrics "{title}" deleted.')
+
+        @app.post('/audit/metrics/list')
+        async def list_metrics(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
+            files = web.audit_path.glob('metrics-*.json')
+            ret = []
+            for f in files:
+                with open(f, 'r', encoding='utf-8') as f:
+                    opt = json.load(f)
+                    ret.append(opt)
+            return dict(success=ret)

cmdbox/app/features/web/cmdbox_web_del_cmd.py

@@ -17,6 +17,7 @@ class DelCmd(feature.WebFeature):
             signin = web.signin.check_signin(req, res)
             if signin is not None:
                 raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
+        
             form = await req.form()
             title = form.get('title')
 
@@ -26,4 +27,5 @@ class DelCmd(feature.WebFeature):
             if 'signin' in req.session and req.session['signin'] is not None:
                 sess = req.session['signin']
                 web.user_data(req, sess['uid'], sess['name'], 'cmdpins', title, delkey=True)
+            web.options.audit_exec(req, res, web)
             return {}

cmdbox/app/features/web/cmdbox_web_del_pipe.py

@@ -26,5 +26,6 @@ class DelPipe(feature.WebFeature):
             if 'signin' in req.session and req.session['signin'] is not None:
                 sess = req.session['signin']
                 web.user_data(req, sess['uid'], sess['name'], 'pipepins', title, delkey=True)
+            web.options.audit_exec(req, res, web)
             return {}
 

cmdbox/app/features/web/cmdbox_web_do_signin.py

@@ -58,9 +58,11 @@ class DoSignin(cmdbox_web_signin.Signin):
                             pass
             if not token_ok:
                 if name == '' or passwd == '':
+                    web.options.audit_exec(req, res, web, body=dict(msg='signin failed.'), audit_type='auth')
                     return RedirectResponse(url=f'/signin/{next}?error=1')
                 user = [u for u in signin_data['users'] if u['name'] == name and u['hash'] != 'oauth2']
                 if len(user) <= 0:
+                    web.options.audit_exec(req, res, web, body=dict(msg='signin failed.'), audit_type='auth')
                     return RedirectResponse(url=f'/signin/{next}?error=1')
                 user = user[0]
             if web.logger.level == logging.DEBUG:
@@ -84,6 +86,7 @@ class DoSignin(cmdbox_web_signin.Signin):
                 if pass_miss_count >= threshold:
                     # ロックアウト
                     web.user_data(None, uid, name, 'password', 'pass_miss_count', )
+                    web.options.audit_exec(req, res, web, body=dict(msg='Accound lockout.'), audit_type='auth', user=name)
                     return RedirectResponse(url=f'/signin/{next}?error=lockout')
 
             if not token_ok:
@@ -96,6 +99,7 @@ class DoSignin(cmdbox_web_signin.Signin):
                     web.user_data(None, uid, name, 'password', 'pass_miss_last', datetime.datetime.now().strftime('%Y-%m-%dT%H:%M:%S'))
                     web.user_data(None, uid, name, 'password', 'pass_miss_count', pass_miss_count+1)
                     web.logger.warning(f'Failed to signin. name={name}, pass_miss_count={pass_miss_count+1}')
+                    web.options.audit_exec(req, res, web, body=dict(msg='Wrong password.'), audit_type='auth', user=name)
                     return RedirectResponse(url=f'/signin/{next}?error=1')
             group_names = list(set(web.signin.__class__.correct_group(signin_data, user['groups'], None)))
             gids = [g['gid'] for g in signin_data['groups'] if g['name'] in group_names]
@@ -113,16 +117,22 @@ class DoSignin(cmdbox_web_signin.Signin):
                     notify = expiration['notify']
                     # パスワード有効期限チェック
                     if datetime.datetime.now() > last_update + datetime.timedelta(days=period):
+                        web.options.audit_exec(req, res, web, body=dict(msg='Password is expired.'), audit_type='auth', user=name)
                         return RedirectResponse(url=f'/signin/{next}?error=expirationofpassword')
                     if datetime.datetime.now() > last_update + datetime.timedelta(days=notify):
                         # セッションに保存
                         _set_session(req, dict(uid=uid, name=name), email, passwd, None, group_names, gids)
                         next = f"../{next}" if token_ok else next
-                        return RedirectResponse(url=f'../{next}?warn=passchange', headers=dict(signin="success")) # nginxのリバプロ対応のための相対パス
+                        web.options.audit_exec(req, res, web, body=dict(msg='Signin succeeded. However, you should change your password.'), audit_type='auth', user=name)
+                        return RedirectResponse(url=f'../{next}?warn=passchange', headers=dict(signin="success"))
             # セッションに保存
             _set_session(req, dict(uid=uid, name=name), email, passwd, None, group_names, gids)
             next = f"../{next}" if token_ok else next
-            return RedirectResponse(url=f'../{next}{"?warn=passchange" if notify_passchange else ""}', headers=dict(signin="success")) # nginxのリバプロ対応のための相対パス
+            if notify_passchange:
+                web.options.audit_exec(req, res, web, body=dict(msg='Signin succeeded. However, you should change your password.'), audit_type='auth', user=name)
+                return RedirectResponse(url=f'../{next}?warn=passchange', headers=dict(signin="success"))
+            web.options.audit_exec(req, res, web, body=dict(msg='Signin succeeded.'), audit_type='auth', user=name)
+            return RedirectResponse(url=f'../{next}', headers=dict(signin="success"))
 
         def _load_signin(web:Web, signin_module:str, appcls, ver):
             """

cmdbox/app/features/web/cmdbox_web_do_signout.py

@@ -17,6 +17,7 @@ class DoSignout(feature.WebFeature):
         @app.post('/dosignout/{next}', response_class=HTMLResponse)
         async def do_signout(next, req:Request, res:Response):
             if 'signin' in req.session:
+                web.options.audit_exec(req, res, web, body=dict(msg='Signout.'), audit_type='auth')
                 for key in list(req.session.keys()).copy():
                     del req.session[key]
             return RedirectResponse(url=f'../signin/{next}') # nginxのリバプロ対応のための相対パス

cmdbox/app/features/web/cmdbox_web_exec_cmd.py

@@ -1,5 +1,6 @@
-from cmdbox.app import app, client, options, server, web as _web
+from cmdbox.app import app, client, common, options, server, web as _web
 from cmdbox.app.commons import convert, loghandler
+from cmdbox.app.features.cli import cmdbox_audit_search, cmdbox_audit_write
 from cmdbox.app.features.web import cmdbox_web_load_cmd
 from cmdbox.app.web import Web
 from fastapi import FastAPI, Request, Response, HTTPException
@@ -10,6 +11,7 @@ import io
 import json
 import traceback
 import sys
+import uuid
 
 
 class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
@@ -110,16 +112,43 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
         Returns:
             list: コマンド実行結果
         """
+        tags = []
+        if 'tag' in opt and isinstance(opt['tag'], list):
+            tags = [t for t in opt['tag'] if t is not None and t != '']
+        web.options.audit_exec(req, res, web, tags=tags, title=title)
         appcls = self.appcls if appcls is None else appcls
         appcls = app.CmdBoxApp if appcls is None else appcls
         web.container['cmdbox_app'] = ap = appcls.getInstance(appcls=appcls, ver=self.ver)
         if 'mode' in opt and 'cmd' in opt:
             if not web.signin.check_cmd(req, res, opt['mode'], opt['cmd']):
                 return dict(warn=f'Command "{title}" failed. Execute command denyed. mode={opt["mode"]}, cmd={opt["cmd"]}')
+            _options = options.Options.getInstance()
+            schema = _options.get_cmd_choices(opt['mode'], opt['cmd'], False)
+            try:
+                opt_path = web.cmds_path / f"cmd-{title}.json"
+                feat = _options.get_cmd_attr(opt['mode'], opt['cmd'], "feature")
+                loaded = common.loadopt(opt_path, False)
+                for o in opt.keys():
+                    found = False
+                    for s in schema:
+                        if 'opt' not in s or s['opt'] != o: continue
+                        if 'web' not in s or s['web'] != 'mask': continue
+                        found = True
+                    if not found or o not in loaded: continue
+                    opt[o] = loaded[o]
+                    if isinstance(feat, cmdbox_audit_write.AuditWrite) and o in _options.audit_write_args:
+                        opt[o] = _options.audit_write_args[o]
+                    elif isinstance(feat, cmdbox_audit_search.AuditSearch) and o in _options.audit_search_args:
+                        opt[o] = _options.audit_search_args[o]
+            except:
+                pass
         if 'host' in opt: opt['host'] = web.redis_host
         if 'port' in opt: opt['port'] = web.redis_port
         if 'password' in opt: opt['password'] = web.redis_password
         if 'svname' in opt: opt['svname'] = web.svname
+        if req.session is not None and 'signin' in req.session and req.session['signin'] is not None:
+            if 'clmsg_id' in req.session['signin'] and req.session['signin']['clmsg_id'] is not None:
+                opt['clmsg_id'] = req.session['signin']['clmsg_id']
         ap.sv = None
         ap.cl = None
         ap.web = None
@@ -151,7 +180,7 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
             logsize = 1024
             try:
                 old_stdout.write(loghandler.colorize_msg(f'EXEC:     {opt_list}\n'[:logsize]))
-                status, ret_main, obj = cmdbox_app.main(args_list=opt_list, file_dict=file_dict, webcall=True)
+                status, ret_main, obj = cmdbox_app.main(args_list=[common.chopdq(o) for o in opt_list], file_dict=file_dict, webcall=True)
                 if isinstance(obj, server.Server):
                     cmdbox_app.sv = obj
                 elif isinstance(obj, client.Client):

cmdbox/app/features/web/cmdbox_web_exec_pipe.py

@@ -84,6 +84,7 @@ class ExecPipe(cmdbox_web_load_pipe.LoadPipe, cmdbox_web_raw_pipe.RawPipe):
                 for tfname in upfiles.values():
                     os.unlink(tfname)
 
+    @options.Options.audit()
     def exec_pipe(self, req:Request, res:Response, web:Web,
                   title:str, opt:Dict[str, Any], nothread:bool=False, capture_stdin:bool=False) -> List[Dict[str, Any]]:
         """