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

cmdbox/app/common.py

@@ -4,6 +4,8 @@ from cmdbox.app.commons import convert, module, loghandler
 from cryptography.fernet import Fernet
 from pathlib import Path
 from pkg_resources import resource_string
+from rich.logging import RichHandler
+from rich.console import Console
 from tabulate import tabulate
 from typing import List, Tuple, Dict, Any
 import asyncio
@@ -91,6 +93,53 @@ def save_yml(yml_path:Path, data:dict) -> None:
     with open(yml_path, 'w') as f:
         yaml.dump(data, f, default_flow_style=False, sort_keys=False)
 
+def reset_logger(name:str, stderr:bool=False, fmt:str='[%(asctime)s] %(levelname)s - %(message)s', datefmt:str='%Y-%m-%d %H:%M:%S') -> None:
+    """
+    指定されたロガーのハンドラをクリアし、新しいハンドラを追加します。
+    Args:
+        name (str): ロガーの名前
+        stderr (bool, optional): 標準エラー出力を使用するかどうか. Defaults to False.
+        fmt (str, optional): ログフォーマット. Defaults to '[%(asctime)s] %(levelname)s - %(message)s'.
+        datefmt (str, optional): 日時フォーマット. Defaults to '%Y-%m-%d %H:%M:%S'.
+    """
+    logger = logging.getLogger(name)
+    logger.handlers.clear()
+    logger.propagate = False
+    logger.addHandler(create_log_handler(stderr, fmt, datefmt))
+
+def create_log_handler(stderr:bool=False, fmt:str='[%(asctime)s] %(levelname)s - %(message)s', datefmt:str='%Y-%m-%d %H:%M:%S') -> logging.Handler:
+    """
+    ログハンドラを生成します。
+
+    Args:
+        stderr (bool, optional): 標準エラー出力を使用するかどうか. Defaults to False.
+        fmt (str, optional): ログフォーマット. Defaults to '[%(asctime)s] %(levelname)s - %(message)s'.
+        datefmt (str, optional): 日時フォーマット. Defaults to '%Y-%m-%d %H:%M:%S'.
+    Returns:
+        logging.Handler: ログハンドラ
+    """
+    formatter = logging.Formatter(fmt, datefmt)
+    #handler = RichHandler(console=Console(stderr=stderr), show_path=False, omit_repeated_times=False,
+    #                      tracebacks_word_wrap=False, log_time_format='[%Y-%m-%d %H:%M]')
+    handler = loghandler.ColorfulStreamHandler(sys.stdout if not stderr else sys.stderr)
+    handler.setFormatter(formatter)
+    return handler
+
+def create_console(stderr:bool=False, file=None) -> Console:
+    """
+    コンソールを生成します。
+
+    Args:
+        stderr (bool, optional): 標準エラー出力を使用するかどうか. Defaults to False.
+        file (file, optional): 出力先のファイル. Defaults to None.
+    Returns:
+        Console: コンソール
+    """
+    console = Console(height=False,
+                      soft_wrap=False, stderr=stderr, file=file, log_time=True, log_path=False, log_time_format='[%Y-%m-%d %H:%M:%S]')
+    #console = Console(soft_wrap=True, stderr=stderr, file=file, log_time=True, log_path=False, log_time_format='[%Y-%m-%d %H:%M:%S]')
+    return console
+
 def default_logger(debug:bool=False, ver=version, webcall:bool=False) -> logging.Logger:
     """
     デフォルトのロガーを生成します。
@@ -105,12 +154,11 @@ def default_logger(debug:bool=False, ver=version, webcall:bool=False) -> logging
     """
     logger = logging.getLogger(ver.__appid__)
     if not webcall:
-        formatter = logging.Formatter('%(levelname)s[%(asctime)s] - %(message)s')
-        handler = loghandler.ColorfulStreamHandler(sys.stdout)
+        handler = create_log_handler()
         handler.setLevel(logging.DEBUG if debug else logging.INFO)
-        handler.setFormatter(formatter)
         logger.addHandler(handler)
     logger.setLevel(logging.DEBUG if debug else logging.INFO)
+    logger.propagate = False
     return logger
 
 def load_config(mode:str, debug:bool=False, data=HOME_DIR, webcall:bool=False, ver=version) -> Tuple[logging.Logger, dict]:

