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

fix: 修复mfa失效日期 失效问题 (#8862) 

Co-authored-by: feng626 <1304903146@qq.com>
pull/8864/head
fit2bot 2022-09-14 16:17:51 +08:00 committed by GitHub
parent 5e16b6387a
commit 8c277e8875
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/common/permissions.py
View File

@ -62,16 +62,22 @@ class UserConfirmation(permissions.BasePermission):
confirm_level = request.session.get('CONFIRM_LEVEL') confirm_level = request.session.get('CONFIRM_LEVEL')
confirm_time = request.session.get('CONFIRM_TIME') confirm_time = request.session.get('CONFIRM_TIME')
ttl = self.get_ttl()
if not confirm_level or not confirm_time or \ if not confirm_level or not confirm_time or \
confirm_level < self.min_level or \ confirm_level < self.min_level or \
confirm_time < time.time() - self.ttl: confirm_time < time.time() - ttl:
raise UserConfirmRequired(code=self.confirm_type) raise UserConfirmRequired(code=self.confirm_type)
return True return True
def get_ttl(self):
if self.confirm_type == ConfirmType.MFA:
ttl = settings.SECURITY_MFA_VERIFY_TTL
else:
ttl = self.ttl
return ttl
@classmethod @classmethod
def require(cls, confirm_type=ConfirmType.ReLogin, ttl=60 * 5): def require(cls, confirm_type=ConfirmType.ReLogin, ttl=60 * 5):
min_level = ConfirmType.values.index(confirm_type) + 1 min_level = ConfirmType.values.index(confirm_type) + 1
ttl = settings.SECURITY_MFA_VERIFY_TTL if confirm_type == ConfirmType.MFA else ttl
name = 'UserConfirmationLevel{}TTL{}'.format(min_level, ttl) name = 'UserConfirmationLevel{}TTL{}'.format(min_level, ttl)
return type(name, (cls,), {'min_level': min_level, 'ttl': ttl, 'confirm_type': confirm_type}) return type(name, (cls,), {'min_level': min_level, 'ttl': ttl, 'confirm_type': confirm_type})