github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: Update confirmation backend definitions to use ConfirmType

pull/14933/head
wangruidong 2025-02-25 10:44:19 +08:00 committed by 老广
parent 96a0cbc35d
commit ff9ad2680f
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/authentication/confirm/__init__.py
View File

@ -3,3 +3,4 @@ from .password import ConfirmPassword
from .relogin import ConfirmReLogin from .relogin import ConfirmReLogin
CONFIRM_BACKENDS = [ConfirmReLogin, ConfirmPassword, ConfirmMFA] CONFIRM_BACKENDS = [ConfirmReLogin, ConfirmPassword, ConfirmMFA]
CONFIRM_BACKEND_MAP = {backend.name: backend for backend in CONFIRM_BACKENDS}

5
apps/authentication/confirm/mfa.py
View File

@ -1,11 +1,12 @@
from users.models import User from users.models import User
from .base import BaseConfirm from .base import BaseConfirm
from ..const import ConfirmType
class ConfirmMFA(BaseConfirm): class ConfirmMFA(BaseConfirm):
name = 'mfa' name = ConfirmType.MFA.value
display_name = 'MFA' display_name = ConfirmType.MFA.name
def check(self): def check(self):
return self.user.active_mfa_backends and self.user.mfa_enabled return self.user.active_mfa_backends and self.user.mfa_enabled

5
apps/authentication/confirm/password.py
View File

@ -2,11 +2,12 @@ from django.utils.translation import gettext_lazy as _
from authentication.mixins import authenticate from authentication.mixins import authenticate
from .base import BaseConfirm from .base import BaseConfirm
from ..const import ConfirmType
class ConfirmPassword(BaseConfirm): class ConfirmPassword(BaseConfirm):
name = 'password' name = ConfirmType.PASSWORD.value
display_name = _('Password') display_name = ConfirmType.PASSWORD.name
def check(self): def check(self):
return self.user.is_password_authenticate() return self.user.is_password_authenticate()

5
apps/authentication/confirm/relogin.py
View File

@ -4,6 +4,7 @@ from django.utils import timezone
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from .base import BaseConfirm from .base import BaseConfirm
from ..const import ConfirmType
SPECIFIED_TIME = 5 SPECIFIED_TIME = 5
@ -11,8 +12,8 @@ RELOGIN_ERROR = _('Login time has exceeded {} minutes, please login again').form
class ConfirmReLogin(BaseConfirm): class ConfirmReLogin(BaseConfirm):
name = 'relogin' name = ConfirmType.RELOGIN.value
display_name = 'Re-Login' display_name = ConfirmType.RELOGIN.name
def check(self): def check(self):
return not self.user.is_password_authenticate() return not self.user.is_password_authenticate()

12
apps/authentication/const.py
View File

@ -1,19 +1,14 @@
from django.db.models import TextChoices from django.db.models import TextChoices
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from authentication.confirm import CONFIRM_BACKENDS
from .confirm import ConfirmMFA, ConfirmPassword, ConfirmReLogin
RSA_PRIVATE_KEY = 'rsa_private_key' RSA_PRIVATE_KEY = 'rsa_private_key'
RSA_PUBLIC_KEY = 'rsa_public_key' RSA_PUBLIC_KEY = 'rsa_public_key'
CONFIRM_BACKEND_MAP = {backend.name: backend for backend in CONFIRM_BACKENDS}
class ConfirmType(TextChoices): class ConfirmType(TextChoices):
RELOGIN = ConfirmReLogin.name, ConfirmReLogin.display_name RELOGIN = 'relogin', 'Re-Login'
PASSWORD = ConfirmPassword.name, ConfirmPassword.display_name PASSWORD = 'password', _('Password')
MFA = ConfirmMFA.name, ConfirmMFA.display_name MFA = 'mfa', 'MFA'
@classmethod @classmethod
def get_can_confirm_types(cls, confirm_type): def get_can_confirm_types(cls, confirm_type):
@ -24,6 +19,7 @@ class ConfirmType(TextChoices):
@classmethod @classmethod
def get_prop_backends(cls, confirm_type): def get_prop_backends(cls, confirm_type):
from authentication.confirm import CONFIRM_BACKEND_MAP
types = cls.get_can_confirm_types(confirm_type) types = cls.get_can_confirm_types(confirm_type)
backend_classes = [ backend_classes = [
CONFIRM_BACKEND_MAP[tp] CONFIRM_BACKEND_MAP[tp]