github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v8.1.5: Fix SSH handling, password decryption, and error messaging. 

Ensure SSH key validity check, correct password decryption, and proper error handling for SSH agent startup and service activation. Enhanced error messages improve debugging and maintainability.
pull/403/merge v8.1.5
Aidaho 2025-01-28 17:59:14 +03:00
parent b0251f7be8
commit fc0ccb8f9c
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/modules/server/ssh.py
View File

@ -39,7 +39,10 @@ def return_ssh_keys_path(server_ip: str) -> dict:
else:
passphrase = ssh.passphrase
ssh_key = _return_correct_ssh_file(ssh)
if ssh.private_key:
ssh_key = _return_correct_ssh_file(ssh)
else:
ssh_key = None
ssh_settings.setdefault('enabled', ssh.key_enabled)
ssh_settings.setdefault('user', ssh.username)
ssh_settings.setdefault('password', password)
@ -170,10 +173,11 @@ def decrypt_password(password: str) -> str:
salt = get_config.get_config_var('main', 'secret_phrase')
fernet = Fernet(salt.encode())
try:
decryp_pass = fernet.decrypt(password.encode()).decode()
decrypted_pass = fernet.decrypt(password.encode()).decode()
decrypted_pass = decrypted_pass.replace("'", "")
except Exception as e:
raise Exception(f'error: Cannot decrypt password: {e}')
return decryp_pass
return decrypted_pass
def get_creds(group_id: int = None, cred_id: int = None, not_shared: bool = False) -> list:

5
app/modules/service/installation.py
View File

@ -238,7 +238,7 @@ def run_ansible(inv: dict, server_ips: list, ansible_role: str) -> dict:
try:
agent_pid = server_mod.start_ssh_agent()
except Exception as e:
raise Exception(f'{e}')
raise Exception(f'Cannot start SSH agent: {e}')
try:
_install_ansible_collections()
@ -450,6 +450,9 @@ def install_service(service: str, json_data: Union[str, ServiceInstall, HACluste
raise Exception(f'Cannot generate inv {service}: {e}')
try:
service_actions_after_install(server_ips, service, json_data)
except Exception as e:
raise Exception(f'Cannot activate {service} on server {server_ips}: {e}')
try:
return run_ansible(inv, server_ips, service)
except Exception as e:
raise Exception(f'Cannot install {service}: {e}')