perf: 修改支持 Django4

apps/accounts/api/automations/base.py

@@ -1,5 +1,5 @@
 from django.shortcuts import get_object_or_404
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import status, mixins, viewsets
 from rest_framework.response import Response
 

apps/accounts/const/account.py

@@ -1,5 +1,5 @@
 from django.db.models import TextChoices
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class SecretType(TextChoices):

apps/accounts/const/automation.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from assets.const import Connectivity
 from common.db.fields import TreeChoices

apps/accounts/models/automations/backup_account.py

@@ -6,7 +6,7 @@ import uuid
 from celery import current_task
 from django.db import models
 from django.db.models import F
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from common.const.choices import Trigger
 from common.db.encoder import ModelJSONFieldEncoder

apps/accounts/models/automations/change_secret.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from accounts.const import (
     AutomationTypes, SecretType, SecretStrategy, SSHKeyStrategy

apps/accounts/models/automations/gather_account.py

@@ -1,6 +1,6 @@
 from django.db import models
 from django.db.models import Q
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from accounts.const import AutomationTypes, Source
 from accounts.models import Account

apps/accounts/models/automations/push_account.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from accounts.const import AutomationTypes
 from accounts.models import Account

apps/accounts/models/automations/verify_account.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from accounts.const import AutomationTypes
 from .base import AccountBaseAutomation

apps/accounts/models/base.py

@@ -6,7 +6,7 @@ from hashlib import md5
 import sshpubkeys
 from django.conf import settings
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from accounts.const import SecretType
 from common.db import fields

apps/accounts/notifications.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from common.tasks import send_mail_attachment_async
 from users.models import User

apps/accounts/serializers/account/account.py

@@ -3,7 +3,7 @@ from copy import deepcopy
 
 from django.db import IntegrityError
 from django.db.models import Q
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 from rest_framework.generics import get_object_or_404
 from rest_framework.validators import UniqueTogetherValidator

apps/accounts/serializers/account/backup.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from accounts.models import AccountBackupAutomation, AccountBackupExecution

apps/accounts/serializers/account/base.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from accounts.const import SecretType

apps/accounts/serializers/account/gathered_account.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from accounts.models import GatheredAccount
 from orgs.mixins.serializers import BulkOrgResourceModelSerializer

apps/accounts/serializers/account/template.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from accounts.models import AccountTemplate, Account

apps/accounts/serializers/automations/base.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from accounts.models import AutomationExecution

apps/accounts/serializers/automations/change_secret.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from accounts.const import (

apps/accounts/tasks/push_account.py

@@ -1,5 +1,5 @@
 from celery import shared_task
-from django.utils.translation import gettext_noop, ugettext_lazy as _
+from django.utils.translation import gettext_noop, gettext_lazy as _
 
 from accounts.const import AutomationTypes
 from accounts.tasks.common import quickstart_automation_by_snapshot

apps/accounts/utils.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from accounts.const import (

apps/acls/apps.py

@@ -1,5 +1,5 @@
 from django.apps import AppConfig
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AclsConfig(AppConfig):

apps/acls/models/command_acl.py

@@ -3,7 +3,7 @@
 import re
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from common.utils import lazyproperty, get_logger
 from orgs.mixins.models import JMSOrgBaseModel

apps/acls/models/login_acl.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from common.utils import get_request_ip, get_ip_city
 from common.utils.timezone import local_now_display

apps/acls/models/login_asset_acl.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base import UserAssetAccountBaseACL
 

apps/acls/serializers/base.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from acls.models.base import BaseACL

apps/acls/serializers/command_acl.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from acls.models import CommandGroup, CommandFilterACL

apps/acls/serializers/login_acl.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from common.serializers import MethodSerializer
 from orgs.mixins.serializers import BulkOrgResourceModelSerializer

apps/acls/serializers/rules/rules.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 #
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
-from django.utils.translation import ugettext_lazy as _
 
 from common.utils import get_logger
 from common.utils.ip import is_ip_address, is_ip_network, is_ip_segment

apps/applications/apps.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from django.utils.translation import ugettext_lazy as _
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
 
 
 class ApplicationsConfig(AppConfig):
@@ -9,5 +9,4 @@ class ApplicationsConfig(AppConfig):
     verbose_name = _('Applications')
 
     def ready(self):
-        from . import signal_handlers
         super().ready()

apps/applications/migrations/0006_application.py

@@ -127,7 +127,7 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=128, verbose_name='Name')),
                 ('category', models.CharField(choices=[('db', 'Database'), ('remote_app', 'Remote app'), ('cloud', 'Cloud')], max_length=16, verbose_name='Category')),
                 ('type', models.CharField(choices=[('mysql', 'MySQL'), ('oracle', 'Oracle'), ('postgresql', 'PostgreSQL'), ('mariadb', 'MariaDB'), ('chrome', 'Chrome'), ('mysql_workbench', 'MySQL Workbench'), ('vmware_client', 'vSphere Client'), ('custom', 'Custom'), ('k8s', 'Kubernetes')], max_length=16, verbose_name='Type')),
-                ('attrs', django_mysql.models.JSONField(default=dict)),
+                ('attrs', models.JSONField(default=dict)),
                 ('comment', models.TextField(blank=True, default='', max_length=128, verbose_name='Comment')),
                 ('domain', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='applications', to='assets.Domain', verbose_name='Domain')),
             ],