cmdbox/app/commons/loghandler.py

@@ -1,3 +1,6 @@
+from rich.console import Console
+from rich import highlighter
+from rich.theme import Theme
 import re
 import logging
 import logging.handlers
@@ -77,25 +80,71 @@ def colorize_msg(msg) -> str:
     return msg
 
 level_mapping = {
-    logging.DEBUG:   f"{colorize('DEBUG', Colors.Bold, Colors.Cyan)}:    ",
-    logging.INFO:    f"{colorize('INFO', Colors.Bold, Colors.Green)}:     ",
-    logging.WARNING: f"{colorize('WARNING', Colors.Bold, Colors.Yellow)}:  ",
-    logging.ERROR:   f"{colorize('ERROR', Colors.Bold, Colors.Red)}:    ",
-    logging.CRITICAL:f"{colorize('CRITICAL', Colors.Bold, Colors.LightGray, Colors.BackgroundRed)}: "}
+    logging.DEBUG:   f"{colorize('DEBUG', Colors.Bold, Colors.Cyan)}",
+    logging.INFO:    f"{colorize('INFO', Colors.Bold, Colors.Green)} ",
+    logging.WARNING: f"{colorize('WARN', Colors.Bold, Colors.Yellow)} ",
+    logging.ERROR:   f"{colorize('ERROR', Colors.Bold, Colors.Red)}",
+    logging.CRITICAL:f"{colorize('FATAL', Colors.Bold, Colors.LightGray, Colors.BackgroundRed)}"}
 
 level_mapping_nc = {
-    logging.DEBUG:   f"DEBUG:    ",
-    logging.INFO:    f"INFO:     ",
-    logging.WARNING: f"WARNING:  ",
-    logging.ERROR:   f"ERROR:    ",
-    logging.CRITICAL:f"CRITICAL: "}
+    logging.DEBUG:   f"DEBUG",
+    logging.INFO:    f"INFO ",
+    logging.WARNING: f"WARN ",
+    logging.ERROR:   f"ERROR",
+    logging.CRITICAL:f"FATAL"}
+
+theme=Theme({
+    "repr.log_debug": "bold cyan",
+    "repr.log_info": "bold green",
+    "repr.log_warn": "bold Yellow",
+    "repr.log_error": "bold red",
+    "repr.log_fatal": "bold red reverse",
+    "repr.log_product": "dodger_blue2 reverse",
+    "repr.log_success": "green",})
+
+class LogLevelHighlighter(highlighter.ReprHighlighter):
+    def __init__(self):
+        #self.highlights = []
+        self.highlights.append(r"(?P<log_debug>DEBUG)")
+        self.highlights.append(r"(?P<log_info>INFO)")
+        self.highlights.append(r"(?P<log_warn>WARN|WARNING|WARN|CAUTION|NOTICE|STOP|DISCONNECTED|DENY)")
+        self.highlights.append(r"(?P<log_error>ERROR|ALERT|ABORT|FAILED)")
+        self.highlights.append(r"(?P<log_fatal>FATAL|CRITICAL)")
+        self.highlights.append(r"(?P<log_product>CMDBOX|IINFER|USOUND|GAIAN|GAIC|WITSHAPE)")
+        self.highlights.append(r"(?P<log_success>SUCCESS|OK|PASSED|DONE|COMPLETE|START|FINISH|OPEN|CONNECTED|ALLOW|EXEC)")
+        """
+        self.highlights.append(r"(?P<tag_start><)(?P<tag_name>[-\w.:|]*)(?P<tag_contents>[\w\W]*)(?P<tag_end>>)")
+        self.highlights.append(r'(?P<attrib_name>[\w_]{1,50})=(?P<attrib_value>"?[\w_]+"?)?')
+        self.highlights.append(r"(?P<brace>[][{}()])")
+        self.highlights.append(highlighter._combine_regex(
+            r"(?P<ipv4>[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})",
+            r"(?P<ipv6>([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4})",
+            r"(?P<eui64>(?:[0-9A-Fa-f]{1,2}-){7}[0-9A-Fa-f]{1,2}|(?:[0-9A-Fa-f]{1,2}:){7}[0-9A-Fa-f]{1,2}|(?:[0-9A-Fa-f]{4}\.){3}[0-9A-Fa-f]{4})",
+            r"(?P<eui48>(?:[0-9A-Fa-f]{1,2}-){5}[0-9A-Fa-f]{1,2}|(?:[0-9A-Fa-f]{1,2}:){5}[0-9A-Fa-f]{1,2}|(?:[0-9A-Fa-f]{4}\.){2}[0-9A-Fa-f]{4})",
+            r"(?P<uuid>[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12})",
+            r"(?P<call>[\w.]*?)\(",
+            r"\b(?P<bool_true>True)\b|\b(?P<bool_false>False)\b|\b(?P<none>None)\b",
+            r"(?P<ellipsis>\.\.\.)",
+            r"(?P<number_complex>(?<!\w)(?:\-?[0-9]+\.?[0-9]*(?:e[-+]?\d+?)?)(?:[-+](?:[0-9]+\.?[0-9]*(?:e[-+]?\d+)?))?j)",
+            r"(?P<number>(?<!\w)\-?[0-9]+\.?[0-9]*(e[-+]?\d+?)?\b|0x[0-9a-fA-F]*)",
+            r"(?P<path>\B(/[-\w._+]+)*\/)(?P<filename>[-\w._+]*)?",
+            r"(?<![\\\w])(?P<str>b?'''.*?(?<!\\)'''|b?'.*?(?<!\\)'|b?\"\"\".*?(?<!\\)\"\"\"|b?\".*?(?<!\\)\")",
+            r"(?P<url>(file|https|http|ws|wss)://[-0-9a-zA-Z$_+!`(),.?/;:&=%#~@]*)",
+        ))
+        """
+        self.highlights = [re.compile(h, re.IGNORECASE) for h in self.highlights]
 
 class ColorfulStreamHandler(logging.StreamHandler):
