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

cmdbox/app/features/web/cmdbox_web_filer download.py

@@ -1,42 +1,43 @@
-from cmdbox.app import common
-from cmdbox.app.commons import convert
-from cmdbox.app.features.web import cmdbox_web_exec_cmd
-from cmdbox.app.web import Web
-from fastapi import FastAPI, Request, Response, HTTPException
-from fastapi.responses import StreamingResponse
-from pathlib import Path
-import io
-import urllib.parse
-
-
-class FilerDownload(cmdbox_web_exec_cmd.ExecCmd):
-    def route(self, web:Web, app:FastAPI) -> None:
-        """
-        webモードのルーティングを設定します
-
-        Args:
-            web (Web): Webオブジェクト
-            app (FastAPI): FastAPIオブジェクト
-        """
-        @app.get('/filer/download/{constr:str}', response_class=StreamingResponse)
-        async def filer_download(constr:str, 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)
-            try:
-                host, port, svname, password, path, scope, img_thumbnail = convert.b64str2str(constr).split('\t')
-                path = urllib.parse.unquote(path)
-                data_dir = web.data if scope == 'client' else Path.cwd()
-                data_dir = None if scope == 'server' else data_dir
-                opt = dict(host=host, port=port, svname=svname, password=password, svpath=path, scope=scope,
-                           img_thumbnail=img_thumbnail, mode='client', cmd='file_download', client_data=data_dir, stdout_log=False)
-                opt['capture_stdout'] = nothread = True
-                ret = self.exec_cmd(req, res, web, 'file_download', opt, nothread, self.appcls)
-                if len(ret) == 0 or 'success' not in ret[0] or 'data' not in ret[0]['success']:
-                    return common.to_str(ret)
-                mime = ret[0]['success']['mime_type']
-                return StreamingResponse(io.BytesIO(convert.b64str2bytes(ret[0]['success']['data'])),
-                                         headers={'Cache-Control':'no-cache'},
-                                         media_type=mime)
-            except Exception as e:
-                raise HTTPException(status_code=404, detail='Missing specified file or not an image.') from e
+from cmdbox.app import common
+from cmdbox.app.commons import convert
+from cmdbox.app.features.web import cmdbox_web_exec_cmd
+from cmdbox.app.web import Web
+from fastapi import FastAPI, Request, Response, HTTPException
+from fastapi.responses import StreamingResponse
+from pathlib import Path
+import io
+import urllib.parse
+
+
+class FilerDownload(cmdbox_web_exec_cmd.ExecCmd):
+    def route(self, web:Web, app:FastAPI) -> None:
+        """
+        webモードのルーティングを設定します
+
+        Args:
+            web (Web): Webオブジェクト
+            app (FastAPI): FastAPIオブジェクト
+        """
+        @app.get('/filer/download/{constr:str}', response_class=StreamingResponse)
+        async def filer_download(constr:str, 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)
+            try:
+                host, port, svname, password, path, scope, img_thumbnail = convert.b64str2str(constr).split('\t')
+                path = urllib.parse.unquote(path)
+                data_dir = web.data if scope == 'client' else Path.cwd()
+                data_dir = None if scope == 'server' else data_dir
+                opt = dict(host=host, port=port, svname=svname, password=password, svpath=path, scope=scope,
+                           img_thumbnail=img_thumbnail, mode='client', cmd='file_download', client_data=data_dir, stdout_log=False)
+                opt['capture_stdout'] = nothread = True
+                web.options.audit_exec(req, res, web)
+                ret = self.exec_cmd(req, res, web, 'file_download', opt, nothread, self.appcls)
+                if len(ret) == 0 or 'success' not in ret[0] or 'data' not in ret[0]['success']:
+                    return common.to_str(ret)
+                mime = ret[0]['success']['mime_type']
+                return StreamingResponse(io.BytesIO(convert.b64str2bytes(ret[0]['success']['data'])),
+                                         headers={'Cache-Control':'no-cache'},
+                                         media_type=mime)
+            except Exception as e:
+                raise HTTPException(status_code=404, detail='Missing specified file or not an image.') from e

cmdbox/app/features/web/cmdbox_web_filer.py

@@ -27,6 +27,7 @@ class Filer(feature.WebFeature):
             if signin is not None:
                 return signin
             res.headers['Access-Control-Allow-Origin'] = '*'
+            web.options.audit_exec(req, res, web)
             return web.filer_html_data
 
     def toolmenu(self, web:Web) -> Dict[str, Any]:

cmdbox/app/features/web/cmdbox_web_filer_upload.py

@@ -1,64 +1,65 @@
-from cmdbox.app.features.web import cmdbox_web_exec_cmd
-from cmdbox.app.web import Web
-from fastapi import FastAPI, Request, Response, HTTPException
-from fastapi.responses import PlainTextResponse
-from pathlib import Path
-from starlette.datastructures import UploadFile
-import tempfile
-import shutil
-
-
-class FilerUpload(cmdbox_web_exec_cmd.ExecCmd):
-    def route(self, web:Web, app:FastAPI) -> None:
-        """
-        webモードのルーティングを設定します
-
-        Args:
-            web (Web): Webオブジェクト
-            app (FastAPI): FastAPIオブジェクト
-        """
-        @app.post('/filer/upload', response_class=PlainTextResponse)
-        async def filer_upload(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)
-            return await self.filer_upload(web, req, res)
-
-    async def filer_upload(self, web:Web, req:Request, res:Response) -> str:
-        """
-        ファイルをアップロードする
-
-        Args:
-            web (Web): Webオブジェクト
-            req (Request): リクエスト
-            res (Response): レスポンス
-        
-        Returns:
-            str: 結果
-        """
-        q = req.query_params
-        svpath = q['svpath']
-        web.logger.info(f"filer_upload: svpath={svpath}")
-        opt = dict(mode='client', cmd='file_upload',
-                   host=q['host'], port=q['port'], password=q['password'], svname=q['svname'],
-                   scope=q["scope"], client_data=q['client_data'], orverwrite=('orverwrite' in q))
-        form = await req.form()
-        with tempfile.TemporaryDirectory() as tmpdir:
-            for _, fv in form.multi_items():
-                if not isinstance(fv, UploadFile): continue
-                raw_filename = fv.filename.replace('\\','/').replace('//','/')
-                raw_filename = raw_filename if not raw_filename.startswith('/') else raw_filename[1:]
-                upload_file:Path = Path(tmpdir) / raw_filename
-                if not upload_file.parent.exists():
-                    upload_file.parent.mkdir(parents=True)
-                opt['svpath'] = str(svpath / Path(raw_filename).parent)
-                opt['upload_file'] = str(upload_file).replace('"','')
-                opt['capture_stdout'] = True
-                shutil.copyfileobj(fv.file, Path(opt['upload_file']).open('wb'))
-                ret = self.exec_cmd(req, res, web, "file_upload", opt, nothread=True)
-                if type(ret) is dict and 'success' not in ret:
-                    return str(ret)
-                if type(ret) is list and (len(ret) == 0 or 'success' not in ret[0]):
-                    return str(ret)
-        return 'upload success'
-        #return f'upload {upload.filename}'
+from cmdbox.app.features.web import cmdbox_web_exec_cmd
+from cmdbox.app.web import Web
+from fastapi import FastAPI, Request, Response, HTTPException
+from fastapi.responses import PlainTextResponse
+from pathlib import Path
+from starlette.datastructures import UploadFile
+import tempfile
+import shutil
+
+
+class FilerUpload(cmdbox_web_exec_cmd.ExecCmd):
+    def route(self, web:Web, app:FastAPI) -> None:
+        """
+        webモードのルーティングを設定します
+
+        Args:
+            web (Web): Webオブジェクト
+            app (FastAPI): FastAPIオブジェクト
+        """
+        @app.post('/filer/upload', response_class=PlainTextResponse)
+        async def filer_upload(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)
+            return await self.filer_upload(web, req, res)
+
+    async def filer_upload(self, web:Web, req:Request, res:Response) -> str:
+        """
+        ファイルをアップロードする
+
+        Args:
+            web (Web): Webオブジェクト
+            req (Request): リクエスト
+            res (Response): レスポンス
+        
+        Returns:
+            str: 結果
+        """
+        q = req.query_params
+        svpath = q['svpath']
+        web.logger.info(f"filer_upload: svpath={svpath}")
+        opt = dict(mode='client', cmd='file_upload',
+                   host=q['host'], port=q['port'], password=q['password'], svname=q['svname'],
+                   scope=q["scope"], client_data=q['client_data'], orverwrite=('orverwrite' in q))
+        form = await req.form()
+        with tempfile.TemporaryDirectory() as tmpdir:
+            for _, fv in form.multi_items():
+                if not isinstance(fv, UploadFile): continue
+                raw_filename = fv.filename.replace('\\','/').replace('//','/')
+                raw_filename = raw_filename if not raw_filename.startswith('/') else raw_filename[1:]
+                upload_file:Path = Path(tmpdir) / raw_filename
+                if not upload_file.parent.exists():
+                    upload_file.parent.mkdir(parents=True)
+                opt['svpath'] = str(svpath / Path(raw_filename).parent)
+                opt['upload_file'] = str(upload_file).replace('"','')
+                opt['capture_stdout'] = True
+                shutil.copyfileobj(fv.file, Path(opt['upload_file']).open('wb'))
+                web.options.audit_exec(req, res, web)
+                ret = self.exec_cmd(req, res, web, "file_upload", opt, nothread=True)
+                if type(ret) is dict and 'success' not in ret:
+                    return str(ret)
+                if type(ret) is list and (len(ret) == 0 or 'success' not in ret[0]):
+                    return str(ret)
+        return 'upload success'
+        #return f'upload {upload.filename}'

cmdbox/app/features/web/cmdbox_web_gui.py

@@ -1,165 +1,166 @@
-from cmdbox import version
-from cmdbox.app import common, feature
-from cmdbox.app.web import Web
-from fastapi import FastAPI, Request, Response, HTTPException
-from fastapi.responses import HTMLResponse, PlainTextResponse, RedirectResponse
-from typing import Dict, Any
-import logging
-
-
-class Gui(feature.WebFeature):
-    def __init__(self, appcls, ver):
-        super().__init__(appcls=appcls, ver=ver)
-        self.version_info = [dict(tabid='versions_cmdbox', title=version.__appid__,
-                                  thisapp=True if version.__appid__ == ver.__appid__ else False,
-                                  icon=f'assets/cmdbox/icon.png', url='versions_cmdbox')]
-
-    def route(self, web:Web, app:FastAPI) -> None:
-        """
-        webモードのルーティングを設定します
-
-        Args:
-            web (Web): Webオブジェクト
-            app (FastAPI): FastAPIオブジェクト
-        """
-        if web.gui_html is not None:
-            if not web.gui_html.is_file():
-                raise FileNotFoundError(f'gui_html is not found. ({web.gui_html})')
-            with open(web.gui_html, 'r', encoding='utf-8') as f:
-                web.gui_html_data = f.read()
-
-        @app.get('/', response_class=HTMLResponse)
-        async def index(req:Request, res:Response):
-            return RedirectResponse(url='/gui')
-
-        @app.get('/gui', response_class=HTMLResponse)
-        @app.post('/gui', response_class=HTMLResponse)
-        async def gui(req:Request, res:Response):
-            signin = web.signin.check_signin(req, res)
-            if signin is not None:
-                return signin
-            res.headers['Access-Control-Allow-Origin'] = '*'
-            return web.gui_html_data
-
-        @app.get('/signin/gui/appid', response_class=PlainTextResponse)
-        @app.get('/gui/appid', response_class=PlainTextResponse)
-        async def appid(req:Request, res:Response):
-            return self.ver.__appid__
-
-        @app.get('/gui/version_info')
-        async def version_info(req:Request, res:Response):
-            return self.version_info
-
-        @app.get('/gui/user_info')
-        async def user_info(req:Request, res:Response):
-            if 'signin' not in req.session:
-                raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
-            if 'name' not in req.session['signin']:
-                raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
-            name = req.session['signin']['name']
-            try:
-                users = web.user_list(name)
-                if users is None or len(users) == 0:
-                    return dict(warn='User information is not found.')
-                return users[0]
-            except Exception as e:
-                return dict(error=f'{e}')
-
-        @app.get('/gui/filemenu')
-        async def filemenu(req:Request, res:Response):
-            return web.filemenu
-
-        @app.get('/gui/toolmenu')
-        async def toolmenu(req:Request, res:Response):
-            ret = dict()
-            for k, v in web.toolmenu.items():
-                path_jadge = web.signin.check_path(req, v['href'])
-                if path_jadge is not None:
-                    continue
-                ret[k] = v
-            return ret
-
-        @app.get('/gui/viewmenu')
-        async def viewmenu(req:Request, res:Response):
-            return web.viewmenu
-
-        @app.get('/gui/aboutmenu')
-        async def aboutmenu(req:Request, res:Response):
-            return web.aboutmenu
-
-    def callback_console_modal_log_func(self, web:Web, output:Dict[str, Any]):
-        """
-        コンソールモーダルにログを出力する
-
-        Args:
-            web (Web): Webオブジェクト
-            output (Dict[str, Any]): 出力
-        """
-        if web.logger.level == logging.DEBUG:
-            output_str = common.to_str(output, slise=100)
-            web.logger.debug(f"web.callback_console_modal_log_func: output={output_str}")
-        web.cb_queue.put(('js_console_modal_log_func', None, output))
-
-    def callback_return_cmd_exec_func(self, web:Web, title:str, output:Dict[str, Any]):
-        """
-        コマンド実行結果を返す
-
-        Args:
-            web (Web): Webオブジェクト
-            title (str): タイトル
-            output (Dict[str, Any]): 出力
-        """
-        if web.logger.level == logging.DEBUG:
-            output_str = common.to_str(output, slise=100)
-            web.logger.debug(f"web.callback_return_cmd_exec_func: output={output_str}")
-        web.cb_queue.put(('js_return_cmd_exec_func', title, output))
-
-    def callback_return_pipe_exec_func(self, web:Web, title:str, output:Dict[str, Any]):
-        """
-        パイプライン実行結果を返す
-
-        Args:
-            web (Web): Webオブジェクト
-            title (str): タイトル
-            output (Dict[str, Any]): 出力
-        """
-        if web.logger.level == logging.DEBUG:
-            output_str = common.to_str(output, slise=100)
-            web.logger.debug(f"web.callback_return_pipe_exec_func: title={title}, output={output_str}")
-        web.cb_queue.put(('js_return_pipe_exec_func', title, output))
-
-    def callback_return_stream_log_func(self, web:Web, output:Dict[str, Any]):
-        """
-        ストリームログを返す
-
-        Args:
-            web (Web): Webオブジェクト
-            output (Dict[str, Any]): 出力
-        """
-        if web.logger.level == logging.DEBUG:
-            output_str = common.to_str(output, slise=100)
-            web.logger.debug(f"web.callback_return_stream_log_func: output={output_str}")
-        web.cb_queue.put(('js_return_stream_log_func', None, output))
-
-    def mk_curl_fileup(self, web:Web, cmd_opt:Dict[str, Any]) -> str:
-        """
-        curlコマンド文字列を作成する
-
-        Args:
-            web (Web): Webオブジェクト
-            cmd_opt (dict): コマンドのオプション
-        
-        Returns:
-            str: curlコマンド文字列
-        """
-        if 'mode' not in cmd_opt or 'cmd' not in cmd_opt:
-            return ""
-        curl_fileup = set()
-        for ref in web.options.get_cmd_choices(cmd_opt['mode'], cmd_opt['cmd'], True):
-            if 'fileio' not in ref or ref['fileio'] != 'in':
-                continue
-            if ref['opt'] in cmd_opt and cmd_opt[ref['opt']] != '':
-                curl_fileup.add(f'-F "{ref["opt"]}=@<{ref["opt"]}>"')
-        if 'stdin' in cmd_opt and cmd_opt['stdin']:
-            curl_fileup.add(f'-F "input_file=@<input_file>"')
-        return " ".join(curl_fileup)
+from cmdbox import version
+from cmdbox.app import common, feature
+from cmdbox.app.web import Web
+from fastapi import FastAPI, Request, Response, HTTPException
+from fastapi.responses import HTMLResponse, PlainTextResponse, RedirectResponse
+from typing import Dict, Any
+import logging
+
+
+class Gui(feature.WebFeature):
+    def __init__(self, appcls, ver):
+        super().__init__(appcls=appcls, ver=ver)
+        self.version_info = [dict(tabid='versions_cmdbox', title=version.__appid__,
+                                  thisapp=True if version.__appid__ == ver.__appid__ else False,
+                                  icon=f'assets/cmdbox/icon.png', url='versions_cmdbox')]
+
+    def route(self, web:Web, app:FastAPI) -> None:
+        """
+        webモードのルーティングを設定します
+
+        Args:
+            web (Web): Webオブジェクト
+            app (FastAPI): FastAPIオブジェクト
+        """
+        if web.gui_html is not None:
+            if not web.gui_html.is_file():
+                raise FileNotFoundError(f'gui_html is not found. ({web.gui_html})')
+            with open(web.gui_html, 'r', encoding='utf-8') as f:
+                web.gui_html_data = f.read()
+
+        @app.get('/', response_class=HTMLResponse)
+        async def index(req:Request, res:Response):
+            return RedirectResponse(url='/gui')
+
+        @app.get('/gui', response_class=HTMLResponse)
+        @app.post('/gui', response_class=HTMLResponse)
+        async def gui(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.gui_html_data
+
+        @app.get('/signin/gui/appid', response_class=PlainTextResponse)
+        @app.get('/gui/appid', response_class=PlainTextResponse)
+        async def appid(req:Request, res:Response):
+            return self.ver.__appid__
+
+        @app.get('/gui/version_info')
+        async def version_info(req:Request, res:Response):
+            return self.version_info
+
+        @app.get('/gui/user_info')
+        async def user_info(req:Request, res:Response):
+            if 'signin' not in req.session:
+                raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
+            if 'name' not in req.session['signin']:
+                raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
+            name = req.session['signin']['name']
+            try:
+                users = web.user_list(name)
+                if users is None or len(users) == 0:
+                    return dict(warn='User information is not found.')
+                return users[0]
+            except Exception as e:
+                return dict(error=f'{e}')
+
+        @app.get('/gui/filemenu')
+        async def filemenu(req:Request, res:Response):
+            return web.filemenu
+
+        @app.get('/gui/toolmenu')
+        async def toolmenu(req:Request, res:Response):
+            ret = dict()
+            for k, v in web.toolmenu.items():
+                path_jadge = web.signin.check_path(req, v['href'])
+                if path_jadge is not None:
+                    continue
+                ret[k] = v
+            return ret
+
+        @app.get('/gui/viewmenu')
+        async def viewmenu(req:Request, res:Response):
+            return web.viewmenu
+
+        @app.get('/gui/aboutmenu')
+        async def aboutmenu(req:Request, res:Response):
+            return web.aboutmenu
+
+    def callback_console_modal_log_func(self, web:Web, output:Dict[str, Any]):
+        """
+        コンソールモーダルにログを出力する
+
+        Args:
+            web (Web): Webオブジェクト
+            output (Dict[str, Any]): 出力
+        """
+        if web.logger.level == logging.DEBUG:
+            output_str = common.to_str(output, slise=100)
+            web.logger.debug(f"web.callback_console_modal_log_func: output={output_str}")
+        web.cb_queue.put(('js_console_modal_log_func', None, output))
+
+    def callback_return_cmd_exec_func(self, web:Web, title:str, output:Dict[str, Any]):
+        """
+        コマンド実行結果を返す
+
+        Args:
+            web (Web): Webオブジェクト
+            title (str): タイトル
+            output (Dict[str, Any]): 出力
+        """
+        if web.logger.level == logging.DEBUG:
+            output_str = common.to_str(output, slise=100)
+            web.logger.debug(f"web.callback_return_cmd_exec_func: output={output_str}")
+        web.cb_queue.put(('js_return_cmd_exec_func', title, output))
+
+    def callback_return_pipe_exec_func(self, web:Web, title:str, output:Dict[str, Any]):
+        """
+        パイプライン実行結果を返す
+
+        Args:
+            web (Web): Webオブジェクト
+            title (str): タイトル
+            output (Dict[str, Any]): 出力
+        """
+        if web.logger.level == logging.DEBUG:
+            output_str = common.to_str(output, slise=100)
+            web.logger.debug(f"web.callback_return_pipe_exec_func: title={title}, output={output_str}")
+        web.cb_queue.put(('js_return_pipe_exec_func', title, output))
+
+    def callback_return_stream_log_func(self, web:Web, output:Dict[str, Any]):
+        """
+        ストリームログを返す
+
+        Args:
+            web (Web): Webオブジェクト
+            output (Dict[str, Any]): 出力
+        """
+        if web.logger.level == logging.DEBUG:
+            output_str = common.to_str(output, slise=100)
+            web.logger.debug(f"web.callback_return_stream_log_func: output={output_str}")
+        web.cb_queue.put(('js_return_stream_log_func', None, output))
+
+    def mk_curl_fileup(self, web:Web, cmd_opt:Dict[str, Any]) -> str:
+        """
+        curlコマンド文字列を作成する
+
+        Args:
+            web (Web): Webオブジェクト
+            cmd_opt (dict): コマンドのオプション
+        
+        Returns:
+            str: curlコマンド文字列
+        """
+        if 'mode' not in cmd_opt or 'cmd' not in cmd_opt:
+            return ""
+        curl_fileup = set()
+        for ref in web.options.get_cmd_choices(cmd_opt['mode'], cmd_opt['cmd'], True):
+            if 'fileio' not in ref or ref['fileio'] != 'in':
+                continue
+            if ref['opt'] in cmd_opt and cmd_opt[ref['opt']] != '':
+                curl_fileup.add(f'-F "{ref["opt"]}=@<{ref["opt"]}>"')
+        if 'stdin' in cmd_opt and cmd_opt['stdin']:
+            curl_fileup.add(f'-F "input_file=@<input_file>"')
+        return " ".join(curl_fileup)