Merge pull request #6464 from jumpserver/dev

v2.12.0 rc5

apps/assets/models/authbook.py

@@ -27,7 +27,6 @@ class AuthBook(BaseUser, AbsConnectivity):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.auth_snapshot = {}
-        self.load_auth()
 
     def get_or_systemuser_attr(self, attr):
         val = getattr(self, attr, None)

apps/assets/models/user.py

@@ -141,6 +141,7 @@ class AuthMixin:
         else:
             authbooks.sort(key=lambda x: 1 if x.username == username else 0, reverse=True)
             authbook = authbooks[0]
+        authbook.load_auth()
         self.password = authbook.password
         self.private_key = authbook.private_key
         self.public_key = authbook.public_key

apps/assets/serializers/account.py

@@ -32,6 +32,10 @@ class AccountSerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer):
         queryset = queryset.prefetch_related('systemuser', 'asset')
         return queryset
 
+    def to_representation(self, instance):
+        instance.load_auth()
+        return super().to_representation(instance)
+
 
 class AccountSecretSerializer(AccountSerializer):
     class Meta(AccountSerializer.Meta):

apps/assets/serializers/asset.py

@@ -95,7 +95,7 @@ class AssetSerializer(BulkOrgResourceModelSerializer):
             'port': {'write_only': True},
             'hardware_info': {'label': _('Hardware info')},
             'org_name': {'label': _('Org name')},
-            'admin_user_display': {'label', _('Admin user display')}
+            'admin_user_display': {'label': _('Admin user display')}
         }
 
     def get_fields(self):

apps/assets/tasks/account_connectivity.py

@@ -81,6 +81,7 @@ def test_account_connectivity_util(account, task_name):
     if not check_asset_can_run_ansible(account.asset):
         return
 
+    account.load_auth()
     try:
         raw, summary = test_user_connectivity(
             task_name=task_name, asset=account.asset,