mcp-proxy-adapter 6.9.16__py3-none-any.whl → 6.9.18__py3-none-any.whl

mcp_proxy_adapter/commands/cert_monitor_command.py

@@ -20,6 +20,7 @@ from .result import CommandResult, SuccessResult, ErrorResult
 from ..core.certificate_utils import CertificateUtils
 from ..core.auth_validator import AuthValidator
 
+from mcp_proxy_adapter.core.logging import get_global_logger
 logger = logging.getLogger(__name__)
 
 
@@ -216,7 +217,7 @@ class CertMonitorCommand(Command):
             CommandResult with expiry check results
         """
         try:
-            logger.info(f"Performing certificate expiry check for {cert_path}")
+            get_global_logger().info(f"Performing certificate expiry check for {cert_path}")
 
             # Check if certificate file exists
             if not os.path.exists(cert_path):
@@ -255,7 +256,7 @@ class CertMonitorCommand(Command):
             else:
                 health_status = "healthy"
 
-            logger.info(
+            get_global_logger().info(
                 f"Certificate expiry check completed: {health_status} ({days_until_expiry} days)"
             )
 
@@ -273,7 +274,7 @@ class CertMonitorCommand(Command):
             )
 
         except Exception as e:
-            logger.error(f"Certificate expiry check failed: {e}")
+            get_global_logger().error(f"Certificate expiry check failed: {e}")
             return ErrorResult(message=f"Certificate expiry check failed: {str(e)}")
 
     async def cert_health_check(self, cert_path: str) -> CommandResult:
@@ -287,7 +288,7 @@ class CertMonitorCommand(Command):
             CommandResult with health check results
         """
         try:
-            logger.info(f"Performing certificate health check for {cert_path}")
+            get_global_logger().info(f"Performing certificate health check for {cert_path}")
 
             # Check if certificate file exists
             if not os.path.exists(cert_path):
@@ -356,7 +357,7 @@ class CertMonitorCommand(Command):
             else:
                 overall_status = "critical"
 
-            logger.info(
+            get_global_logger().info(
                 f"Certificate health check completed: {overall_status} (score: {health_score})"
             )
 
@@ -373,7 +374,7 @@ class CertMonitorCommand(Command):
             )
 
         except Exception as e:
-            logger.error(f"Certificate health check failed: {e}")
+            get_global_logger().error(f"Certificate health check failed: {e}")
             return ErrorResult(message=f"Certificate health check failed: {str(e)}")
 
     async def cert_alert_setup(
@@ -390,7 +391,7 @@ class CertMonitorCommand(Command):
             CommandResult with alert setup status
         """
         try:
-            logger.info(f"Setting up certificate monitoring alerts for {cert_path}")
+            get_global_logger().info(f"Setting up certificate monitoring alerts for {cert_path}")
 
             # Check if certificate file exists
             if not os.path.exists(cert_path):
@@ -444,7 +445,7 @@ class CertMonitorCommand(Command):
             with open(config_path, "w") as f:
                 json.dump(alert_config, f, indent=2)
 
-            logger.info(f"Alert configuration saved to {config_path}")
+            get_global_logger().info(f"Alert configuration saved to {config_path}")
 
             return SuccessResult(
                 data={
@@ -457,7 +458,7 @@ class CertMonitorCommand(Command):
             )
 
         except Exception as e:
-            logger.error(f"Alert setup failed: {e}")
+            get_global_logger().error(f"Alert setup failed: {e}")
             return ErrorResult(message=f"Alert setup failed: {str(e)}")
 
     async def cert_auto_renew(
@@ -474,7 +475,7 @@ class CertMonitorCommand(Command):
             CommandResult with auto-renewal setup status
         """
         try:
-            logger.info(f"Setting up certificate auto-renewal for {cert_path}")
+            get_global_logger().info(f"Setting up certificate auto-renewal for {cert_path}")
 
             # Check if certificate file exists
             if not os.path.exists(cert_path):
@@ -533,7 +534,7 @@ class CertMonitorCommand(Command):
             with open(config_path, "w") as f:
                 json.dump(auto_renew_config, f, indent=2)
 
-            logger.info(f"Auto-renewal configuration saved to {config_path}")
+            get_global_logger().info(f"Auto-renewal configuration saved to {config_path}")
 
             return SuccessResult(
                 data={
@@ -546,7 +547,7 @@ class CertMonitorCommand(Command):
             )
 
         except Exception as e:
-            logger.error(f"Auto-renewal setup failed: {e}")
+            get_global_logger().error(f"Auto-renewal setup failed: {e}")
             return ErrorResult(message=f"Auto-renewal setup failed: {str(e)}")
 
     def _find_certificates(self, directory: str) -> List[str]:

mcp_proxy_adapter/commands/certificate_management_command.py

@@ -19,6 +19,7 @@ from ..core.certificate_utils import CertificateUtils
 from ..core.auth_validator import AuthValidator
 from ..core.role_utils import RoleUtils
 
+from mcp_proxy_adapter.core.logging import get_global_logger
 logger = logging.getLogger(__name__)
 
 
@@ -236,7 +237,7 @@ class CertificateManagementCommand(Command):
             CommandResult with CA certificate creation status
         """
         try:
-            logger.info(f"Creating CA certificate: {common_name}")
+            get_global_logger().info(f"Creating CA certificate: {common_name}")
 
             # Validate parameters
             if not common_name or not common_name.strip():
@@ -276,7 +277,7 @@ class CertificateManagementCommand(Command):
                 status="valid",
             )
 
-            logger.info(
+            get_global_logger().info(
                 f"CA certificate created successfully: {result.get('cert_path')}"
             )
             return SuccessResult(
@@ -284,7 +285,7 @@ class CertificateManagementCommand(Command):
             )
 
         except Exception as e:
-            logger.error(f"CA certificate creation failed: {e}")
+            get_global_logger().error(f"CA certificate creation failed: {e}")
             return ErrorResult(message=f"CA certificate creation failed: {str(e)}")
 
     async def cert_create_server(
@@ -311,7 +312,7 @@ class CertificateManagementCommand(Command):
             CommandResult with server certificate creation status
         """
         try:
-            logger.info(f"Creating server certificate: {common_name}")
+            get_global_logger().info(f"Creating server certificate: {common_name}")
 
             # Validate parameters
             if not common_name or not common_name.strip():
@@ -353,7 +354,7 @@ class CertificateManagementCommand(Command):
                 status="valid",
             )
 
-            logger.info(
+            get_global_logger().info(
                 f"Server certificate created successfully: {result.get('cert_path')}"
             )
             return SuccessResult(
@@ -361,7 +362,7 @@ class CertificateManagementCommand(Command):
             )
 
         except Exception as e:
-            logger.error(f"Server certificate creation failed: {e}")
+            get_global_logger().error(f"Server certificate creation failed: {e}")
             return ErrorResult(message=f"Server certificate creation failed: {str(e)}")
 
     async def cert_create_client(
@@ -388,7 +389,7 @@ class CertificateManagementCommand(Command):
             CommandResult with client certificate creation status
         """
         try:
-            logger.info(f"Creating client certificate: {common_name}")
+            get_global_logger().info(f"Creating client certificate: {common_name}")
 
             # Validate parameters
             if not common_name or not common_name.strip():
@@ -430,7 +431,7 @@ class CertificateManagementCommand(Command):
                 status="valid",
             )
 
-            logger.info(
+            get_global_logger().info(
                 f"Client certificate created successfully: {result.get('cert_path')}"
             )
             return SuccessResult(
@@ -438,7 +439,7 @@ class CertificateManagementCommand(Command):
             )
 
         except Exception as e:
-            logger.error(f"Client certificate creation failed: {e}")
+            get_global_logger().error(f"Client certificate creation failed: {e}")
             return ErrorResult(message=f"Client certificate creation failed: {str(e)}")
 
     async def cert_revoke(self, cert_path: str) -> CommandResult:
@@ -452,7 +453,7 @@ class CertificateManagementCommand(Command):
             CommandResult with revocation status
         """
         try:
-            logger.info(f"Revoking certificate: {cert_path}")
+            get_global_logger().info(f"Revoking certificate: {cert_path}")
 
             # Validate parameters
             if not cert_path or not os.path.exists(cert_path):
@@ -475,13 +476,13 @@ class CertificateManagementCommand(Command):
                 status="revoked",
             )
 
-            logger.info(f"Certificate revoked successfully: {cert_path}")
+            get_global_logger().info(f"Certificate revoked successfully: {cert_path}")
             return SuccessResult(
                 data={"certificate": cert_result.to_dict(), "revocation_result": result}
             )
 
         except Exception as e:
-            logger.error(f"Certificate revocation failed: {e}")
+            get_global_logger().error(f"Certificate revocation failed: {e}")
             return ErrorResult(message=f"Certificate revocation failed: {str(e)}")
 
     async def cert_list(self, cert_dir: str) -> CommandResult:
@@ -495,7 +496,7 @@ class CertificateManagementCommand(Command):
             CommandResult with list of certificates
         """
         try:
-            logger.info(f"Listing certificates in directory: {cert_dir}")
+            get_global_logger().info(f"Listing certificates in directory: {cert_dir}")
 
             # Validate parameters
             if not cert_dir or not os.path.exists(cert_dir):
@@ -526,7 +527,7 @@ class CertificateManagementCommand(Command):
                             )
                             certificates.append(cert_result.to_dict())
                     except Exception as e:
-                        logger.warning(f"Could not read certificate {file_path}: {e}")
+                        get_global_logger().warning(f"Could not read certificate {file_path}: {e}")
                         # Add certificate with error status
                         cert_result = CertificateResult(
                             cert_path=str(file_path),
@@ -537,7 +538,7 @@ class CertificateManagementCommand(Command):
                         )
                         certificates.append(cert_result.to_dict())
 
-            logger.info(f"Found {len(certificates)} certificates in {cert_dir}")
+            get_global_logger().info(f"Found {len(certificates)} certificates in {cert_dir}")
             return SuccessResult(
                 data={
                     "certificates": certificates,
@@ -547,7 +548,7 @@ class CertificateManagementCommand(Command):
             )
 
         except Exception as e:
-            logger.error(f"Certificate listing failed: {e}")
+            get_global_logger().error(f"Certificate listing failed: {e}")
             return ErrorResult(message=f"Certificate listing failed: {str(e)}")
 
     async def cert_info(self, cert_path: str) -> CommandResult:
@@ -561,7 +562,7 @@ class CertificateManagementCommand(Command):
             CommandResult with certificate information
         """
         try:
-            logger.info(f"Getting certificate info: {cert_path}")
+            get_global_logger().info(f"Getting certificate info: {cert_path}")
 
             # Validate parameters
             if not cert_path or not os.path.exists(cert_path):
@@ -587,7 +588,7 @@ class CertificateManagementCommand(Command):
                 error=None if validation.is_valid else validation.error_message,
             )
 
-            logger.info(f"Certificate info retrieved successfully: {cert_path}")
+            get_global_logger().info(f"Certificate info retrieved successfully: {cert_path}")
             return SuccessResult(
                 data={
                     "certificate": cert_result.to_dict(),
@@ -602,5 +603,5 @@ class CertificateManagementCommand(Command):
             )
 
         except Exception as e:
-            logger.error(f"Certificate info retrieval failed: {e}")
+            get_global_logger().error(f"Certificate info retrieval failed: {e}")
             return ErrorResult(message=f"Certificate info retrieval failed: {str(e)}")