+    console = Console(soft_wrap=True, height=True, highlighter=LogLevelHighlighter(), theme=theme)
+
     def emit(self, record: logging.LogRecord) -> None:
-        record.levelname = level_mapping[record.levelno]
+        #record.levelname = level_mapping[record.levelno]
         #record.asctime = colorize(record.asctime, Colors.Bold)
-        record.msg = colorize_msg(record.msg)
-        super().emit(record)
+        #record.msg = colorize_msg(record.msg)
+        #super().emit(record)
+        record.levelname = level_mapping_nc[record.levelno]
+        record.msg = self.format(record)
+        self.console.print(record.msg)
 
 class TimedRotatingFileHandler(logging.handlers.TimedRotatingFileHandler):
     def emit(self, record: logging.LogRecord) -> None:

cmdbox/app/edge.py

@@ -1,5 +1,4 @@
-from cmdbox.app import common, feature, options, web
-from cmdbox.app.auth import signin, signin_saml, azure_signin, azure_signin_saml, github_signin, google_signin
+from cmdbox.app import common, edge_tool, feature, options, web
 from cmdbox.app.commons import convert
 from cmdbox.app.options import Options
 from fastapi import FastAPI, Request, HTTPException
@@ -27,7 +26,7 @@ class Edge(object):
         self.appcls = appcls
         self.ver = ver
         self.options = options.Options.getInstance()
-        self.tool = Tool(logger, appcls, ver)
+        self.tool = edge_tool.Tool(logger, appcls, ver)
         if self.ver is None:
             raise ValueError('ver is None')
         if self.appcls is None:
@@ -298,7 +297,7 @@ class Edge(object):
         def _job(thevent:threading.Event, pipe_cmd, prevq:queue.Queue):
             resq:queue.Queue = pipe_cmd['resq']
             del pipe_cmd['resq']
-            tool = Tool(self.logger, self.appcls, self.ver)
+            tool = edge_tool.Tool(self.logger, self.appcls, self.ver)
             tool.set_session(self.session, self.svcert_no_verify, self.endpoint, self.icon_path, self.user_info, self.oauth2, self.saml)
             feat:feature.Feature = self.options.get_cmd_attr(pipe_cmd['mode'], pipe_cmd['cmd'], 'feature')
             while not thevent.is_set():
@@ -355,7 +354,7 @@ class Edge(object):
             for opt in opts:
                 def mkcmd(opt):
                     def _ex():
