github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-07 10:20:57 +00:00
Code Issues Projects Releases Wiki Activity

perf: 修改命令command input 长度问题 (#7996)

Browse Source 
* perf: 修改命令command input max_length 1024

* perf: 修改命令command input 长度问题

* perf: 修改命令command input 长度问题

* perf: 修改命令command input 长度问题

* perf: 修改命令command input 长度问题

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
This commit is contained in:
fit2bot
2022-03-30 19:07:49 +08:00
committed by GitHub
parent 54d1996507
commit e7af037513
13 changed files with 117 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/users/serializers/user.py
View File

@@ -6,6 +6,7 @@ from rest_framework import serializers
from common.mixins import CommonBulkSerializerMixin
from common.validators import PhoneValidator
from common.utils import pretty_string
from rbac.builtin import BuiltinRole
from rbac.permissions import RBACPermission
from rbac.models import OrgRoleBinding, SystemRoleBinding, Role
@@ -268,7 +269,9 @@ class ServiceAccountSerializer(serializers.ModelSerializer):
def get_email(self):
name = self.initial_data.get('name')
return '{}@serviceaccount.local'.format(name)
name_max_length = 128 - len(User.service_account_email_suffix)
name = pretty_string(name, max_length=name_max_length, ellipsis_str='-')
return '{}{}'.format(name, User.service_account_email_suffix)
def validate_name(self, name):
email = self.get_email()
@@ -283,6 +286,7 @@ class ServiceAccountSerializer(serializers.ModelSerializer):
def create(self, validated_data):
name = validated_data['name']
email = self.get_email()
comment = validated_data.get('comment', '')
user, ak = User.create_service_account(name, comment)
user, ak = User.create_service_account(name, email, comment)
return user