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

cmdbox/app/features/web/cmdbox_web_load_pin.py

@@ -1,43 +1,43 @@
-from cmdbox.app import feature
-from cmdbox.app.web import Web
-from fastapi import FastAPI, Request, Response, HTTPException
-
-
-class LoadPin(feature.WebFeature):
-    def route(self, web:Web, app:FastAPI) -> None:
-        """
-        webモードのルーティングを設定します
-
-        Args:
-            web (Web): Webオブジェクト
-            app (FastAPI): FastAPIオブジェクト
-        """
-        @app.post('/gui/load_cmd_pin')
-        async def load_cmd_pin(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)
-            if 'signin' not in req.session or req.session['signin'] is None:
-                return dict(warn='Please sign in.')
-            form = await req.form()
-            title = form.get('title')
-            sess = req.session['signin']
-            data = web.user_data(req, sess['uid'], sess['name'], 'cmdpins', title)
-            if data is None:
-                return dict(success='off')
-            return dict(success=data)
-
-        @app.post('/gui/load_pipe_pin')
-        async def load_pipe_pin(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)
-            if 'signin' not in req.session or req.session['signin'] is None:
-                return dict(warn='Please sign in.')
-            form = await req.form()
-            title = form.get('title')
-            sess = req.session['signin']
-            data = web.user_data(req, sess['uid'], sess['name'], 'pipepins', title)
-            if data is None:
-                return dict(success='off')
-            return dict(success=data)
+from cmdbox.app import feature
+from cmdbox.app.web import Web
+from fastapi import FastAPI, Request, Response, HTTPException
+
+
+class LoadPin(feature.WebFeature):
+    def route(self, web:Web, app:FastAPI) -> None:
+        """
+        webモードのルーティングを設定します
+
+        Args:
+            web (Web): Webオブジェクト
+            app (FastAPI): FastAPIオブジェクト
+        """
+        @app.post('/gui/load_cmd_pin')
+        async def load_cmd_pin(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)
+            if 'signin' not in req.session or req.session['signin'] is None:
+                return dict(warn='Please sign in.')
+            form = await req.form()
+            title = form.get('title')
+            sess = req.session['signin']
+            data = web.user_data(req, sess['uid'], sess['name'], 'cmdpins', title)
+            if data is None:
+                return dict(success='off')
+            return dict(success=data)
+
+        @app.post('/gui/load_pipe_pin')
+        async def load_pipe_pin(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)
+            if 'signin' not in req.session or req.session['signin'] is None:
+                return dict(warn='Please sign in.')
+            form = await req.form()
+            title = form.get('title')
+            sess = req.session['signin']
+            data = web.user_data(req, sess['uid'], sess['name'], 'pipepins', title)
+            if data is None:
+                return dict(success='off')
+            return dict(success=data)

cmdbox/app/features/web/cmdbox_web_raw_pipe.py