apps/applications/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from common.db.models import JMSBaseModel
 from orgs.mixins.models import OrgModelMixin

apps/assets/api/domain.py

@@ -1,5 +1,5 @@
 # ~*~ coding: utf-8 ~*~
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.generic.detail import SingleObjectMixin
 from rest_framework.serializers import ValidationError
 from rest_framework.views import APIView, Response
@@ -29,6 +29,7 @@ class DomainViewSet(OrgBulkModelViewSet):
     def get_queryset(self):
         return super().get_queryset().prefetch_related('assets')
 
+
 class GatewayViewSet(HostViewSet):
     perm_model = Gateway
     filterset_fields = ("domain__name", "name", "domain")

apps/assets/api/node.py

@@ -3,7 +3,7 @@ from collections import namedtuple, defaultdict
 from functools import partial
 
 from django.db.models.signals import m2m_changed
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import status
 from rest_framework.decorators import action
 from rest_framework.generics import get_object_or_404

apps/assets/apps.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
-from django.utils.translation import ugettext_lazy as _
 
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
 
 
 class AssetsConfig(AppConfig):
@@ -13,6 +13,3 @@ class AssetsConfig(AppConfig):
 
     def ready(self):
         super().ready()
-        from . import signal_handlers
-        from . import tasks
-

apps/assets/automations/ping_gateway/manager.py

@@ -2,7 +2,7 @@ import socket
 
 import paramiko
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from assets.const import AutomationTypes, Connectivity
 from assets.models import Gateway

apps/assets/const/automation.py

@@ -1,5 +1,5 @@
 from django.db.models import TextChoices
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class Connectivity(TextChoices):

apps/assets/exceptions.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import status
 
 from common.exceptions import JMSException

apps/assets/models/asset/common.py

@@ -8,7 +8,7 @@ from collections import defaultdict
 from django.db import models
 from django.db.models import Q
 from django.forms import model_to_dict
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from assets import const
 from common.db.fields import EncryptMixin

apps/assets/models/asset/host.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .common import Asset
 

apps/assets/models/automations/base.py

@@ -2,7 +2,7 @@ import uuid
 
 from celery import current_task
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from assets.models.asset import Asset
 from assets.models.node import Node

apps/assets/models/automations/gather_facts.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from assets.const import AutomationTypes
 from .base import AssetBaseAutomation

apps/assets/models/automations/ping.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from assets.const import AutomationTypes
 from .base import AssetBaseAutomation

apps/assets/models/base.py

@@ -3,7 +3,7 @@
 
 from django.db import models
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from assets.const import Connectivity
 from common.utils import (

apps/assets/models/cmd_filter.py

@@ -4,7 +4,7 @@ import uuid
 
 from django.core.validators import MinValueValidator, MaxValueValidator
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from common.utils import get_logger
 from orgs.mixins.models import OrgModelMixin

apps/assets/models/domain.py

@@ -3,7 +3,7 @@
 import random
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from common.utils import get_logger
 from orgs.mixins.models import JMSOrgBaseModel

apps/assets/models/favorite_asset.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from common.db.models import JMSBaseModel
 

apps/assets/models/gateway.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from assets.const import GATEWAY_NAME
 from assets.models.platform import Platform

apps/assets/models/group.py

@@ -7,7 +7,7 @@ from __future__ import unicode_literals
 import uuid
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 __all__ = ['AssetGroup']
 

apps/assets/models/label.py

@@ -2,7 +2,7 @@
 #
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from common.utils import lazyproperty
 from orgs.mixins.models import JMSOrgBaseModel

apps/assets/models/node.py

@@ -10,8 +10,7 @@ from django.core.cache import cache
 from django.db import models, transaction
 from django.db.models import Q, Manager
 from django.db.transaction import atomic
-from django.utils.translation import ugettext
+from django.utils.translation import gettext_lazy as _, gettext
-from django.utils.translation import ugettext_lazy as _
 
 from common.db.models import output_as_string
 from common.utils import get_logger
@@ -163,7 +162,7 @@ class FamilyMixin:
         return key
 
     def get_next_child_preset_name(self):
-        name = ugettext("New node")
+        name = gettext("New node")
         values = [
             child.value[child.value.rfind(' '):]
             for child in self.get_children()

apps/assets/models/utils.py

@@ -3,7 +3,7 @@
 #
 
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from common.utils import validate_ssh_private_key
 

apps/assets/notifications.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from notifications.notifications import UserMessage
 
@@ -22,4 +22,4 @@ class BulkUpdatePlatformSkipAssetUserMsg(UserMessage):
         from assets.models import Asset
         user = User.objects.first()
         assets = Asset.objects.all()[:10]
-        return cls(user, assets)
+        return cls(user, assets)

apps/assets/serializers/asset/common.py

@@ -3,7 +3,7 @@
 
 from django.db.models import F
 from django.db.transaction import atomic
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from accounts.models import Account

apps/assets/serializers/asset/database.py

@@ -1,6 +1,6 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
-from rest_framework.serializers import ValidationError
 from rest_framework import serializers
+from rest_framework.serializers import ValidationError
 
 from assets.models import Database
 from assets.serializers.gateway import GatewayWithAccountSecretSerializer

apps/assets/serializers/automations/base.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from rest_framework import serializers
 
 from assets.models import Asset, Node, BaseAutomation, AutomationExecution

apps/assets/serializers/domain.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from common.serializers.fields import ObjectRelatedField

apps/assets/serializers/gateway.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from .asset.common import AccountSecretSerializer

apps/assets/serializers/label.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 from django.db.models import Count
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from orgs.mixins.serializers import BulkOrgResourceModelSerializer

apps/assets/serializers/node.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
+from django.utils.translation import gettext as _
 from rest_framework import serializers
-from django.utils.translation import ugettext as _
 
 from orgs.mixins.serializers import BulkOrgResourceModelSerializer
 from ..models import Asset, Node

apps/assets/tasks/ping_gateway.py

@@ -1,6 +1,6 @@
 # ~*~ coding: utf-8 ~*~
 from celery import shared_task
-from django.utils.translation import gettext_noop, ugettext_lazy as _
+from django.utils.translation import gettext_noop, gettext_lazy as _
 
 from assets.const import AutomationTypes
 from common.utils import get_logger

apps/assets/tasks/utils.py

@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from common.utils import get_logger
 
-
 logger = get_logger(__file__)
 __all__ = [
     'check_asset_can_run_ansible', 'clean_ansible_task_hosts',

apps/audits/apps.py

@@ -1,7 +1,7 @@
 from django.apps import AppConfig
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
 from django.db.models.signals import post_save
+from django.utils.translation import gettext_lazy as _
 
 
 class AuditsConfig(AppConfig):
@@ -10,7 +10,6 @@ class AuditsConfig(AppConfig):
 
     def ready(self):
         from . import signal_handlers
-        from . import tasks
 
         if settings.SYSLOG_ENABLE:
             post_save.connect(signal_handlers.on_audits_log_create)

apps/audits/backends/db.py

@@ -1,5 +1,5 @@
 # ~*~ coding: utf-8 ~*~
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from audits.models import OperateLog
 

apps/audits/const.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
-from django.utils.translation import ugettext_lazy as _
 from django.db.models import TextChoices, IntegerChoices
+from django.utils.translation import gettext_lazy as _
 
 DEFAULT_CITY = _("Unknown")
 

apps/audits/handler.py

@@ -3,7 +3,7 @@ from datetime import datetime
 
 from django.core.cache import cache
 from django.db import transaction
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from common.local import encrypted_field_set
 from common.utils import get_request_ip, get_logger

apps/audits/models.py

@@ -1,11 +1,11 @@
 import os
 import uuid
 
+from django.conf import settings
 from django.db import models
 from django.db.models import Q
-from django.conf import settings
 from django.utils import timezone
-from django.utils.translation import gettext, ugettext_lazy as _
+from django.utils.translation import gettext, gettext_lazy as _
 
 from common.db.encoder import ModelJSONFieldEncoder
 from common.utils import lazyproperty

apps/audits/serializers.py

@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 #
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
-from orgs.mixins.serializers import BulkOrgResourceModelSerializer
+
 from audits.backends.db import OperateLogStore
 from common.serializers.fields import LabeledChoiceField
 from common.utils import reverse, i18n_trans
 from common.utils.timezone import as_current_tz
 from ops.serializers.job import JobExecutionSerializer
+from orgs.mixins.serializers import BulkOrgResourceModelSerializer
 from terminal.models import Session
 from . import models
 from .const import (

apps/audits/signal_handlers/login_log.py

@@ -5,7 +5,7 @@ from django.contrib.auth import BACKEND_SESSION_KEY
 from django.dispatch import receiver
 from django.utils import timezone, translation
 from django.utils.functional import LazyObject
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework.request import Request
 
 from authentication.signals import post_auth_failed, post_auth_success

apps/authentication/api/confirm.py

@@ -2,10 +2,10 @@
 #
 import time
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
+from rest_framework import status
 from rest_framework.generics import RetrieveAPIView, CreateAPIView
 from rest_framework.response import Response
-from rest_framework import status
 
 from common.permissions import IsValidUser, UserConfirmation
 from ..const import ConfirmType

apps/authentication/api/connection_token.py

@@ -7,7 +7,7 @@ from django.conf import settings
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import status, serializers
 from rest_framework.decorators import action
 from rest_framework.exceptions import PermissionDenied, ValidationError

apps/authentication/api/mfa.py

@@ -1,20 +1,18 @@
 # -*- coding: utf-8 -*-
 #
-import time
 
-from django.utils.translation import ugettext as _
-from django.conf import settings
 from django.shortcuts import get_object_or_404
-from rest_framework.permissions import AllowAny
+from django.utils.translation import gettext as _
 from rest_framework.generics import CreateAPIView
-from rest_framework.serializers import ValidationError
+from rest_framework.permissions import AllowAny
 from rest_framework.response import Response
+from rest_framework.serializers import ValidationError
 
-from common.utils import get_logger
 from common.exceptions import UnexpectError
+from common.utils import get_logger
 from users.models.user import User
-from .. import serializers
 from .. import errors
+from .. import serializers
 from ..mixins import AuthMixin
 
 logger = get_logger(__name__)

apps/authentication/api/password.py

@@ -1,24 +1,24 @@
-from django.http import HttpResponseRedirect
-from rest_framework.generics import CreateAPIView
-from rest_framework.response import Response
-from rest_framework.permissions import AllowAny
-from django.utils.translation import ugettext as _
-from django.template.loader import render_to_string
 from django.core.cache import cache
+from django.http import HttpResponseRedirect
 from django.shortcuts import reverse
+from django.template.loader import render_to_string
+from django.utils.translation import gettext as _
+from rest_framework.generics import CreateAPIView
+from rest_framework.permissions import AllowAny
+from rest_framework.response import Response
 
-from common.utils.verify_code import SendAndVerifyCodeUtil
+from authentication.errors import PasswordInvalid
-from common.permissions import IsValidUser
+from authentication.mixins import AuthMixin
-from common.utils.random import random_string
+from authentication.mixins import authenticate
-from common.utils import get_object_or_none
 from authentication.serializers import (
     PasswordVerifySerializer, ResetPasswordCodeSerializer
 )
+from common.permissions import IsValidUser
+from common.utils import get_object_or_none
+from common.utils.random import random_string
+from common.utils.verify_code import SendAndVerifyCodeUtil
 from settings.utils import get_login_title
 from users.models import User
-from authentication.mixins import authenticate
-from authentication.errors import PasswordInvalid
-from authentication.mixins import AuthMixin
 
 
 class UserResetPasswordSendCodeApi(CreateAPIView):

apps/authentication/apps.py

@@ -1,5 +1,5 @@
 from django.apps import AppConfig
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AuthenticationConfig(AppConfig):
@@ -7,9 +7,4 @@ class AuthenticationConfig(AppConfig):
     verbose_name = _('Authentication')
 
     def ready(self):
-        from . import signal_handlers
-        from . import notifications
-        from . import tasks
-
         super().ready()
-

apps/authentication/backends/custom.py

@@ -1,10 +1,10 @@
 from django.conf import settings
-from django.utils.module_loading import import_string
-from django.utils.translation import ugettext_lazy as _
-from common.utils import get_logger
 from django.contrib.auth import get_user_model
-from authentication.signals import user_auth_failed, user_auth_success
+from django.utils.module_loading import import_string
+from django.utils.translation import gettext_lazy as _
 
+from authentication.signals import user_auth_failed, user_auth_success
+from common.utils import get_logger
 from .base import JMSModelBackend
 
 logger = get_logger(__file__)

apps/authentication/backends/drf.py

@@ -1,22 +1,20 @@
 # -*- coding: utf-8 -*-
 #
 
-import uuid
 import time
+import uuid
 
-from django.core.cache import cache
-from django.utils.translation import ugettext as _
-from six import text_type
 from django.contrib.auth import get_user_model
-
+from django.core.cache import cache
+from django.utils.translation import gettext as _
 from rest_framework import HTTP_HEADER_ENCODING
 from rest_framework import authentication, exceptions
+from six import text_type
+
 from common.auth import signature
-
 from common.utils import get_object_or_none, make_signature, http_to_unixtime
+from .base import JMSBaseAuthBackend
 from ..models import AccessKey, PrivateToken
-from .base import JMSBaseAuthBackend, JMSModelBackend
-
 
 UserModel = get_user_model()
 
@@ -200,4 +198,3 @@ class SignatureAuthentication(signature.SignatureAuthentication):
             return user, secret
         except (AccessKey.DoesNotExist, exceptions.ValidationError):
             return None, None
-

apps/authentication/backends/oauth2/signals.py

@@ -1,7 +1,3 @@
 from django.dispatch import Signal
 
-
+oauth2_create_or_update_user = Signal()
-oauth2_create_or_update_user = Signal(
-    providing_args=['request', 'user', 'created', 'name', 'username', 'email']
-)
-

apps/authentication/backends/oidc/signals.py

@@ -9,8 +9,4 @@
 
 from django.dispatch import Signal
 
-
+openid_create_or_update_user = Signal()
-openid_create_or_update_user = Signal(
-    providing_args=['request', 'user', 'created', 'name', 'username', 'email']
-)
-

apps/authentication/backends/oidc/views.py

@@ -11,8 +11,8 @@
 
 import base64
 import hashlib
-import time
 import secrets
+import time
 
 from django.conf import settings
 from django.contrib import auth
@@ -20,13 +20,12 @@ from django.core.exceptions import SuspiciousOperation
 from django.http import HttpResponseRedirect, QueryDict
 from django.urls import reverse
 from django.utils.crypto import get_random_string
-from django.utils.http import is_safe_url, urlencode
+from django.utils.http import url_has_allowed_host_and_scheme, urlencode
 from django.views.generic import View
 
 from authentication.utils import build_absolute_uri_for_oidc
 from .utils import get_logger
 
-
 logger = get_logger(__file__)
 
 
@@ -102,7 +101,7 @@ class OIDCAuthRequestView(View):
         logger.debug(log_prompt.format('Stores next url in the session'))
         next_url = request.GET.get('next')
         request.session['oidc_auth_next_url'] = next_url \
-            if is_safe_url(url=next_url, allowed_hosts=(request.get_host(), )) else None
+            if url_has_allowed_host_and_scheme(url=next_url, allowed_hosts=(request.get_host(),)) else None
 
         # Redirects the user to authorization endpoint.
         logger.debug(log_prompt.format('Construct redirect url'))
@@ -145,15 +144,15 @@ class OIDCAuthCallbackView(View):
         # missing or if no state can be retrieved from the current session.
 
         if (
-            ((nonce and settings.AUTH_OPENID_USE_NONCE) or not settings.AUTH_OPENID_USE_NONCE)
+                ((nonce and settings.AUTH_OPENID_USE_NONCE) or not settings.AUTH_OPENID_USE_NONCE)
-            and
+                and
-            (
+                (
-                (state and settings.AUTH_OPENID_USE_STATE and 'state' in callback_params)
+                        (state and settings.AUTH_OPENID_USE_STATE and 'state' in callback_params)
-                or
+                        or
-                (not settings.AUTH_OPENID_USE_STATE)
+                        (not settings.AUTH_OPENID_USE_STATE)
-            )
+                )
-            and
+                and
-            ('code' in callback_params)
+                ('code' in callback_params)
         ):
             # Ensures that the passed state values is the same as the one that was previously
             # generated when forging the authorization request. This is necessary to mitigate

apps/authentication/backends/saml2/signals.py

@@ -1,4 +1,3 @@
 from django.dispatch import Signal
 
-
+saml2_create_or_update_user = Signal()
-saml2_create_or_update_user = Signal(providing_args=('user', 'created', 'request', 'attrs'))

apps/authentication/confirm/password.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from authentication.mixins import authenticate
 from .base import BaseConfirm

apps/authentication/confirm/relogin.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base import BaseConfirm
 

apps/authentication/errors/failed.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 #
-from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
+from django.utils.translation import gettext_lazy as _
 
 from users.utils import LoginBlockUtil, MFABlockUtils, LoginIpBlockUtil
-from ..signals import post_auth_failed
 from . import const
+from ..signals import post_auth_failed
 
 
 class AuthFailedNeedLogMixin:

apps/authentication/errors/mfa.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from common.exceptions import JMSException
 

apps/authentication/errors/redirect.py

@@ -1,5 +1,5 @@
-from django.utils.translation import ugettext_lazy as _
 from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
 
 from common.exceptions import JMSException
 from . import const

apps/authentication/forms.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 #
+from captcha.fields import CaptchaField, CaptchaTextInput
 from django import forms
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
-from captcha.fields import CaptchaField, CaptchaTextInput
 
 from common.utils import get_logger, decrypt_password
 

apps/authentication/mfa/base.py

@@ -1,6 +1,6 @@
 import abc
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class BaseMFA(abc.ABC):
@@ -69,4 +69,3 @@ class BaseMFA(abc.ABC):
     @staticmethod
     def help_text_of_disable():
         return ''
-

apps/authentication/mfa/custom.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.utils.module_loading import import_string
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from common.utils import get_logger
 from .base import BaseMFA

apps/authentication/mfa/radius.py

@@ -1,5 +1,5 @@
-from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
+from django.utils.translation import gettext_lazy as _
 
 from .base import BaseMFA
 from ..backends.radius import RadiusBackend

apps/authentication/mfa/sms.py

@@ -1,8 +1,8 @@
-from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
+from django.utils.translation import gettext_lazy as _
 
-from .base import BaseMFA
 from common.utils.verify_code import SendAndVerifyCodeUtil
+from .base import BaseMFA
 
 sms_failed_msg = _("SMS verify code invalid")
 

apps/authentication/middleware.py

@@ -5,7 +5,7 @@ from django.contrib.auth import logout as auth_logout
 from django.http import HttpResponse
 from django.shortcuts import redirect, reverse, render
 from django.utils.deprecation import MiddlewareMixin
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from apps.authentication import mixins
 from authentication.signals import post_auth_failed

apps/authentication/mixins.py

@@ -15,7 +15,7 @@ from django.core.cache import cache
 from django.core.exceptions import ImproperlyConfigured
 from django.shortcuts import reverse, redirect, get_object_or_404
 from django.utils.http import urlencode
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from rest_framework.request import Request
 
 from acls.models import LoginACL

apps/authentication/models/access_key.py

@@ -2,7 +2,7 @@ import uuid
 
 from django.conf import settings
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import common.db.models
 

apps/authentication/models/connection_token.py

@@ -6,7 +6,7 @@ from django.conf import settings
 from django.core.cache import cache
 from django.db import models
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework.exceptions import PermissionDenied
 
 from accounts.const import AliasAccount

apps/authentication/models/private_token.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework.authtoken.models import Token
 
 

apps/authentication/models/sso_token.py

@@ -1,7 +1,7 @@
 import uuid
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from common.db.models import BaseCreateUpdateModel, CASCADE_SIGNAL_SKIP
 

apps/authentication/models/temp_token.py

@@ -1,7 +1,7 @@
-from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
-
 from django.db import models
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
+
 from common.db.models import JMSBaseModel
 
 

apps/authentication/notifications.py

@@ -1,9 +1,9 @@
-from django.utils.translation import ugettext as _
 from django.template.loader import render_to_string
+from django.utils.translation import gettext as _
 
-from notifications.notifications import UserMessage
 from common.utils import get_logger
 from common.utils.timezone import local_now_display
+from notifications.notifications import UserMessage
 
 logger = get_logger(__file__)
 

apps/authentication/serializers/connect_token_secret.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from accounts.const import SecretType

apps/authentication/serializers/connection_token.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from common.serializers import CommonModelSerializer

apps/authentication/serializers/password_mfa.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from common.serializers.fields import EncryptedField

apps/authentication/signals.py

@@ -1,9 +1,7 @@
 from django.dispatch import Signal
 
+post_auth_success = Signal()
+post_auth_failed = Signal()
 
-post_auth_success = Signal(providing_args=('user', 'request'))
+user_auth_success = Signal()
-post_auth_failed = Signal(providing_args=('username', 'request', 'reason'))
+user_auth_failed = Signal()
-
-
-user_auth_success = Signal(providing_args=('user', 'request', 'backend', 'create'))
-user_auth_failed = Signal(providing_args=('username', 'request', 'reason', 'backend'))