diff --git a/apps/assets/models/domain.py b/apps/assets/models/domain.py index e39cca48e..5ac2a9541 100644 --- a/apps/assets/models/domain.py +++ b/apps/assets/models/domain.py @@ -10,7 +10,6 @@ from django.db import models from django.db.models import TextChoices from django.utils.translation import ugettext_lazy as _ -from common.utils.strings import no_special_chars from orgs.mixins.models import OrgModelMixin from .base import BaseUser @@ -64,8 +63,8 @@ class Gateway(BaseUser): def test_connective(self, local_port=None): if local_port is None: local_port = self.port - if self.password and not no_special_chars(self.password): - return False, _("Password should not contains special characters") + if not self.password: + return False, _("Password cannot be empty") client = paramiko.SSHClient() client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) diff --git a/apps/assets/serializers/domain.py b/apps/assets/serializers/domain.py index 1626bd711..08182127e 100644 --- a/apps/assets/serializers/domain.py +++ b/apps/assets/serializers/domain.py @@ -4,7 +4,6 @@ from rest_framework import serializers from django.utils.translation import ugettext_lazy as _ from orgs.mixins.serializers import BulkOrgResourceModelSerializer -from common.validators import NoSpecialChars from ..models import Domain, Gateway from .base import AuthSerializerMixin @@ -58,7 +57,7 @@ class GatewaySerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer): fields_fk = ['domain'] fields = fields_small + fields_fk extra_kwargs = { - 'password': {'write_only': True, 'validators': [NoSpecialChars()]}, + 'password': {'write_only': True}, 'private_key': {"write_only": True}, 'public_key': {"write_only": True}, } @@ -67,7 +66,7 @@ class GatewaySerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer): class GatewayWithAuthSerializer(GatewaySerializer): class Meta(GatewaySerializer.Meta): extra_kwargs = { - 'password': {'write_only': False, 'validators': [NoSpecialChars()]}, + 'password': {'write_only': False}, 'private_key': {"write_only": False}, 'public_key': {"write_only": False}, } diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 87aa477f5..6b09f20e5 100644 Binary files a/apps/locale/zh/LC_MESSAGES/django.mo and b/apps/locale/zh/LC_MESSAGES/django.mo differ diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 5568da58c..f86e3bc6a 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -652,8 +652,8 @@ msgid "Gateway" msgstr "网关" #: assets/models/domain.py:68 -msgid "Password should not contains special characters" -msgstr "密码不能包含特殊字符" +msgid "Password cannot be empty" +msgstr "密码不能为空" #: assets/models/gathered_user.py:16 msgid "Present"