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

perf: in safe mode passkey cannot be as mfa

pull/15778/head
ibuler 2025-07-24 16:51:36 +08:00 committed by 老广
parent 26cea550c4
commit be24f28d9b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/authentication/backends/passkey/api.py
View File

@ -71,7 +71,8 @@ class PasskeyViewSet(AuthMixin, FlashMessageMixin, JMSModelViewSet):
return self.redirect_to_error(_('Auth failed')) return self.redirect_to_error(_('Auth failed'))
confirm_mfa = request.session.get('passkey_confirm_mfa') confirm_mfa = request.session.get('passkey_confirm_mfa')
if confirm_mfa: # 如果开启了安全模式，Passkey 不能作为 MFA
if confirm_mfa and not settings.SAFE_MODE:
request.session['CONFIRM_LEVEL'] = ConfirmType.values.index('mfa') + 1 request.session['CONFIRM_LEVEL'] = ConfirmType.values.index('mfa') + 1
request.session['CONFIRM_TIME'] = int(time.time()) request.session['CONFIRM_TIME'] = int(time.time())
request.session['CONFIRM_TYPE'] = ConfirmType.MFA request.session['CONFIRM_TYPE'] = ConfirmType.MFA
@ -80,6 +81,8 @@ class PasskeyViewSet(AuthMixin, FlashMessageMixin, JMSModelViewSet):
try: try:
self.check_oauth2_auth(user, settings.AUTH_BACKEND_PASSKEY) self.check_oauth2_auth(user, settings.AUTH_BACKEND_PASSKEY)
# 如果开启了安全模式，passkey 不能作为 MFA
if not settings.SAFE_MODE:
self.mark_mfa_ok('passkey', user) self.mark_mfa_ok('passkey', user)
return self.redirect_to_guard_view() return self.redirect_to_guard_view()
except Exception as e: except Exception as e:

1
apps/terminal/api/applet/applet.py
View File

@ -42,6 +42,7 @@ class DownloadUploadMixin:
rel_path = default_storage.save(save_to, file) rel_path = default_storage.save(save_to, file)
path = default_storage.path(rel_path) path = default_storage.path(rel_path)
extract_to = default_storage.path('applets/{}.tmp'.format(file.name)) extract_to = default_storage.path('applets/{}.tmp'.format(file.name))
if os.path.exists(extract_to): if os.path.exists(extract_to):
shutil.rmtree(extract_to) shutil.rmtree(extract_to)