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

Merge pull request #14699 from jumpserver/dev 

v4.5.0
pull/14701/head
Bryan 2024-12-19 16:04:45 +08:00 committed by GitHub
parent f3acc28ded d17ca4f6a7
commit 053d640e4c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/authentication/mixins.py
View File

@ -24,7 +24,6 @@ from common.utils import get_request_ip_or_data, get_request_ip, get_logger, bul
from users.models import User from users.models import User
from users.utils import LoginBlockUtil, MFABlockUtils, LoginIpBlockUtil from users.utils import LoginBlockUtil, MFABlockUtils, LoginIpBlockUtil
from . import errors from . import errors
from .const import FACE_CONTEXT_CACHE_TTL, FACE_SESSION_KEY, FACE_CONTEXT_CACHE_KEY_PREFIX
from .signals import post_auth_success, post_auth_failed from .signals import post_auth_success, post_auth_failed
logger = get_logger(__name__) logger = get_logger(__name__)
@ -435,6 +434,7 @@ class AuthFaceMixin:
@staticmethod @staticmethod
def _get_face_cache_key(token): def _get_face_cache_key(token):
from authentication.const import FACE_CONTEXT_CACHE_KEY_PREFIX
return f"{FACE_CONTEXT_CACHE_KEY_PREFIX}_{token}" return f"{FACE_CONTEXT_CACHE_KEY_PREFIX}_{token}"
@staticmethod @staticmethod
@ -457,11 +457,13 @@ class AuthFaceMixin:
context_data.update(data) context_data.update(data)
cache_key = self._get_face_cache_key(token) cache_key = self._get_face_cache_key(token)
from .const import FACE_CONTEXT_CACHE_TTL, FACE_SESSION_KEY
cache.set(cache_key, context_data, FACE_CONTEXT_CACHE_TTL) cache.set(cache_key, context_data, FACE_CONTEXT_CACHE_TTL)
self.request.session[FACE_SESSION_KEY] = token self.request.session[FACE_SESSION_KEY] = token
return token return token
def get_face_token_from_session(self): def get_face_token_from_session(self):
from authentication.const import FACE_SESSION_KEY
token = self.request.session.get(FACE_SESSION_KEY) token = self.request.session.get(FACE_SESSION_KEY)
if not token: if not token:
raise ValueError("Face recognition token is missing from the session.") raise ValueError("Face recognition token is missing from the session.")
@ -593,8 +595,7 @@ class AuthMixin(CommonMixin, AuthPreCheckMixin, AuthACLMixin, AuthFaceMixin, MFA
keys = [ keys = [
'auth_password', 'user_id', 'auth_confirm_required', 'auth_password', 'user_id', 'auth_confirm_required',
'auth_notice_required', 'auth_ticket_id', 'auth_acl_id', 'auth_notice_required', 'auth_ticket_id', 'auth_acl_id',
'user_session_id', 'user_log_id', 'can_send_notifications', 'user_session_id', 'user_log_id', 'can_send_notifications'
'next',
] ]
for k in keys: for k in keys:
self.request.session.pop(k, '') self.request.session.pop(k, '')