gru/certpusher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix import key to mikrotik

Browse Source
This commit is contained in:
Mateusz Gruszczyński
2025-10-27 09:57:47 +01:00
parent d32885b732
commit 257fb6e98f
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
certpusher.py
View File

@@ -360,32 +360,53 @@ class MikroTikManager(SSHManager):
return True return True
def configure_services(self, services: List[str], cert_name: str): def configure_services(self, services: List[str], cert_name: str):
"""Configure services to use certificate""" """Configure and enable services to use certificate"""
try: try:
for service in services: for service in services:
logger.info(f"Configuring {service}") logger.info(f"Configuring {service}")
# Set certificate
success, _, stderr = self.execute_command( success, _, stderr = self.execute_command(
f'/ip service set {service} certificate="{cert_name}"', f'/ip service set {service} certificate="{cert_name}"',
ignore_error=True ignore_error=True
) )
if success: if success:
logger.info(f"✓ {service} configured") logger.info(f"✓ Certificate set for {service}")
else: else:
logger.warning(f"Failed to configure {service}: {stderr}") logger.error(f"Failed to set certificate: {stderr}")
continue
# Enable service (CRITICAL - was missing!)
logger.info(f"Enabling {service}")
success, stdout, stderr = self.execute_command(
f'/ip service enable {service}',
ignore_error=True
)
if success:
logger.info(f"✓ {service} enabled")
else:
logger.warning(f"Enable failed: {stderr}")
# Verify
import time
time.sleep(1)
success, stdout, _ = self.execute_command( success, stdout, _ = self.execute_command(
f'/ip service print where name="{service}"', f'/ip service print where name="{service}"',
ignore_error=True ignore_error=True
) )
if 'disabled=yes' in stdout: if stdout:
logger.info(f"Enabling {service}") if 'X' in stdout[:50]: # Check first line for X flag
self.execute_command(f'/ip service enable {service}') logger.error(f"✗ {service} is still DISABLED!")
else:
logger.info(f"✓ {service} is ACTIVE")
except Exception as e: except Exception as e:
logger.error(f"Service configuration failed: {e}") logger.error(f"Service configuration failed: {e}")
def upload_certificate(self, cert_path: str, key_path: str, check_first: bool, def upload_certificate(self, cert_path: str, key_path: str, check_first: bool,
source_cert: x509.Certificate, services: List[str] = None) -> Tuple[bool, bool]: source_cert: x509.Certificate, services: List[str] = None) -> Tuple[bool, bool]: