cmdbox 0.6.3.2__tar.gz → 0.6.4__tar.gz

{cmdbox-0.6.3.2/cmdbox.egg-info → cmdbox-0.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cmdbox
-Version: 0.6.3.2
+Version: 0.6.4
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Home-page: https://github.com/hamacom2004jp/cmdbox
 Download-URL: https://github.com/hamacom2004jp/cmdbox
@@ -21,6 +21,46 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: argcomplete
+Requires-Dist: async-timeout
+Requires-Dist: cryptography
+Requires-Dist: fastapi
+Requires-Dist: gevent
+Requires-Dist: gunicorn
+Requires-Dist: itsdangerous
+Requires-Dist: numpy
+Requires-Dist: Pillow
+Requires-Dist: plyer
+Requires-Dist: psycopg[binary]
+Requires-Dist: pyjwt
+Requires-Dist: pystray
+Requires-Dist: python-multipart
+Requires-Dist: pycryptodome
+Requires-Dist: pyyaml
+Requires-Dist: questionary
+Requires-Dist: redis
+Requires-Dist: requests
+Requires-Dist: rich
+Requires-Dist: six
+Requires-Dist: tabulate
+Requires-Dist: uvicorn
+Requires-Dist: wsproto
+Requires-Dist: wheel
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # cmdbox (Command Development Application)
 
@@ -159,8 +199,8 @@ class ClientTime(feature.Feature):
         ret = dict(success=dict(data=dt.strftime('%Y-%m-%d %H:%M:%S')))
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
         if 'success' not in ret:
-            return 1, ret, None
-        return 0, ret, None
+            return self.RESP_WARN, ret, None
+        return self.RESP_SUCCESS, ret, None
 
     def edgerun(self, opt, tool, logger, timeout, prevres = None):
         status, res = tool.exec_cmd(opt, logger, timeout, prevres)
@@ -229,8 +269,8 @@ class ServerTime(feature.Feature):
                                     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, None
-        return 0, ret, None
+            return self.RESP_WARN, ret, None
+        return self.RESP_SUCCESS, ret, None
 
     def is_cluster_redirect(self):
         return False
@@ -242,7 +282,7 @@ class ServerTime(feature.Feature):
         dt = datetime.datetime.now(tz)
         ret = dict(success=dict(data=dt.strftime('%Y-%m-%d %H:%M:%S')))
         redis_cli.rpush(msg[1], ret)
-        return self.RESP_SCCESS
+        return self.RESP_SUCCESS
 
     def edgerun(self, opt, tool, logger, timeout, prevres = None):
         status, res = tool.exec_cmd(opt, logger, timeout, prevres)
@@ -300,20 +340,11 @@ aliases:                                # Specify the alias for the specified co
 agentrule:                              # Specifies a list of rules that determine which commands the agent can execute.
   policy: deny                          # Specify the default policy for the rule. The value can be allow or deny.
   rules:                                # Specify the rules for the commands that the agent can execute according to the group to which the user belongs.
-  - mode: audit                         # Specify the "mode" as the condition for applying the rule.
-    cmds: [search, write]               # Specify the "cmd" to which the rule applies. Multiple items can be specified in a list.
+  - mode: cmd                           # Specify the "mode" as the condition for applying the rule.
+    cmds: [list, load]                  # Specify the "cmd" to which the rule applies. Multiple items can be specified in a list.
     rule: allow                         # Specifies whether the specified command is allowed or not. Values are allow or deny.
   - mode: client
-    cmds: [file_copy, file_download, file_list, file_mkdir, file_move, file_remove, file_rmdir, file_upload, server_info]
-    rule: allow
-  - mode: cmd
-    cmds: [list, load]
-    rule: allow
-  - mode: server
-    cmds: [list]
-    rule: allow
-  - mode: web
-    cmds: [gencert, genpass, group_list, user_list]
+    cmds: [http]
     rule: allow
 audit:
   enabled: true                         # Specify whether to enable the audit function.

{cmdbox-0.6.3.2 → cmdbox-0.6.4}/README.md

@@ -135,8 +135,8 @@ class ClientTime(feature.Feature):
         ret = dict(success=dict(data=dt.strftime('%Y-%m-%d %H:%M:%S')))
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
         if 'success' not in ret:
-            return 1, ret, None
-        return 0, ret, None
+            return self.RESP_WARN, ret, None
+        return self.RESP_SUCCESS, ret, None
 
     def edgerun(self, opt, tool, logger, timeout, prevres = None):
         status, res = tool.exec_cmd(opt, logger, timeout, prevres)
@@ -205,8 +205,8 @@ class ServerTime(feature.Feature):
                                     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, None
-        return 0, ret, None
+            return self.RESP_WARN, ret, None
+        return self.RESP_SUCCESS, ret, None
 
     def is_cluster_redirect(self):
         return False
@@ -218,7 +218,7 @@ class ServerTime(feature.Feature):
         dt = datetime.datetime.now(tz)
         ret = dict(success=dict(data=dt.strftime('%Y-%m-%d %H:%M:%S')))
         redis_cli.rpush(msg[1], ret)
-        return self.RESP_SCCESS
+        return self.RESP_SUCCESS
 
     def edgerun(self, opt, tool, logger, timeout, prevres = None):
         status, res = tool.exec_cmd(opt, logger, timeout, prevres)
@@ -276,20 +276,11 @@ aliases:                                # Specify the alias for the specified co
 agentrule:                              # Specifies a list of rules that determine which commands the agent can execute.
   policy: deny                          # Specify the default policy for the rule. The value can be allow or deny.
   rules:                                # Specify the rules for the commands that the agent can execute according to the group to which the user belongs.
-  - mode: audit                         # Specify the "mode" as the condition for applying the rule.
-    cmds: [search, write]               # Specify the "cmd" to which the rule applies. Multiple items can be specified in a list.
+  - mode: cmd                           # Specify the "mode" as the condition for applying the rule.
+    cmds: [list, load]                  # Specify the "cmd" to which the rule applies. Multiple items can be specified in a list.
     rule: allow                         # Specifies whether the specified command is allowed or not. Values are allow or deny.
   - mode: client
-    cmds: [file_copy, file_download, file_list, file_mkdir, file_move, file_remove, file_rmdir, file_upload, server_info]
-    rule: allow
-  - mode: cmd
-    cmds: [list, load]
-    rule: allow
-  - mode: server
-    cmds: [list]
-    rule: allow
-  - mode: web
-    cmds: [gencert, genpass, group_list, user_list]
+    cmds: [http]
     rule: allow
 audit:
   enabled: true                         # Specify whether to enable the audit function.

{cmdbox-0.6.3.2 → cmdbox-0.6.4}/cmdbox/app/app.py

@@ -58,6 +58,8 @@ class CmdBoxApp:
 
         # プラグイン読込み
         sfeatureloadtime = time.perf_counter()
+        self.options._load_features_yml(self.ver, logger=self.default_logger)
+        self.options.load_features_agentrule(self.default_logger)
         self.options.load_svcmd('cmdbox.app.features.cli', prefix="cmdbox_", excludes=[], appcls=self.appcls, ver=self.ver, logger=self.default_logger,
                                 isloaded=self.options.is_features_loaded('cli'))
         if self.cli_features_packages is not None:
@@ -92,7 +94,7 @@ class CmdBoxApp:
         except argparse.ArgumentError as e:
             msg = dict(warn=f"ArgumentError: {e}")
             common.print_format(msg, False, 0, None, False)
-            return 1, msg, None
+            return feature.Feature.RESP_WARN, msg, None
         # 起動時引数で指定されたオプションをファイルから読み込んだオプションで上書きする
         args_dict = vars(args)
         for key, val in file_dict.items():
@@ -120,7 +122,7 @@ class CmdBoxApp:
             if args.useopt is None:
                 msg = dict(warn=f"Please specify the --useopt option.")
                 common.print_format(msg, args.format, smaintime, args.output_json, args.output_json_append)
-                return 1, msg, None
+                return feature.Feature.RESP_WARN, msg, None
             common.saveopt(opt, args.useopt)
             ret = dict(success=f"Save options file. {args.useopt}")
 
@@ -133,15 +135,15 @@ class CmdBoxApp:
         if args.version:
             v = self.ver.__logo__ + '\n' + self.ver.__description__
             common.print_format(v, False, smaintime, None, False)
-            return 0, v, None
+            return feature.Feature.RESP_SUCCESS, v, None
 
         if args.mode is None:
             msg = dict(warn=f"mode is None. Please specify the --help option.")
             common.print_format(msg, args.format, smaintime, args.output_json, args.output_json_append)
-            return 1, msg, None
+            return feature.Feature.RESP_WARN, msg, None
 
         sloggerinittime = time.perf_counter()
-        logger, _ = common.load_config(args.mode, debug=args.debug, data=args.data, webcall=webcall if args.cmd != 'webcap' else True, ver=self.ver)
+        logger = self.load_config(args, webcall=webcall if args.cmd != 'webcap' else True)
         try:
             eloggerinittime = time.perf_counter()
             if logger.level == logging.DEBUG:
@@ -168,7 +170,14 @@ class CmdBoxApp:
             else:
                 msg = dict(warn=f"Unkown mode or cmd. mode={args.mode}, cmd={args.cmd}")
                 common.print_format(msg, args.format, smaintime, args.output_json, args.output_json_append)
-                return 1, msg, None
+                return feature.Feature.RESP_WARN, msg, None
         finally:
             # ログの状態をwebcallから戻す
-            common.load_config(args.mode, debug=args.debug, data=args.data, webcall=False, ver=self.ver)
+            self.load_config(args, webcall=False)
+
+    def load_config(self, args:argparse.Namespace, webcall:bool=False) -> logging.Logger:
+        """
+        アプリケーションの設定を読み込みます。
+        """
+        logger, _ = common.load_config(args.mode, debug=args.debug, data=args.data, webcall=webcall if args.cmd != 'webcap' else True, ver=self.ver)
+        return logger

{cmdbox-0.6.3.2 → cmdbox-0.6.4}/cmdbox/app/common.py

@@ -245,13 +245,13 @@ def load_config(mode:str, debug:bool=False, data=HOME_DIR, webcall:bool=False, v
         log_name = mode
     if not log_conf_path.exists():
         log_conf_path = Path(ver.__file__).parent / f"logconf_{ver.__appid__}.yml"
-        log_name = ver.__appid__
+        log_name = mode
     if not log_conf_path.exists():
         log_conf_path = Path(version.__file__).parent / f"logconf_{mode}.yml"
         log_name = mode
     if not log_conf_path.exists():
         log_conf_path = Path(version.__file__).parent / f"logconf_{ver.__appid__}.yml"
-        log_name = ver.__appid__
+        log_name = mode
     with open(log_conf_path) as f:
         log_config = yaml.safe_load(f)
     std_key = None

{cmdbox-0.6.3.2 → cmdbox-0.6.4}/cmdbox/app/commons/redis_client.py

@@ -104,7 +104,7 @@ class RedisClient(object):
                 i = 0
                 return True
             except redis.exceptions.ConnectionError as e:
-                self.logger.warning(f"fail to ping server. {e}")
+                self.logger.warning(f"fail to ping server. {self.host}:{self.port}, error={e}")
                 if i >= retry_count and retry_count > 0:
                     return False
                 time.sleep(retry_interval if retry_interval > 0 else 5)

{cmdbox-0.6.3.2 → cmdbox-0.6.4}/cmdbox/app/edge.py

@@ -676,7 +676,7 @@ class Edge(object):
                     if time.time() - tm > oauth2_timeout:
                         return 1, dict(warn="Signin Timeout.")
                     time.sleep(1)
-                return 0, dict(success="Signin success.")
+                return feature.Feature.RESP_SUCCESS, dict(success="Signin success.")
 
         # saml認証を使用する場合
         elif auth_type == "saml":

{cmdbox-0.6.3.2 → cmdbox-0.6.4}/cmdbox/app/feature.py

@@ -14,7 +14,7 @@ class Feature(object):
     USE_REDIS_FALSE:int = -1
     USE_REDIS_MEIGHT:int = 0
     USE_REDIS_TRUE:int = 1
-    RESP_SCCESS:int = 0
+    RESP_SUCCESS:int = 0
     RESP_WARN:int = 1
     RESP_ERROR:int = 2
     DEFAULT_CAPTURE_MAXSIZE:int = 1024 * 1024 * 10