@@ -1,87 +1,87 @@
-from cmdbox.app import common
-from cmdbox.app.features.web import cmdbox_web_raw_cmd, cmdbox_web_load_cmd
-from cmdbox.app.web import Web
-from fastapi import FastAPI, Request, Response, HTTPException
-from typing import Dict, Any, List
-import logging
-import json
-
-
-class RawPipe(cmdbox_web_raw_cmd.RawCmd, cmdbox_web_load_cmd.LoadCmd):
-    def route(self, web:Web, app:FastAPI) -> None:
-        """
-        webモードのルーティングを設定します
-
-        Args:
-            web (Web): Webオブジェクト
-            app (FastAPI): FastAPIオブジェクト
-        """
-        @app.post('/gui/raw_pipe')
-        async def raw_pipe(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 = form.get('opt')
-            ret = self.raw_pipe(web, title, json.loads(opt))
-            return ret
-
-    def raw_pipe(self, web:Web, title:str, opt:Dict[str, Any], setredis:bool=False) -> List[Dict[str, Any]]:
-        """
-        パイプラインのコマンドライン文字列、curlコマンド文字列を作成する
-
-        Args:
-            web (Web): Webオブジェクト
-            title (str): タイトル
-            opt (dict): オプション
-            setredis (bool): Webインスタンスのredis接続情報をオプションにセットするかどうか
-        
-        Returns:
-            list[Dict[str, Any]]: コマンドライン文字列、curlコマンド文字列
-        """
-        if web.logger.level == logging.DEBUG:
-            web.logger.debug(f"web.raw_pipe: title={title}, opt={opt}")
-        cmdlines = []
-        errormsg = []
-        curl_cmd_file = ""
-        for i, cmd_title in enumerate(opt['pipe_cmd']):
-            if cmd_title == '':
-                continue
-            cmd_opt = self.load_cmd(web, cmd_title)
-            cmd_ref = web.options.get_cmd_choices(cmd_opt['mode'], cmd_opt['cmd'], True)
-            chk_stdin = len([ref for ref in cmd_ref if ref['opt'] == 'stdin']) > 0
-
-            if 'debug' in cmd_opt and cmd_opt['debug']:
-                errormsg.append(f'The "debug" option is not supported with the debug option "true". ({cmd_title})')
-            if 'output_csv' in cmd_opt and cmd_opt['output_csv'] != '':
-                errormsg.append(f'The "output_csv" option is not supported in pipe. ({cmd_title})')
-            if i>0:
-                if chk_stdin and ('stdin' not in cmd_opt or not cmd_opt['stdin']):
-                    errormsg.append(f'The "stdin" option should be specified for the second and subsequent commands. ({cmd_title})')
-                if chk_stdin and 'pred_input_type' in cmd_opt and cmd_opt['pred_input_type'] not in ['capture']:
-                    errormsg.append(f'When using the "stdin" option, "pred_input_type" cannot be other than "capture". ({cmd_title})')
-                for ref in cmd_ref:
-                    if 'fileio' in ref and ref['fileio'] == 'in' and ref['opt'] in cmd_opt and cmd_opt[ref['opt']] != '' and len([v for v in cmd_opt[ref['opt']] if v != '']) > 0:
-                        errormsg.append(f'The "{ref["opt"]}" option should not be specified in a second or subsequent command. ({cmd_title})')
-            if i==0:
-                if 'request_files' in opt and len(opt['request_files']) > 0:
-                    for fn in opt['request_files']:
-                        if fn in cmd_opt:
-                            cmd_opt[fn] = opt['request_files'][fn]
-                curl_cmd_file = self.mk_curl_fileup(web, cmd_opt)
-
-            if setredis:
-                if 'host' in cmd_opt: cmd_opt['host'] = web.redis_host
-                if 'port' in cmd_opt: cmd_opt['port'] = web.redis_port
-                if 'password' in cmd_opt: cmd_opt['password'] = web.redis_password
-                if 'svname' in cmd_opt: cmd_opt['svname'] = web.svname
-            cmd_output = self.raw_cmd(web, cmd_title, cmd_opt)
-            cmdlines.append(cmd_output[0]["raw"])
-
-        curl_opt = json.dumps(opt, default=common.default_json_enc)
-        curl_opt = curl_opt.replace('"', '\\"')
-        ret = [dict(type='cmdline', raw=' | '.join(cmdlines)),
-                dict(type='curlcmd', raw=f'curl {curl_cmd_file} http://localhost:{web.listen_port}/exec_pipe/{title}')]
-        ret += [dict(type='warn', raw=em) for em in errormsg]
-        return ret
+from cmdbox.app import common
+from cmdbox.app.features.web import cmdbox_web_raw_cmd, cmdbox_web_load_cmd
+from cmdbox.app.web import Web
+from fastapi import FastAPI, Request, Response, HTTPException
+from typing import Dict, Any, List
+import logging
+import json
+
+
+class RawPipe(cmdbox_web_raw_cmd.RawCmd, cmdbox_web_load_cmd.LoadCmd):
+    def route(self, web:Web, app:FastAPI) -> None:
+        """
+        webモードのルーティングを設定します
+
+        Args:
+            web (Web): Webオブジェクト
+            app (FastAPI): FastAPIオブジェクト
+        """
+        @app.post('/gui/raw_pipe')
+        async def raw_pipe(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 = form.get('opt')
+            ret = self.raw_pipe(web, title, json.loads(opt))
+            return ret
+
+    def raw_pipe(self, web:Web, title:str, opt:Dict[str, Any], setredis:bool=False) -> List[Dict[str, Any]]:
+        """
+        パイプラインのコマンドライン文字列、curlコマンド文字列を作成する
+
+        Args:
+            web (Web): Webオブジェクト
+            title (str): タイトル
+            opt (dict): オプション
+            setredis (bool): Webインスタンスのredis接続情報をオプションにセットするかどうか
+        
+        Returns:
+            list[Dict[str, Any]]: コマンドライン文字列、curlコマンド文字列
+        """
+        if web.logger.level == logging.DEBUG:
+            web.logger.debug(f"web.raw_pipe: title={title}, opt={opt}")
+        cmdlines = []
+        errormsg = []
+        curl_cmd_file = ""
+        for i, cmd_title in enumerate(opt['pipe_cmd']):
+            if cmd_title == '':
+                continue
+            cmd_opt = self.load_cmd(web, cmd_title)
+            cmd_ref = web.options.get_cmd_choices(cmd_opt['mode'], cmd_opt['cmd'], True)
+            chk_stdin = len([ref for ref in cmd_ref if ref['opt'] == 'stdin']) > 0
+
+            if 'debug' in cmd_opt and cmd_opt['debug']:
+                errormsg.append(f'The "debug" option is not supported with the debug option "true". ({cmd_title})')
+            if 'output_csv' in cmd_opt and cmd_opt['output_csv'] != '':
+                errormsg.append(f'The "output_csv" option is not supported in pipe. ({cmd_title})')
+            if i>0:
+                if chk_stdin and ('stdin' not in cmd_opt or not cmd_opt['stdin']):
+                    errormsg.append(f'The "stdin" option should be specified for the second and subsequent commands. ({cmd_title})')
+                if chk_stdin and 'pred_input_type' in cmd_opt and cmd_opt['pred_input_type'] not in ['capture']:
+                    errormsg.append(f'When using the "stdin" option, "pred_input_type" cannot be other than "capture". ({cmd_title})')
+                for ref in cmd_ref:
+                    if 'fileio' in ref and ref['fileio'] == 'in' and ref['opt'] in cmd_opt and cmd_opt[ref['opt']] != '' and len([v for v in cmd_opt[ref['opt']] if v != '']) > 0:
+                        errormsg.append(f'The "{ref["opt"]}" option should not be specified in a second or subsequent command. ({cmd_title})')
+            if i==0:
+                if 'request_files' in opt and len(opt['request_files']) > 0:
+                    for fn in opt['request_files']:
+                        if fn in cmd_opt:
+                            cmd_opt[fn] = opt['request_files'][fn]
+                curl_cmd_file = self.mk_curl_fileup(web, cmd_opt)
+
+            if setredis:
+                if 'host' in cmd_opt: cmd_opt['host'] = web.redis_host
+                if 'port' in cmd_opt: cmd_opt['port'] = web.redis_port
+                if 'password' in cmd_opt: cmd_opt['password'] = web.redis_password
+                if 'svname' in cmd_opt: cmd_opt['svname'] = web.svname
+            cmd_output = self.raw_cmd(web, cmd_title, cmd_opt)
+            cmdlines.append(cmd_output[0]["raw"])
+
+        curl_opt = json.dumps(opt, default=common.default_json_enc)
+        curl_opt = curl_opt.replace('"', '\\"')
+        ret = [dict(type='cmdline', raw=' | '.join(cmdlines)),
+                dict(type='curlcmd', raw=f'curl {curl_cmd_file} http://localhost:{web.listen_port}/exec_pipe/{title}')]
+        ret += [dict(type='warn', raw=em) for em in errormsg]
+        return ret

cmdbox/app/features/web/cmdbox_web_save_cmd.py

@@ -23,6 +23,7 @@ class SaveCmd(feature.WebFeature):
             title = form.get('title')
             opt = form.get('opt')
             ret = self.save_cmd(web, title, json.loads(opt))
+            web.options.audit_exec(req, res, web)
             return ret
 
     def save_cmd(self, web:Web, title:str, opt:Dict[str, Any]) -> Dict[str, str]:

cmdbox/app/features/web/cmdbox_web_save_pin.py

@@ -1,42 +1,42 @@
-from cmdbox.app import common, feature
-from cmdbox.app.web import Web
-from fastapi import FastAPI, Request, Response, HTTPException
-from typing import Dict, Any
-
-
-class SavePin(feature.WebFeature):
-    def route(self, web:Web, app:FastAPI) -> None:
-        """
-        webモードのルーティングを設定します
-
-        Args:
-            web (Web): Webオブジェクト
-            app (FastAPI): FastAPIオブジェクト
-        """
-        @app.post('/gui/save_cmd_pin')
-        async def save_cmd_pin(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)
-            if 'signin' not in req.session or req.session['signin'] is None:
-                return dict(warn='Please sign in.')
-            form = await req.form()
-            title = form.get('title')
-            pin = form.get('pin')
-            sess = req.session['signin']
-            web.user_data(req, sess['uid'], sess['name'], 'cmdpins', title, pin)
-            return dict(success=f'Command pin "{title}:{pin}" saved.')
-
-        @app.post('/gui/save_pipe_pin')
-        async def save_pipe_pin(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)
-            if 'signin' not in req.session or req.session['signin'] is None:
-                return dict(warn='Please sign in.')
-            form = await req.form()
-            title = form.get('title')
-            pin = form.get('pin')
-            sess = req.session['signin']
-            web.user_data(req, sess['uid'], sess['name'], 'pipepins', title, pin)
-            return dict(success=f'Pipe pin "{title}:{pin}" saved.')
+from cmdbox.app import common, feature
+from cmdbox.app.web import Web
+from fastapi import FastAPI, Request, Response, HTTPException
+from typing import Dict, Any
+
+
+class SavePin(feature.WebFeature):
+    def route(self, web:Web, app:FastAPI) -> None:
+        """
+        webモードのルーティングを設定します
+
+        Args:
+            web (Web): Webオブジェクト
+            app (FastAPI): FastAPIオブジェクト
+        """
+        @app.post('/gui/save_cmd_pin')
+        async def save_cmd_pin(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)
+            if 'signin' not in req.session or req.session['signin'] is None:
+                return dict(warn='Please sign in.')
+            form = await req.form()
+            title = form.get('title')
+            pin = form.get('pin')
+            sess = req.session['signin']
+            web.user_data(req, sess['uid'], sess['name'], 'cmdpins', title, pin)
+            return dict(success=f'Command pin "{title}:{pin}" saved.')
+
+        @app.post('/gui/save_pipe_pin')
+        async def save_pipe_pin(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)
+            if 'signin' not in req.session or req.session['signin'] is None:
+                return dict(warn='Please sign in.')
+            form = await req.form()
+            title = form.get('title')
+            pin = form.get('pin')
+            sess = req.session['signin']
+            web.user_data(req, sess['uid'], sess['name'], 'pipepins', title, pin)
+            return dict(success=f'Pipe pin "{title}:{pin}" saved.')

cmdbox/app/features/web/cmdbox_web_save_pipe.py

@@ -23,6 +23,7 @@ class SavePipe(feature.WebFeature):
             title = form.get('title')
             opt = form.get('opt')
             ret = self.save_pipe(web, title, json.loads(opt))
+            web.options.audit_exec(req, res, web)
             return ret
 
     def save_pipe(self, web:Web, title:str, opt:Dict[str, Any]) -> Dict[str, str]:

cmdbox/app/features/web/cmdbox_web_user_data.py

@@ -0,0 +1,58 @@
+from cmdbox.app import common, feature
+from cmdbox.app.web import Web
+from fastapi import FastAPI, Request, Response, HTTPException
+from typing import Dict, Any
+
+
+class UserData(feature.WebFeature):
+    def route(self, web:Web, app:FastAPI) -> None:
+        """
+        webモードのルーティングを設定します
+
+        Args:
+            web (Web): Webオブジェクト
+            app (FastAPI): FastAPIオブジェクト
+        """
+        @app.post('/gui/user_data/load')
+        async def load(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)
+            if 'signin' not in req.session or req.session['signin'] is None:
+                return dict(warn='Please sign in.')
+            form = await req.form()
+            categoly = form.get('categoly')
+            key = form.get('key')
+            sess = req.session['signin']
+            ret = web.user_data(req, sess['uid'], sess['name'], categoly, key)
+            return dict(success=ret)
+
+        @app.post('/gui/user_data/save')
+        async def save(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)
+            if 'signin' not in req.session or req.session['signin'] is None:
+                return dict(warn='Please sign in.')
+            form = await req.form()
+            categoly = form.get('categoly')
+            key = form.get('key')
+            val = form.get('val')
+            sess = req.session['signin']
+            web.user_data(req, sess['uid'], sess['name'], categoly, key, val)
+            return dict(success=f'user_data "{categoly}:{key}:val" saved.')
+
+        @app.post('/gui/user_data/delete')
+        async def delete(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)
+            if 'signin' not in req.session or req.session['signin'] is None:
+                return dict(warn='Please sign in.')
+            form = await req.form()
+            categoly = form.get('categoly')
+            key = form.get('key')
+            val = form.get('val')
+            sess = req.session['signin']
+            web.user_data(req, sess['uid'], sess['name'], categoly, key, delkey=True)
+            return dict(success=f'user_data "{categoly}:{key}:val" deleted.')

cmdbox/app/features/web/cmdbox_web_users.py

@@ -28,6 +28,7 @@ class Users(feature.WebFeature):
             if signin is not None:
                 return signin
             res.headers['Access-Control-Allow-Origin'] = '*'
+            web.options.audit_exec(req, res, web)
             return web.users_html_data
 
         @app.get('/users/list')
@@ -37,6 +38,7 @@ class Users(feature.WebFeature):
                 return signin
             if web.signin.get_data() is None:
                 return dict(error='signin_file_data is None.')
+            web.options.audit_exec(req, res, web)
             return web.user_list(None)
 
         @app.post('/users/add')
@@ -49,6 +51,7 @@ class Users(feature.WebFeature):
             form = await req.json()
             try:
                 web.user_add(form)
+                web.options.audit_exec(req, res, web)
                 return dict(success='add user')
             except Exception as e:
                 return dict(error=str(e))
@@ -63,6 +66,7 @@ class Users(feature.WebFeature):
             form = await req.json()
             try:
                 web.user_edit(form)
+                web.options.audit_exec(req, res, web)
                 return dict(success='edit user')
             except Exception as e:
                 return dict(error=str(e))
@@ -79,6 +83,7 @@ class Users(feature.WebFeature):
                 if req.session['signin']['uid'] == form.get('uid', None):
                     raise ValueError('You cannot delete yourself.')
                 web.user_del(form.get('uid', None))
+                web.options.audit_exec(req, res, web)
                 return dict(success='delete user')
             except Exception as e:
                 return dict(error=str(e))
@@ -93,6 +98,7 @@ class Users(feature.WebFeature):
             form = await req.json()
             try:
                 apikey = web.apikey_add(form)
+                web.options.audit_exec(req, res, web)
                 return dict(success=apikey)
             except Exception as e:
                 return dict(error=str(e))
@@ -107,6 +113,7 @@ class Users(feature.WebFeature):
             form = await req.json()
             try:
                 apikey = web.apikey_del(form)
+                web.options.audit_exec(req, res, web)
                 return dict(success=apikey)
             except Exception as e:
                 return dict(error=str(e))
@@ -119,6 +126,7 @@ class Users(feature.WebFeature):
             if web.signin.get_data() is None:
                 return dict(error='signin_file_data is None.')
             try:
+                web.options.audit_exec(req, res, web)
                 return web.group_list(None)
             except Exception as e:
                 return dict(error=str(e))
@@ -133,6 +141,7 @@ class Users(feature.WebFeature):
             form = await req.json()
             try:
                 web.group_add(form)
+                web.options.audit_exec(req, res, web)
                 return dict(success='add group')
             except Exception as e:
                 return dict(error=str(e))
@@ -147,6 +156,7 @@ class Users(feature.WebFeature):
             form = await req.json()
             try:
                 web.group_edit(form)
+                web.options.audit_exec(req, res, web)
                 return dict(success='edit group')
             except Exception as e:
                 return dict(error=str(e))
@@ -163,6 +173,7 @@ class Users(feature.WebFeature):
                 if form.get('gid', None) in req.session['signin']['gids']:
                     raise ValueError('You cannot delete yourself group.')
                 web.group_del(form.get('gid', None))
+                web.options.audit_exec(req, res, web)
                 return dict(success='delete group')
             except Exception as e:
                 return dict(error=str(e))
@@ -214,6 +225,7 @@ class Users(feature.WebFeature):
             try:
                 ret = web.change_password(form.get('user_name', None), form.get('password', None),
                                     form.get('new_password', None), form.get('confirm_password', None))
+                web.options.audit_exec(req, res, web)
                 return ret
             except Exception as e:
                 return dict(error=str(e))