-                        tool = Tool(self.logger, self.appcls, self.ver)
+                        tool = edge_tool.Tool(self.logger, self.appcls, self.ver)
                         tool.set_session(self.session, self.svcert_no_verify, self.endpoint, self.icon_path, self.user_info, self.oauth2, self.saml)
                         feat:feature.Feature = self.options.get_cmd_attr(opt['mode'], opt['cmd'], 'feature')
                         for status, ret in feat.edgerun(opt, tool, self.logger, self.timeout):
@@ -380,7 +379,7 @@ class Edge(object):
             items = []
             items.append(pystray.MenuItem('Gui', lambda: self.tool.open_browser('/gui')))
             for k, op in opens.items():
-                def mkop(tool:Tool, href):
+                def mkop(tool:edge_tool.Tool, href):
                     return lambda: tool.open_browser(href)
                 items.append(pystray.MenuItem(op['html'], mkop(self.tool, op['href'])))
             return items
@@ -754,170 +753,3 @@ class Edge(object):
                 return 0, dict(success="Signin success.")
 
         return 1, dict(warn="unsupported auth_type.")
-
-class Tool(object):
-    def __init__(self, logger:logging.Logger, appcls=None, ver=None):
-        self.logger = logger
-        self.appcls = appcls
-        self.ver = ver
-
-    def notify(self, message:dict):
-        """
-        通知メッセージを表示します
-
-        Args:
-            message (dict): メッセージ
-        """
-        if type(message) is list:
-            message = message[0]
-        if type(message) is not dict:
-            message = {"info":str(message)}
-        if self.logger.level == logging.DEBUG:
-            self.logger.debug(f"notify: {common.to_str(message, slise=256)}")
-        try:
-            if 'success' in message and type(message['success']) == dict:
-                message = "\n".join([f"{k}:{v}" for k, v in message['success'].items()])
-                message = f'Success\n{message}'
-            else:
-                message = "\n".join([f"{k} : {v}" for k, v in message.items()])
-            import plyer
-            if hasattr(self, 'icon_path') and self.icon_path is not None:
-                plyer.notification.notify(title=self.ver.__title__, message=str(message)[:256], app_icon=str(self.icon_path))
-            else:
-                plyer.notification.notify(title=self.ver.__title__, message=str(message)[:256])
-        except Exception as e:
-            self.logger.error(f"notify error. {e}", exc_info=True)
-
-    def set_session(self, session:requests.Session, svcert_no_verify:bool, endpoint:str, icon_path:Path, user_info:Dict[str, Any], oauth2:str, saml:str):
-        """
-        セッションを設定します
-
-        Args:
-            session (requests.Session): セッション
-            svcert_no_verify (bool): サーバー証明書の検証を行わない
-            endpoint (str): エンドポイント
-            icon_path (Path): アイコン画像のパス
-            user_info (Dict[str, Any]): ユーザー情報
-            oauth2 (str): OAuth2
-        """
-        self.session = session
-        self.svcert_no_verify = svcert_no_verify
-        self.endpoint = endpoint
-        self.icon_path = icon_path
-        self.user = user_info
-        self.oauth2 = oauth2
-        self.saml = saml
-
-    def exec_cmd(self, opt:Dict[str, Any], logger:logging.Logger, timeout:int, prevres:Any=None) -> Tuple[int, Dict[str, Any]]:
-        """
-        この機能のエッジ側の実行を行います
-
-        Args:
-            opt (Dict[str, Any]): オプション
-            logger (logging.Logger): ロガー
-            timeout (int): タイムアウト時間
-            prevres (Any): 前コマンドの結果。pipeline実行の実行結果を参照する時に使用します。
-
-        Returns:
-            Tuple[int, Dict[str, Any], Any]: 終了コード, 結果
-        """
-        if logger.level == logging.DEBUG:
-            logger.debug(f"exec_cmd: {self.endpoint}/exec_cmd/{opt['title']}")
-        if prevres is not None:
-            headers = {'content-type':'application/octet-stream'}
-            prevres = common.to_str(prevres)
-            res = self.session.post(f"{self.endpoint}/exec_cmd/{opt['title']}", headers=headers, data=prevres,
-                                    verify=not self.svcert_no_verify, timeout=timeout, allow_redirects=False)
-        else:
-            res = self.session.post(f"{self.endpoint}/exec_cmd/{opt['title']}",
-                                    verify=not self.svcert_no_verify, timeout=timeout, allow_redirects=False)
-
-        if res.status_code != 200:
-            msg = dict(warn=f"Access failed. status_code={res.status_code}")
-            logger.warning(f"Access failed. status_code={res.status_code}")
-            return 1, msg
-        else:
-            ret = msg = res.json()
-            if isinstance(msg, list):
-                if len(msg) == 0:
-                    logger.warning(f"No result.")
-                    return 1, dict(warn="No result.")
-                msg = msg[0]
-            if isinstance(msg, dict) and 'success' not in msg:
-                logger.warning(f"{msg}")
-                return 1, ret
-            if logger.level == logging.DEBUG:
-                logger.debug(f"{common.to_str(ret, slise=255)}")
-            return 0, ret
-
-    def pub_result(self, title:str, output:str, timeout:int) -> Tuple[int, Dict[str, Any]]:
-        """
-        結果を公開します
-
-        Args:
-            title (str): タイトル
-            output (str): 出力
-            logger (logging.Logger): ロガー
-            timeout (int): タイムアウト時間
-
-        Returns:
-            Tuple[int, Dict[str, Any]]: 終了コード, メッセージ
-        """
-        output = common.to_str(output)
-        data = f'title={urllib.parse.quote(title)}&output={urllib.parse.quote(output)}'
-        headers = {'content-type':'application/x-www-form-urlencoded'}
-        res = self.session.post(f"{self.endpoint}/result/pub", headers=headers, data=data,
-                                verify=not self.svcert_no_verify, timeout=timeout, allow_redirects=False)
-        if res.status_code != 200:
-            msg = dict(warn=f"Access failed. status_code={res.status_code}")
-            return 1, msg
-        else:
-            msg = res.json()
-            return 0, msg
-
-    def open_browser(self, path:str) -> Tuple[int, Dict[str, str]]:
-        """
-        指定したパスをブラウザで開きます。
-        この時認証情報を含めて開きます。
-
-        Args:
-            path (str): パス
-
-        Returns:
-            Tuple[int, Dict[str, str]]: 終了コード, メッセージ
-        """
-        path = f"/{path}" if not path.startswith('/') else path
-        if not hasattr(self, 'user'):
-            webbrowser.open(f"{self.endpoint}{path}")
-            return 0, dict(success="Open browser.")
-        token = dict(auth_type=self.user['auth_type'])
-        if self.user['auth_type'] == "noauth":
-            webbrowser.open(f"{self.endpoint}{path}")
-            return 0, dict(success="Open browser.")
-        elif self.user['auth_type'] == "idpw":
-            hashed = self.user['password'] if self.user['hash']=='plain' else common.hash_password(self.user['password'], self.user['hash'])
-            token = dict(**token, **dict(user=self.user['name'], token=common.encrypt(path, hashed)))
-            token = convert.str2b64str(common.to_str(token))
-            webbrowser.open(f"{self.endpoint}/dosignin_token/{token}{path}")
-            return 0, dict(success="Open browser.")
-        elif self.user['auth_type'] == "apikey":
-            hashed = common.hash_password(self.user['apikey'], 'sha1')
-            token = dict(**token, **dict(user=self.user['name'], token=common.encrypt(path, hashed)))
-            token = convert.str2b64str(common.to_str(token))
-            webbrowser.open(f"{self.endpoint}/dosignin_token/{token}{path}")
-            return 0, dict(success="Open browser.")
-        elif self.user['auth_type'] == "oauth2":
-            if self.oauth2 == 'google':
-                webbrowser.open(f"{self.endpoint}/oauth2/google/session/{self.user['access_token']}{path}")
-                return 0, dict(success="Open browser.")
-            if self.oauth2 == 'github':
-                webbrowser.open(f"{self.endpoint}/oauth2/github/session/{self.user['access_token']}{path}")
-                return 0, dict(success="Open browser.")
-            if self.oauth2 == 'azure':
-                webbrowser.open(f"{self.endpoint}/oauth2/azure/session/{self.user['access_token']}{path}")
-                return 0, dict(success="Open browser.")
-        elif self.user['auth_type'] == "saml":
-            if self.saml == 'azure':
-                webbrowser.open(f"{self.endpoint}/saml/azure/session/{self.user['saml_token']}{path}")
-                return 0, dict(success="Open browser.")
-        return 1, dict(warn="unsupported auth_type.")

