From 5b239cd34087a8fb2c02d94cab1a901f635db8f8 Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Mon, 19 Jul 2021 11:10:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=20=E7=BD=91=E5=9F=9F?= =?UTF-8?q?=E7=BD=91=E5=85=B3=20=E5=AF=86=E7=A0=81=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/domain.py | 5 ++--- apps/assets/serializers/domain.py | 5 ++--- apps/locale/zh/LC_MESSAGES/django.mo | Bin 75919 -> 75884 bytes apps/locale/zh/LC_MESSAGES/django.po | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) 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 af23010136102c977ce6e0bf552c10b65942e0f9..ad302115417626ffcd7c6320de13dc4e2a19f121 100644 GIT binary patch delta 11702 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 Rn7J-AP-#^}k-$^6{vW`w+@$~j diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 1922354d7..f31898014 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"