github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: Display asset/account connectivity error message

pull/15298/head
feng 2025-04-27 17:57:42 +08:00 committed by feng626
parent e992c44e11
commit d06d26ac54
4 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/accounts/automations/verify_account/manager.py
View File

@ -85,6 +85,7 @@ class VerifyAccountManager(AccountBasePlaybookManager):
def on_host_error(self, host, error, result): def on_host_error(self, host, error, result):
account = self.host_account_mapper.get(host) account = self.host_account_mapper.get(host)
try: try:
account.set_connectivity(Connectivity.ERR) error_tp = account.get_err_connectivity(error)
account.set_connectivity(error_tp)
except Exception as e: except Exception as e:
print(f'\033[31m Update account {account.name} connectivity failed: {e} \033[0m\n') print(f'\033[31m Update account {account.name} connectivity failed: {e} \033[0m\n')

5
apps/assets/automations/ping/manager.py
View File

@ -37,10 +37,11 @@ class PingManager(BasePlaybookManager):
def on_host_error(self, host, error, result): def on_host_error(self, host, error, result):
asset, account = self.host_asset_and_account_mapper.get(host) asset, account = self.host_asset_and_account_mapper.get(host)
try: try:
asset.set_connectivity(Connectivity.ERR) error_tp = asset.get_err_connectivity(error)
asset.set_connectivity(error_tp)
if not account: if not account:
return return
account.set_connectivity(Connectivity.ERR) account.set_connectivity(error_tp)
except Exception as e: except Exception as e:
print(f'\033[31m Update account {account.name} or ' print(f'\033[31m Update account {account.name} or '
f'update asset {asset.name} connectivity failed: {e} \033[0m\n') f'update asset {asset.name} connectivity failed: {e} \033[0m\n')

6
apps/assets/const/automation.py
View File

@ -7,6 +7,12 @@ class Connectivity(TextChoices):
NA = 'na', _('N/A') NA = 'na', _('N/A')
OK = 'ok', _('OK') OK = 'ok', _('OK')
ERR = 'err', _('Error') ERR = 'err', _('Error')
AUTH_ERR = 'auth_err', _('Authentication error')
SUDO_ERR = 'sudo_err', _('Sudo permission error')
PASSWORD_ERR = 'password_err', _('Invalid password error')
OPENSSH_KEY_ERR = 'openssh_key_err', _('OpenSSH key error')
NTLM_ERR = 'ntlm__err', _('NTLM credentials rejected error')
CREATE_DIR_ERR = 'create_dir_err', _('Create directory error')
class AutomationTypes(TextChoices): class AutomationTypes(TextChoices):

22
apps/assets/models/base.py
View File

@ -23,6 +23,28 @@ class AbsConnectivity(models.Model):
self.date_verified = timezone.now() self.date_verified = timezone.now()
self.save(update_fields=['connectivity', 'date_verified']) self.save(update_fields=['connectivity', 'date_verified'])
@staticmethod
def get_err_connectivity(msg=None):
msg = (msg or '').strip().lower()
error_map = {
'permission denied': Connectivity.AUTH_ERR,
'authentication failed': Connectivity.AUTH_ERR,
'authentication failure': Connectivity.AUTH_ERR,
'is not in the sudoers file': Connectivity.SUDO_ERR,
'expected openssh key': Connectivity.OPENSSH_KEY_ERR,
'invalid/incorrect password': Connectivity.PASSWORD_ERR,
'failed to create directory': Connectivity.CREATE_DIR_ERR,
'ntlm: the specified credentials were rejected by the server': Connectivity.NTLM_ERR,
}
for key, value in error_map.items():
if key in msg:
return value
return Connectivity.ERR
@property @property
def is_connective(self): def is_connective(self):
if self.connectivity == Connectivity.OK: if self.connectivity == Connectivity.OK: