perf: 修改支持 Django4

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 common.permissions import IsValidUser
-from common.utils.random import random_string
-from common.utils import get_object_or_none
+from authentication.errors import PasswordInvalid
+from authentication.mixins import AuthMixin
+from authentication.mixins import authenticate
 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(
-    providing_args=['request', 'user', 'created', 'name', 'username', 'email']
-)
-
+oauth2_create_or_update_user = Signal()

apps/authentication/backends/oidc/signals.py

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

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)
-            and
-            (
-                (state and settings.AUTH_OPENID_USE_STATE and 'state' in callback_params)
-                or
-                (not settings.AUTH_OPENID_USE_STATE)
-            )
-            and
-            ('code' in callback_params)
+                ((nonce and settings.AUTH_OPENID_USE_NONCE) or not settings.AUTH_OPENID_USE_NONCE)
+                and
+                (
+                        (state and settings.AUTH_OPENID_USE_STATE and 'state' in callback_params)
+                        or
+                        (not settings.AUTH_OPENID_USE_STATE)
+                )
+                and
+                ('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(providing_args=('user', 'created', 'request', 'attrs'))
+saml2_create_or_update_user = Signal()

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 captcha.fields import CaptchaField, CaptchaTextInput
+from django.utils.translation import gettext_lazy as _
 
 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'))
-post_auth_failed = Signal(providing_args=('username', 'request', 'reason'))
-
-
-user_auth_success = Signal(providing_args=('user', 'request', 'backend', 'create'))
-user_auth_failed = Signal(providing_args=('username', 'request', 'reason', 'backend'))
+user_auth_success = Signal()
+user_auth_failed = Signal()

apps/authentication/utils.py

@@ -4,12 +4,12 @@ import ipaddress
 from urllib.parse import urljoin, urlparse
 
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
-from common.utils import validate_ip, get_ip_city, get_request_ip
-from common.utils import get_logger
-from audits.models import UserLoginLog
 from audits.const import DEFAULT_CITY
+from audits.models import UserLoginLog
+from common.utils import get_logger
+from common.utils import validate_ip, get_ip_city, get_request_ip
 from .notifications import DifferentCityLoginMessage
 
 logger = get_logger(__file__)

apps/authentication/views/base.py

@@ -1,26 +1,23 @@
 from functools import lru_cache
 
-from rest_framework.request import Request
-from django.utils.translation import ugettext_lazy as _
-from django.utils.module_loading import import_string
 from django.conf import settings
 from django.db.utils import IntegrityError
+from django.utils.module_loading import import_string
+from django.utils.translation import gettext_lazy as _
 from django.views import View
+from rest_framework.request import Request
 
 from authentication import errors
 from authentication.mixins import AuthMixin
-from users.models import User
-from common.utils.django import reverse, get_object_or_none
 from common.utils import get_logger
-
+from common.utils.django import reverse, get_object_or_none
+from users.models import User
 from .mixins import FlashMessageMixin
 
-
 logger = get_logger(__file__)
 
 
 class BaseLoginCallbackView(AuthMixin, FlashMessageMixin, View):
-
     client_type_path = ''
     client_auth_params = {}
     user_type = ''

apps/authentication/views/dingtalk.py

@@ -4,7 +4,7 @@ from django.conf import settings
 from django.db.utils import IntegrityError
 from django.http.request import HttpRequest
 from django.http.response import HttpResponseRedirect
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views import View
 from rest_framework.exceptions import APIException
 from rest_framework.permissions import AllowAny, IsAuthenticated
@@ -13,16 +13,15 @@ from authentication import errors
 from authentication.const import ConfirmType
 from authentication.mixins import AuthMixin
 from authentication.notifications import OAuthBindMessage
-from common.views.mixins import PermissionsMixin, UserConfirmRequiredExceptionMixin
 from common.permissions import UserConfirmation
 from common.sdk.im.dingtalk import URL, DingTalk
 from common.utils import get_logger
 from common.utils.common import get_request_ip
 from common.utils.django import get_object_or_none, reverse
 from common.utils.random import random_string
+from common.views.mixins import PermissionsMixin, UserConfirmRequiredExceptionMixin
 from users.models import User
 from users.views import UserVerifyPasswordView
-
 from .base import BaseLoginCallbackView
 from .mixins import METAMixin, FlashMessageMixin
 

apps/authentication/views/feishu.py

@@ -4,22 +4,21 @@ from django.conf import settings
 from django.db.utils import IntegrityError
 from django.http.request import HttpRequest
 from django.http.response import HttpResponseRedirect
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views import View
 from rest_framework.exceptions import APIException
 from rest_framework.permissions import AllowAny, IsAuthenticated
 
 from authentication.const import ConfirmType
 from authentication.notifications import OAuthBindMessage
-from common.views.mixins import PermissionsMixin, UserConfirmRequiredExceptionMixin
 from common.permissions import UserConfirmation
 from common.sdk.im.feishu import URL, FeiShu
 from common.utils import get_logger
 from common.utils.common import get_request_ip
 from common.utils.django import reverse
 from common.utils.random import random_string
+from common.views.mixins import PermissionsMixin, UserConfirmRequiredExceptionMixin
 from users.views import UserVerifyPasswordView
-
 from .base import BaseLoginCallbackView
 from .mixins import FlashMessageMixin
 
@@ -166,4 +165,3 @@ class FeiShuQRLoginCallbackView(FeiShuQRMixin, BaseLoginCallbackView):
     msg_client_err = _('FeiShu Error')
     msg_user_not_bound_err = _('FeiShu is not bound')
     msg_not_found_user_from_client_err = _('Failed to get user from FeiShu')
-

apps/authentication/views/login.py

@@ -16,7 +16,7 @@ from django.shortcuts import reverse, redirect
 from django.templatetags.static import static
 from django.urls import reverse_lazy
 from django.utils.decorators import method_decorator
-from django.utils.translation import ugettext as _, get_language
+from django.utils.translation import gettext as _, get_language
 from django.views.decorators.cache import never_cache
 from django.views.decorators.csrf import csrf_protect
 from django.views.decorators.debug import sensitive_post_parameters

apps/authentication/views/wecom.py

@@ -1,28 +1,28 @@
-from django.http.response import HttpResponseRedirect
-from django.utils.translation import ugettext_lazy as _
 from urllib.parse import urlencode
-from django.views import View
-from django.conf import settings
-from django.http.request import HttpRequest
-from django.db.utils import IntegrityError
-from rest_framework.permissions import IsAuthenticated, AllowAny
-from rest_framework.exceptions import APIException
 
-from users.models import User
-from users.views import UserVerifyPasswordView
-from common.utils import get_logger
-from common.utils.random import random_string
-from common.utils.django import reverse, get_object_or_none
+from django.conf import settings
+from django.db.utils import IntegrityError
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseRedirect
+from django.utils.translation import gettext_lazy as _
+from django.views import View
+from rest_framework.exceptions import APIException
+from rest_framework.permissions import IsAuthenticated, AllowAny
+
+from authentication import errors
+from authentication.const import ConfirmType
+from authentication.mixins import AuthMixin
+from authentication.notifications import OAuthBindMessage
+from common.permissions import UserConfirmation
 from common.sdk.im.wecom import URL
 from common.sdk.im.wecom import WeCom
-from common.views.mixins import UserConfirmRequiredExceptionMixin, PermissionsMixin
+from common.utils import get_logger
 from common.utils.common import get_request_ip
-from common.permissions import UserConfirmation
-from authentication import errors
-from authentication.mixins import AuthMixin
-from authentication.const import ConfirmType
-from authentication.notifications import OAuthBindMessage
-
+from common.utils.django import reverse, get_object_or_none
+from common.utils.random import random_string
+from common.views.mixins import UserConfirmRequiredExceptionMixin, PermissionsMixin
+from users.models import User
+from users.views import UserVerifyPasswordView
 from .base import BaseLoginCallbackView
 from .mixins import METAMixin, FlashMessageMixin