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

fix: 账号密钥长度为8192时 刷新账号列表504 (#13196) 

Co-authored-by: feng <1304903146@qq.com>
pull/13353/head
fit2bot 2024-05-11 14:45:29 +08:00 committed by GitHub
parent 94ee3169dc
commit 52c905832b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/accounts/serializers/account/account.py
View File

@ -431,8 +431,11 @@ class AssetAccountBulkSerializer(
class AccountSecretSerializer(SecretReadableMixin, AccountSerializer): class AccountSecretSerializer(SecretReadableMixin, AccountSerializer):
class Meta(AccountSerializer.Meta): class Meta(AccountSerializer.Meta):
fields = AccountSerializer.Meta.fields + ['spec_info']
extra_kwargs = { extra_kwargs = {
**AccountSerializer.Meta.extra_kwargs,
'secret': {'write_only': False}, 'secret': {'write_only': False},
'spec_info': {'label': _('Spec info')},
} }

5
apps/accounts/serializers/account/base.py
View File

@ -67,15 +67,14 @@ class BaseAccountSerializer(AuthValidateMixin, ResourceLabelsMixin, BulkOrgResou
fields_mini = ['id', 'name', 'username'] fields_mini = ['id', 'name', 'username']
fields_small = fields_mini + [ fields_small = fields_mini + [
'secret_type', 'secret', 'passphrase', 'secret_type', 'secret', 'passphrase',
'privileged', 'is_active', 'spec_info', 'privileged', 'is_active',
] ]
fields_other = ['created_by', 'date_created', 'date_updated', 'comment'] fields_other = ['created_by', 'date_created', 'date_updated', 'comment']
fields = fields_small + fields_other + ['labels'] fields = fields_small + fields_other + ['labels']
read_only_fields = [ read_only_fields = [
'spec_info', 'date_verified', 'created_by', 'date_created', 'date_verified', 'created_by', 'date_created',
] ]
extra_kwargs = { extra_kwargs = {
'spec_info': {'label': _('Spec info')},
'username': {'help_text': _( 'username': {'help_text': _(
"Tip: If no username is required for authentication, fill in `null`, " "Tip: If no username is required for authentication, fill in `null`, "
"If AD account, like `username@domain`" "If AD account, like `username@domain`"

4
apps/accounts/serializers/account/template.py
View File

@ -35,6 +35,7 @@ class AccountTemplateSerializer(BaseAccountSerializer):
'su_from' 'su_from'
] ]
extra_kwargs = { extra_kwargs = {
**BaseAccountSerializer.Meta.extra_kwargs,
'secret_strategy': {'help_text': _('Secret generation strategy for account creation')}, 'secret_strategy': {'help_text': _('Secret generation strategy for account creation')},
'auto_push': {'help_text': _('Whether to automatically push the account to the asset')}, 'auto_push': {'help_text': _('Whether to automatically push the account to the asset')},
'platforms': { 'platforms': {
@ -64,6 +65,9 @@ class AccountTemplateSerializer(BaseAccountSerializer):
class AccountTemplateSecretSerializer(SecretReadableMixin, AccountTemplateSerializer): class AccountTemplateSecretSerializer(SecretReadableMixin, AccountTemplateSerializer):
class Meta(AccountTemplateSerializer.Meta): class Meta(AccountTemplateSerializer.Meta):
fields = AccountTemplateSerializer.Meta.fields + ['spec_info']
extra_kwargs = { extra_kwargs = {
**AccountTemplateSerializer.Meta.extra_kwargs,
'secret': {'write_only': False}, 'secret': {'write_only': False},
'spec_info': {'label': _('Spec info')},
} }