cmdbox/app/edge_tool.py

@@ -0,0 +1,177 @@
+from cmdbox.app import common
+from cmdbox.app.commons import convert
+from pathlib import Path
+from typing import Dict, Any, Tuple
+import logging
+import requests
+import webbrowser
+import urllib.parse
+import urllib3
+
+
+class Tool(object):
+    def __init__(self, logger:logging.Logger, appcls=None, ver=None):
+        self.logger = logger
+        self.appcls = appcls
+        self.ver = ver
+
+    def notify(self, message:dict):
+        """
+        通知メッセージを表示します
+
+        Args:
+            message (dict): メッセージ
+        """
+        if type(message) is list:
+            message = message[0]
+        if type(message) is not dict:
+            message = {"info":str(message)}
+        if self.logger.level == logging.DEBUG:
+            self.logger.debug(f"notify: {common.to_str(message, slise=256)}")
+        try:
+            if 'success' in message and type(message['success']) == dict:
+                message = "\n".join([f"{k}:{v}" for k, v in message['success'].items()])
+                message = f'Success\n{message}'
+            else:
+                message = "\n".join([f"{k} : {v}" for k, v in message.items()])
+            import plyer
+            if hasattr(self, 'icon_path') and self.icon_path is not None:
+                plyer.notification.notify(title=self.ver.__title__, message=str(message)[:256], app_icon=str(self.icon_path))
+            else:
+                plyer.notification.notify(title=self.ver.__title__, message=str(message)[:256])
+        except Exception as e:
+            self.logger.error(f"notify error. {e}", exc_info=True)
+
+    def set_session(self, session:requests.Session, svcert_no_verify:bool, endpoint:str, icon_path:Path, user_info:Dict[str, Any], oauth2:str, saml:str):
+        """
+        セッションを設定します
+
+        Args:
+            session (requests.Session): セッション
+            svcert_no_verify (bool): サーバー証明書の検証を行わない
+            endpoint (str): エンドポイント
+            icon_path (Path): アイコン画像のパス
+            user_info (Dict[str, Any]): ユーザー情報
+            oauth2 (str): OAuth2
+        """
+        self.session = session
+        self.svcert_no_verify = svcert_no_verify
+        self.endpoint = endpoint
+        self.icon_path = icon_path
+        self.user = user_info
+        self.oauth2 = oauth2
+        self.saml = saml
+
+    def exec_cmd(self, opt:Dict[str, Any], logger:logging.Logger, timeout:int, prevres:Any=None) -> Tuple[int, Dict[str, Any]]:
+        """
+        この機能のエッジ側の実行を行います
+
+        Args:
+            opt (Dict[str, Any]): オプション
+            logger (logging.Logger): ロガー
+            timeout (int): タイムアウト時間
+            prevres (Any): 前コマンドの結果。pipeline実行の実行結果を参照する時に使用します。
+
+        Returns:
+            Tuple[int, Dict[str, Any], Any]: 終了コード, 結果
+        """
+        if logger.level == logging.DEBUG:
+            logger.debug(f"exec_cmd: {self.endpoint}/exec_cmd/{opt['title']}")
+        if prevres is not None:
+            headers = {'content-type':'application/octet-stream'}
+            prevres = common.to_str(prevres)
+            res = self.session.post(f"{self.endpoint}/exec_cmd/{opt['title']}", headers=headers, data=prevres,
+                                    verify=not self.svcert_no_verify, timeout=timeout, allow_redirects=False)
+        else:
+            res = self.session.post(f"{self.endpoint}/exec_cmd/{opt['title']}",
+                                    verify=not self.svcert_no_verify, timeout=timeout, allow_redirects=False)
+
+        if res.status_code != 200:
+            msg = dict(warn=f"Access failed. status_code={res.status_code}")
+            logger.warning(f"Access failed. status_code={res.status_code}")
+            return 1, msg
+        else:
+            ret = msg = res.json()
+            if isinstance(msg, list):
+                if len(msg) == 0:
+                    logger.warning(f"No result.")
+                    return 1, dict(warn="No result.")
+                msg = msg[0]
+            if isinstance(msg, dict) and 'success' not in msg:
+                logger.warning(f"{msg}")
+                return 1, ret
+            if logger.level == logging.DEBUG:
+                logger.debug(f"{common.to_str(ret, slise=255)}")
+            return 0, ret
+
+    def pub_result(self, title:str, output:str, timeout:int) -> Tuple[int, Dict[str, Any]]:
+        """
+        結果を公開します
+
+        Args:
+            title (str): タイトル
+            output (str): 出力
+            logger (logging.Logger): ロガー
+            timeout (int): タイムアウト時間
+
+        Returns:
+            Tuple[int, Dict[str, Any]]: 終了コード, メッセージ
+        """
+        output = common.to_str(output)
+        data = f'title={urllib.parse.quote(title)}&output={urllib.parse.quote(output)}'
+        headers = {'content-type':'application/x-www-form-urlencoded'}
+        res = self.session.post(f"{self.endpoint}/result/pub", headers=headers, data=data,
+                                verify=not self.svcert_no_verify, timeout=timeout, allow_redirects=False)
+        if res.status_code != 200:
+            msg = dict(warn=f"Access failed. status_code={res.status_code}")
+            return 1, msg
+        else:
+            msg = res.json()
+            return 0, msg
+
+    def open_browser(self, path:str) -> Tuple[int, Dict[str, str]]:
+        """
+        指定したパスをブラウザで開きます。
+        この時認証情報を含めて開きます。
+
+        Args:
+            path (str): パス
+
+        Returns:
+            Tuple[int, Dict[str, str]]: 終了コード, メッセージ
+        """
+        path = f"/{path}" if not path.startswith('/') else path
+        if not hasattr(self, 'user'):
+            webbrowser.open(f"{self.endpoint}{path}")
+            return 0, dict(success="Open browser.")
+        token = dict(auth_type=self.user['auth_type'])
+        if self.user['auth_type'] == "noauth":
+            webbrowser.open(f"{self.endpoint}{path}")
+            return 0, dict(success="Open browser.")
+        elif self.user['auth_type'] == "idpw":
+            hashed = self.user['password'] if self.user['hash']=='plain' else common.hash_password(self.user['password'], self.user['hash'])
+            token = dict(**token, **dict(user=self.user['name'], token=common.encrypt(path, hashed)))
+            token = convert.str2b64str(common.to_str(token))
+            webbrowser.open(f"{self.endpoint}/dosignin_token/{token}{path}")
+            return 0, dict(success="Open browser.")
+        elif self.user['auth_type'] == "apikey":
+            hashed = common.hash_password(self.user['apikey'], 'sha1')
+            token = dict(**token, **dict(user=self.user['name'], token=common.encrypt(path, hashed)))
+            token = convert.str2b64str(common.to_str(token))
+            webbrowser.open(f"{self.endpoint}/dosignin_token/{token}{path}")
+            return 0, dict(success="Open browser.")
+        elif self.user['auth_type'] == "oauth2":
+            if self.oauth2 == 'google':
+                webbrowser.open(f"{self.endpoint}/oauth2/google/session/{self.user['access_token']}{path}")
+                return 0, dict(success="Open browser.")
+            if self.oauth2 == 'github':
+                webbrowser.open(f"{self.endpoint}/oauth2/github/session/{self.user['access_token']}{path}")
+                return 0, dict(success="Open browser.")
+            if self.oauth2 == 'azure':
+                webbrowser.open(f"{self.endpoint}/oauth2/azure/session/{self.user['access_token']}{path}")
+                return 0, dict(success="Open browser.")
+        elif self.user['auth_type'] == "saml":
+            if self.saml == 'azure':
+                webbrowser.open(f"{self.endpoint}/saml/azure/session/{self.user['saml_token']}{path}")
+                return 0, dict(success="Open browser.")
+        return 1, dict(warn="unsupported auth_type.")

cmdbox/app/feature.py

@@ -1,6 +1,6 @@
 from cmdbox import version
-from cmdbox.app import edge
-from cmdbox.app.commons import redis_client
+from cmdbox.app import common, edge_tool
+from cmdbox.app.commons import convert, redis_client
 from cmdbox.app.web import Web
 from fastapi import FastAPI
 from pathlib import Path
@@ -27,6 +27,7 @@ class Feature(object):
         self.ver = ver
         self.appcls = appcls
         self.default_svname:str = ver.__appid__
+        self.default_data:Path = os.environ.get('DATA_DIR', common.HOME_DIR / f".{self.ver.__appid__}")
 
     def get_mode(self) -> Union[str, List[str]]:
         """
@@ -105,13 +106,13 @@ class Feature(object):
         """
         raise NotImplementedError
 
-    def edgerun(self, opt:Dict[str, Any], tool:edge.Tool, logger:logging.Logger, timeout:int, prevres:Any=None):
+    def edgerun(self, opt:Dict[str, Any], tool:edge_tool.Tool, logger:logging.Logger, timeout:int, prevres:Any=None):
         """
         この機能のエッジ側の実行を行います
 
         Args:
             opt (Dict[str, Any]): オプション
-            tool (edge.Tool): 通知関数などedge側のUI操作を行うためのクラス
+            tool (edge_tool.Tool): 通知関数などedge側のUI操作を行うためのクラス
             logger (logging.Logger): ロガー
             timeout (int): タイムアウト時間
             prevres (Any): 前コマンドの結果。pipeline実行の実行結果を参照する時に使用します。
@@ -126,7 +127,7 @@ class OneshotEdgeFeature(Feature):
     """
     一度だけ実行するエッジ機能の基底クラス
     """
-    def edgerun(self, opt:Dict[str, Any], tool:edge.Tool, logger:logging.Logger, timeout:int, prevres:Any=None):
+    def edgerun(self, opt:Dict[str, Any], tool:edge_tool.Tool, logger:logging.Logger, timeout:int, prevres:Any=None):
         status, res = tool.exec_cmd(opt, logger, timeout, prevres)
         yield 1, res
 
@@ -134,7 +135,7 @@ class OneshotNotifyEdgeFeature(OneshotEdgeFeature):
     """
     実行結果の通知を行うエッジ機能の基底クラス
     """
-    def edgerun(self, opt:Dict[str, Any], tool:edge.Tool, logger:logging.Logger, timeout:int, prevres:Any=None):
+    def edgerun(self, opt:Dict[str, Any], tool:edge_tool.Tool, logger:logging.Logger, timeout:int, prevres:Any=None):
         status, res = next(super().edgerun(opt, tool, logger, timeout, prevres))
         tool.notify(res)
         yield status, res
@@ -143,7 +144,7 @@ class ResultEdgeFeature(Feature):
     """
     実行結果をWebブラウザで表示するエッジ機能の基底クラス
     """
-    def edgerun(self, opt:Dict[str, Any], tool:edge.Tool, logger:logging.Logger, timeout:int, prevres:Any=None):
+    def edgerun(self, opt:Dict[str, Any], tool:edge_tool.Tool, logger:logging.Logger, timeout:int, prevres:Any=None):
         status, res = next(super().edgerun(opt, tool, logger, timeout, prevres))
         if status == 0:
             status, res = tool.pub_result(opt['title'], res, timeout)
@@ -155,7 +156,7 @@ class OneshotResultEdgeFeature(ResultEdgeFeature):
     """
     一度だけ実行結果をWebブラウザで表示するエッジ機能の基底クラス
     """
-    def edgerun(self, opt:Dict[str, Any], tool:edge.Tool, logger:logging.Logger, timeout:int, prevres:Any=None):
+    def edgerun(self, opt:Dict[str, Any], tool:edge_tool.Tool, logger:logging.Logger, timeout:int, prevres:Any=None):
         status, res = next(super().edgerun(opt, tool, logger, timeout, prevres))
         yield 1, res
 
@@ -163,7 +164,7 @@ class UnsupportEdgeFeature(Feature):
     """
     サポートされていないエッジ機能の基底クラス
     """
-    def edgerun(self, opt:Dict[str, Any], tool:edge.Tool, logger:logging.Logger, timeout:int, prevres:Any=None):
+    def edgerun(self, opt:Dict[str, Any], tool:edge_tool.Tool, logger:logging.Logger, timeout:int, prevres:Any=None):
         res = dict(warn=f'Unsupported edgerun. mode="{opt["mode"]}", cmd="{opt["cmd"]}"')
         tool.notify(res)
         yield 1, res